Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Axe the unified toolbar on OS X

Browse Source
This commit is contained in:
Kovid Goyal 2011-05-19 17:43:44 -06:00
parent c01627b64e
commit 079306efdd
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/calibre/gui2/bars.py
View File

@ -249,10 +249,6 @@ class BarsManager(QObject):
self.menu_bar = MenuBar(self.location_manager, self.parent()) self.menu_bar = MenuBar(self.location_manager, self.parent())
self.parent().setMenuBar(self.menu_bar) 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.apply_settings()
self.init_bars() self.init_bars()
@ -292,15 +288,12 @@ class BarsManager(QObject):
''' '''
showing_device = self.location_manager.has_device showing_device = self.location_manager.has_device
main_bar = self.main_bars[1 if showing_device else 0] 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] child_bar = self.child_bars[0]
for bar in self.bars: for bar in self.bars:
bar.setVisible(False) bar.setVisible(False)
bar.update_lm_actions() bar.update_lm_actions()
if main_bar.added_actions: if main_bar.added_actions:
main_bar.setVisible(True) main_bar.setVisible(True)
self.parent().addToolBar(Qt.TopToolBarArea, main_bar)
if child_bar.added_actions: if child_bar.added_actions:
child_bar.setVisible(True) child_bar.setVisible(True)

8
src/calibre/gui2/layout.py
View File

@ -259,8 +259,14 @@ class MainWindowMixin(object): # {{{
self.search_bar = SearchBar(self) self.search_bar = SearchBar(self)
self.bars_manager = BarsManager(self.donate_button, self.bars_manager = BarsManager(self.donate_button,
self.location_manager, self) 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.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 = self.centralwidget.layout()
l.addWidget(self.search_bar) l.addWidget(self.search_bar)