From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Thu, 12 Feb 2009 00:59:22 +0000 (+0100)
Subject: using unified toolbar on mac os now
X-Git-Tag: 0.4.0~72
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=f69d3d8fb4589d30b33cfb83a3b68a34517fc852

using unified toolbar on mac os now
---

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 9e71a2b2..c1c57e10 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -536,8 +536,11 @@ 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");
+  // _mainToolBar->setObjectName("MainToolBar"); // setting an object name breaks setUnifiedTitleAndToolBarOnMac... -.-
   QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
   _toolbarMenu->addAction(_mainToolBar->toggleViewAction());