# include <KMenuBar>
# include <KShortcutsDialog>
# include <KStatusBar>
+# include <KToggleFullScreenAction>
# include <KToolBar>
# include <KWindowSystem>
#endif
coll->addAction("ToggleStatusBar", new Action(tr("Show Status &Bar"), coll,
0, 0))->setCheckable(true);
- coll->addAction("ToggleFullscreen", new Action(SmallIcon("window_fullscreen"), tr("&Fullscreen mode"), coll,
- this, SLOT(toggleFullscreen()), QKeySequence(Qt::Key_F11)));
+
+#ifdef HAVE_KDE
+ QAction *fullScreenAct = KStandardAction::fullScreen(this, SLOT(toggleFullscreen()), this, coll);
+#else
+ QAction *fullScreenAct = new Action(SmallIcon("view-fullscreen"), tr("&Full Screen Mode"), coll,
+ this, SLOT(toggleFullscreen()), QKeySequence(Qt::Key_F11));
+ fullScreenAct->setCheckable(true);
+#endif
+ coll->addAction("ToggleFullscreen", fullScreenAct);
// Settings
- coll->addAction("ConfigureShortcuts", new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
- this, SLOT(showShortcutsDlg())));
- coll->addAction("ConfigureQuassel", new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
- this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7)));
+ QAction *configureShortcutsAct = new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
+ this, SLOT(showShortcutsDlg()));
+ configureShortcutsAct->setMenuRole(QAction::NoRole);
+ coll->addAction("ConfigureShortcuts", configureShortcutsAct);
+
+ #ifdef Q_WS_MAC
+ QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
+ this, SLOT(showSettingsDlg()));
+ configureQuasselAct->setMenuRole(QAction::PreferencesRole);
+ #else
+ QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
+ this, SLOT(showSettingsDlg()), QKeySequence(Qt::Key_F7));
+ #endif
+ coll->addAction("ConfigureQuassel", configureQuasselAct);
// Help
- coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
- this, SLOT(showAboutDlg())));
- coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
- qApp, SLOT(aboutQt())));
+ QAction *aboutQuasselAct = new Action(SmallIcon("quassel"), tr("&About Quassel"), coll,
+ this, SLOT(showAboutDlg()));
+ aboutQuasselAct->setMenuRole(QAction::AboutRole);
+ coll->addAction("AboutQuassel", aboutQuasselAct);
+
+ QAction *aboutQtAct = new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
+ qApp, SLOT(aboutQt()));
+ aboutQtAct->setMenuRole(QAction::AboutQtRole);
+ coll->addAction("AboutQt", aboutQtAct);
coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
this, SLOT(on_actionDebugNetworkModel_triggered())));
coll->addAction("DebugBufferViewOverlay", new Action(SmallIcon("tools-report-bug"), tr("Debug &BufferViewOverlay"), coll,
wizard->show();
}
else {
- QtUiSettings s;
- BufferId lastUsedBufferId(s.value("LastUsedBufferId").toInt());
- if(lastUsedBufferId.isValid())
- Client::bufferModel()->switchToBuffer(lastUsedBufferId);
+ // Monolithic always preselects last used buffer - Client only if the connection died
+ if(Client::coreConnection()->wasReconnect() || Quassel::runMode() == Quassel::Monolithic) {
+ QtUiSettings s;
+ BufferId lastUsedBufferId(s.value("LastUsedBufferId").toInt());
+ if(lastUsedBufferId.isValid())
+ Client::bufferModel()->switchToBuffer(lastUsedBufferId);
+ }
}
}
}
}
+ // store last active buffer
QtUiSettings s;
- BufferId lastBufId = Client::bufferModel()->currentBuffer();
+ BufferId lastBufId = _bufferWidget->currentBuffer();
if(lastBufId.isValid()) {
s.setValue("LastUsedBufferId", lastBufId.toInt());
+ // clear the current selection
Client::bufferModel()->standardSelectionModel()->clearSelection();
}
restoreState(s.value("MainWinState").toByteArray());
}
void MainWin::toggleFullscreen() {
- QAction *action = QtUi::actionCollection("General")->action("ToggleFullscreen");
-
- if(isFullScreen()) {
+ if(isFullScreen())
showNormal();
- action->setIcon(SmallIcon("window_fullscreen"));
- action->setText(tr("&Fullscreen mode"));
- }
- else {
+ else
showFullScreen();
- action->setIcon(SmallIcon("window_nofullscreen"));
- action->setText(tr("&Normal mode"));
- }
}
/********************************************************************************************************/
switch(net->connectionState()) {
case Network::Initialized:
action->setIcon(SmallIcon("network-connect"));
+ // if we have no currently selected buffer, jump to the first connecting statusbuffer
+ if(!bufferWidget()->currentBuffer().isValid()) {
+ QModelIndex idx = Client::networkModel()->networkIndex(net->networkId());
+ if(idx.isValid()) {
+ BufferId statusBufferId = idx.data(NetworkModel::BufferIdRole).value<BufferId>();
+ Client::bufferModel()->switchToBuffer(statusBufferId);
+ }
+ }
break;
case Network::Disconnected:
action->setIcon(SmallIcon("network-disconnect"));