From f1210c3444f29acb175237b080eb0696f5562b6f Mon Sep 17 00:00:00 2001 From: John Schember Date: Thu, 7 Apr 2011 18:17:28 -0400 Subject: [PATCH] Disable toolbar icons, forces icon text to be displayed when enabled. --- src/calibre/gui2/layout.py | 4 ++-- src/calibre/gui2/preferences/look_feel.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index 41b415e25c..c73bb0d0fa 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -264,11 +264,11 @@ class ToolBar(QToolBar): # {{{ def apply_settings(self): sz = gprefs['toolbar_icon_size'] - sz = {'small':24, 'medium':48, 'large':64}[sz] + sz = {'off':0, 'small':24, 'medium':48, 'large':64}[sz] self.setIconSize(QSize(sz, sz)) self.child_bar.setIconSize(QSize(sz, sz)) style = Qt.ToolButtonTextUnderIcon - if gprefs['toolbar_text'] == 'never': + if sz > 0 and gprefs['toolbar_text'] == 'never': style = Qt.ToolButtonIconOnly self.setToolButtonStyle(style) self.child_bar.setToolButtonStyle(style) diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index 523a296a37..71b9e38667 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -49,8 +49,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): r('use_roman_numerals_for_series_number', config) r('separate_cover_flow', config, restart_required=True) - choices = [(_('Small'), 'small'), (_('Medium'), 'medium'), - (_('Large'), 'large')] + choices = [(_('Off'), 'off'), (_('Small'), 'small'), + (_('Medium'), 'medium'), (_('Large'), 'large')] r('toolbar_icon_size', gprefs, choices=choices) choices = [(_('Automatic'), 'auto'), (_('Always'), 'always'),