From 615008a65018947025fa73e8b3a62f58be3ecc1b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Aug 2010 11:42:50 -0600 Subject: [PATCH] Fix hidden donate button not really being hidden --- src/calibre/gui2/layout.py | 4 +++- src/calibre/gui2/ui.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index 9b755ccb97..4eccf597c2 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -232,6 +232,7 @@ class ToolBar(QToolBar): # {{{ pass def build_bar(self): + self.showing_donate = False showing_device = self.location_manager.has_device actions = '-device' if showing_device else '' actions = gprefs['action-layout-toolbar'+actions] @@ -250,6 +251,7 @@ class ToolBar(QToolBar): # {{{ self.d_widget.setLayout(QVBoxLayout()) self.d_widget.layout().addWidget(self.donate_button) self.addWidget(self.d_widget) + self.showing_donate = True elif what in self.gui.iactions: action = self.gui.iactions[what] self.addAction(action.qaction) @@ -292,7 +294,7 @@ class MainWindowMixin(object): # {{{ self._central_widget_layout = QVBoxLayout() self.centralwidget.setLayout(self._central_widget_layout) self.resize(1012, 740) - self.donate_button = ThrobbingButton(self.centralwidget) + self.donate_button = ThrobbingButton() self.location_manager = LocationManager(self) self.iactions['Fetch News'].init_scheduler(db) diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index f2cd7d5e7b..c42cf7d6c3 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -252,7 +252,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{ self.read_settings() self.finalize_layout() - self.donate_button.start_animation() + if self.tool_bar.showing_donate: + self.donate_button.start_animation() self.set_window_title() for ac in self.iactions.values():