X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=e983d66c9e5798c0621d8c7cf2fe0d22becb3e00;hp=ed5644c483e2032a77ef3da4584bfd305f0ffa77;hb=5916720e01ef3473e06e9134507a6099c2466198;hpb=dc2aa39d20b60e7cd8e0ba66ca6c9ed729add008

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index ed5644c4..e983d66c 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -409,7 +409,7 @@ void MainWin::setupNickWidget() {
   addDockWidget(Qt::RightDockWidgetArea, nickDock);
   _viewMenu->addAction(nickDock->toggleViewAction());
   nickDock->toggleViewAction()->setText(tr("Show Nick List"));
-  nickDock->toggleViewAction()->setIcon(SmallIcon("view-sidetree"));
+
   // See NickListDock::NickListDock();
   // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
 
@@ -426,7 +426,7 @@ void MainWin::setupChatMonitor() {
   ChatMonitorView *chatView = new ChatMonitorView(filter, this);
   chatView->show();
   dock->setWidget(chatView);
-  dock->show();
+  dock->hide();
 
   addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical);
   _viewMenu->addAction(dock->toggleViewAction());
@@ -489,7 +489,6 @@ void MainWin::setupStatusBar() {
   statusBar()->addPermanentWidget(sslLabel);
   sslLabel->hide();
 
-  _viewMenu->addSeparator();
   QAction *showStatusbar = QtUi::actionCollection("General")->action("ToggleStatusBar");
 
   QtUiSettings uiSettings;
@@ -537,8 +536,12 @@ void MainWin::setupToolBars() {
   connect(_nickListWidget, SIGNAL(nickSelectionChanged(QModelIndexList)),
           QtUi::toolBarActionProvider(), SLOT(nickSelectionChanged(QModelIndexList)));
 
+#ifdef Q_WS_MAC
+  setUnifiedTitleAndToolBarOnMac(true);
+#endif
   _mainToolBar = addToolBar("Main Toolbar");
   _mainToolBar->setObjectName("MainToolBar");
+
   QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
   _toolbarMenu->addAction(_mainToolBar->toggleViewAction());