← Back to branch summary

~ubuntu-branches/ubuntu/precise/quassel/precise-updates

« back to all changes in this revision

Viewing changes to src/qtui/mainwin.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2012-02-14 18:38:55 UTC
  • mfrom: (1.1.46)
  • Revision ID: package-import@ubuntu.com-20120214183855-ak8af7n6qweqy3f0
Tags: 0.8~beta1-0ubuntu1
* New upstream beta release
  - Update quasselcore man page for new oidentd option 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qtui/mainwin.cpp
1
1
/***************************************************************************
2
 
 *   Copyright (C) 2005-2010 by the Quassel Project                        *
 
2
 *   Copyright (C) 2005-2012 by the Quassel Project                        *
3
3
 *   devel@quassel-irc.org                                                 *
4
4
 *                                                                         *
5
5
 *   This program is free software; you can redistribute it and/or modify  *
352
352
  coll->addAction("ToggleFullscreen", fullScreenAct);
353
353
 
354
354
  // Settings
355
 
  coll->addAction("ConfigureShortcuts", new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
356
 
                                                  this, SLOT(showShortcutsDlg())));
357
 
  coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
358
 
                                                  this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7)));
 
355
  QAction *configureShortcutsAct = new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
 
356
                                              this, SLOT(showShortcutsDlg()));
 
357
  configureShortcutsAct->setMenuRole(QAction::NoRole);
 
358
  coll->addAction("ConfigureShortcuts", configureShortcutsAct);
 
359
 
 
360
  #ifdef Q_WS_MAC
 
361
  QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
 
362
                                            this, SLOT(showSettingsDlg()));
 
363
  configureQuasselAct->setMenuRole(QAction::PreferencesRole);
 
364
  #else
 
365
  QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
 
366
                                            this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7));
 
367
  #endif
 
368
  coll->addAction("ConfigureQuassel", configureQuasselAct);
359
369
 
360
370
  // Help
361
 
  coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
362
 
                                              this, SLOT(showAboutDlg())));
363
 
  coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
364
 
                                         qApp, SLOT(aboutQt())));
 
371
  QAction *aboutQuasselAct = new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
 
372
                                        this, SLOT(showAboutDlg()));
 
373
  aboutQuasselAct->setMenuRole(QAction::AboutRole);
 
374
  coll->addAction("AboutQuassel", aboutQuasselAct);
 
375
 
 
376
  QAction *aboutQtAct = new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
 
377
                                   qApp, SLOT(aboutQt()));
 
378
  aboutQtAct->setMenuRole(QAction::AboutQtRole);
 
379
  coll->addAction("AboutQt", aboutQtAct);
365
380
  coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
366
381
                                       this, SLOT(on_actionDebugNetworkModel_triggered())));
367
382
  coll->addAction("DebugBufferViewOverlay", new Action(SmallIcon("tools-report-bug"), tr("Debug &BufferViewOverlay"), coll,
375
390
  coll->addAction("ReloadStyle", new Action(SmallIcon("view-refresh"), tr("Reload Stylesheet"), coll,
376
391
                                       QtUi::style(), SLOT(reload()), QKeySequence::Refresh));
377
392
 
 
393
  coll->addAction("HideCurrentBuffer", new Action(tr("Hide Current Buffer"), coll,
 
394
                                                  this, SLOT(hideCurrentBuffer()), QKeySequence::Close));
 
395
 
378
396
  // Navigation
379
397
  coll = QtUi::actionCollection("Navigation", tr("Navigation"));
380
398
 
698
716
    view->previousBuffer();
699
717
}
700
718
 
 
719
void MainWin::hideCurrentBuffer() {
 
720
  BufferView *view = activeBufferView();
 
721
  if(view)
 
722
    view->hideCurrentBuffer();
 
723
}
 
724
 
701
725
void MainWin::showNotificationsDlg() {
702
726
  SettingsPageDlg dlg(new NotificationsSettingsPage(this), this);
703
727
  dlg.exec();