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

Sync to trunk.

Browse Source
This commit is contained in:
John Schember 2011-05-20 07:28:12 -04:00
commit 62731e27eb
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/default_tweaks.py
View File

@ -350,3 +350,11 @@ send_news_to_device_location = "main"
# work on all operating systems) # work on all operating systems)
server_listen_on = '0.0.0.0' server_listen_on = '0.0.0.0'
#: Unified toolbar on OS X
# If you enable this option and restart calibre, the toolbar will be 'unified'
# with the titlebar as is normal for OS X applications. However, doing this has
# various bugs, for instance the minimum width of the toolbar becomes twice
# what it should be and it causes other random bugs on some systems, so turn it
# on at your own risk!
unified_title_toolbar_on_osx = False

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

@ -17,6 +17,7 @@ from calibre.gui2.search_box import SearchBox2, SavedSearchBox
from calibre.gui2.throbber import ThrobbingButton from calibre.gui2.throbber import ThrobbingButton
from calibre.gui2.bars import BarsManager from calibre.gui2.bars import BarsManager
from calibre.gui2.widgets import ComboBoxWithHelp from calibre.gui2.widgets import ComboBoxWithHelp
from calibre.utils.config_base import tweaks
from calibre import human_readable from calibre import human_readable
class LocationManager(QObject): # {{{ class LocationManager(QObject): # {{{
@ -264,7 +265,10 @@ class MainWindowMixin(object): # {{{
for bar in self.bars_manager.child_bars: for bar in self.bars_manager.child_bars:
self.addToolBar(Qt.BottomToolBarArea, bar) 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
if tweaks['unified_title_toolbar_on_osx']:
self.setUnifiedTitleAndToolBarOnMac(True)
l = self.centralwidget.layout() l = self.centralwidget.layout()
l.addWidget(self.search_bar) l.addWidget(self.search_bar)