From 079306efdd68bb2881d4a2413545a15d2bb15e4d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 19 May 2011 17:43:44 -0600 Subject: [PATCH] Axe the unified toolbar on OS X --- src/calibre/gui2/bars.py | 7 ------- src/calibre/gui2/layout.py | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/calibre/gui2/bars.py b/src/calibre/gui2/bars.py index 58711f9096..7dc0567d95 100644 --- a/src/calibre/gui2/bars.py +++ b/src/calibre/gui2/bars.py @@ -249,10 +249,6 @@ class BarsManager(QObject): self.menu_bar = MenuBar(self.location_manager, self.parent()) self.parent().setMenuBar(self.menu_bar) - parent.addToolBar(Qt.TopToolBarArea, self.main_bars[0]) - parent.addToolBar(Qt.BottomToolBarArea, self.main_bars[1]) - parent.addToolBar(Qt.BottomToolBarArea, self.child_bars[0]) - self.apply_settings() self.init_bars() @@ -292,15 +288,12 @@ class BarsManager(QObject): ''' showing_device = self.location_manager.has_device main_bar = self.main_bars[1 if showing_device else 0] - hidden_bar = self.main_bars[0 if showing_device else 1] - self.parent().addToolBar(Qt.BottomToolBarArea, hidden_bar) child_bar = self.child_bars[0] for bar in self.bars: bar.setVisible(False) bar.update_lm_actions() if main_bar.added_actions: main_bar.setVisible(True) - self.parent().addToolBar(Qt.TopToolBarArea, main_bar) if child_bar.added_actions: child_bar.setVisible(True) diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index 85e79d66d3..281450ed30 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -259,8 +259,14 @@ class MainWindowMixin(object): # {{{ self.search_bar = SearchBar(self) self.bars_manager = BarsManager(self.donate_button, self.location_manager, self) + for bar in self.bars_manager.main_bars: + self.addToolBar(Qt.TopToolBarArea, bar) + for bar in self.bars_manager.child_bars: + self.addToolBar(Qt.BottomToolBarArea, bar) self.bars_manager.update_bars() - self.setUnifiedTitleAndToolBarOnMac(True) + # This is disabled because it introduces various toolbar related bugs + # The width of the toolbar becomes the sum of both toolbars + # self.setUnifiedTitleAndToolBarOnMac(True) l = self.centralwidget.layout() l.addWidget(self.search_bar)