void MainWin::updateIcon()
{
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
const int size = 128;
#else
const int size = 48;
configureShortcutsAct->setMenuRole(QAction::NoRole);
coll->addAction("ConfigureShortcuts", configureShortcutsAct);
- #ifdef Q_WS_MAC
+ #ifdef Q_OS_MAC
QAction *configureQuasselAct = new Action(SmallIcon("configure"), tr("&Configure Quassel..."), coll,
this, SLOT(showSettingsDlg()));
configureQuasselAct->setMenuRole(QAction::PreferencesRole);
this, SLOT(on_jumpHotBuffer_triggered()), QKeySequence(Qt::META + Qt::Key_A)));
// Jump keys
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
const int bindModifier = Qt::ControlModifier | Qt::AltModifier;
const int jumpModifier = Qt::ControlModifier;
#else
connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)),
QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList)));
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
setUnifiedTitleAndToolBarOnMac(true);
#endif
QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
_toolbarMenu->addAction(_mainToolBar->toggleViewAction());
+
+#ifdef Q_OS_MAC
+ QtUiSettings uiSettings;
+
+ bool visible = uiSettings.value("ShowMainToolBar", QVariant(true)).toBool();
+ _mainToolBar->setVisible(visible);
+ connect(_mainToolBar, SIGNAL(visibilityChanged(bool)), this, SLOT(saveMainToolBarStatus(bool)));
+#endif
+}
+
+#ifdef Q_OS_MAC
+void MainWin::saveMainToolBarStatus(bool enabled)
+{
+ QtUiSettings uiSettings;
+ uiSettings.setValue("ShowMainToolBar", enabled);
}
+#endif
void MainWin::connectedToCore()
bool MainWin::event(QEvent *event)
{
- if (event->type() == QEvent::WindowActivate) {
- BufferId buffer = Client::bufferModel()->currentBuffer();
- if (buffer.isValid())
- Client::instance()->markBufferAsRead(buffer);
+ switch(event->type()) {
+ case QEvent::WindowActivate: {
+ BufferId bufferId = Client::bufferModel()->currentBuffer();
+ if (bufferId.isValid())
+ Client::instance()->markBufferAsRead(bufferId);
+ break;
+ }
+ case QEvent::WindowDeactivate:
+ if (bufferWidget()->autoMarkerLineOnLostFocus())
+ bufferWidget()->setMarkerLine();
+ break;
+ default:
+ break;
}
return QMainWindow::event(event);
}