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

Fix #1355488 [(Enhancement) Add a restart button to Configuration Warning](https://bugs.launchpad.net/calibre/+bug/1355488)

Browse Source
This commit is contained in:
Kovid Goyal 2014-08-12 08:51:10 +05:30
parent ba816b8fe2
commit 66b506abce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/actions/preferences.py
View File

@ -11,7 +11,7 @@ from PyQt5.Qt import QIcon, Qt
from calibre.gui2.actions import InterfaceAction from calibre.gui2.actions import InterfaceAction
from calibre.gui2.preferences.main import Preferences from calibre.gui2.preferences.main import Preferences
from calibre.gui2 import error_dialog from calibre.gui2 import error_dialog, show_restart_warning
from calibre.constants import DEBUG, isosx from calibre.constants import DEBUG, isosx
class PreferencesAction(InterfaceAction): class PreferencesAction(InterfaceAction):
@ -56,9 +56,9 @@ class PreferencesAction(InterfaceAction):
d.exec_() d.exec_()
return return
if self.gui.must_restart_before_config: if self.gui.must_restart_before_config:
d = error_dialog(self.gui, _('Cannot configure'), do_restart = show_restart_warning(_('Cannot configure before calibre is restarted.'))
_('Cannot configure before calibre is restarted.')) if do_restart:
d.exec_() self.gui.quit(restart=True)
return return
d = Preferences(self.gui, initial_plugin=initial_plugin, d = Preferences(self.gui, initial_plugin=initial_plugin,
close_after_initial=close_after_initial) close_after_initial=close_after_initial)