mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Add a close button to preferences window
This commit is contained in:
parent
1ab350b022
commit
800db18ff1
@ -18,6 +18,11 @@ class AbortCommit(Exception):
|
|||||||
|
|
||||||
class ConfigWidgetInterface(object):
|
class ConfigWidgetInterface(object):
|
||||||
|
|
||||||
|
'''
|
||||||
|
This class defines the interface that all widgets displayed in the
|
||||||
|
Preferences dialog must implement. To create a plugin for a new
|
||||||
|
'''
|
||||||
|
|
||||||
changed_signal = None
|
changed_signal = None
|
||||||
supports_restoring_to_defaults = True
|
supports_restoring_to_defaults = True
|
||||||
restore_defaults_desc = _('Restore settings to default values. '
|
restore_defaults_desc = _('Restore settings to default values. '
|
||||||
|
@ -13,7 +13,7 @@ from PyQt4.Qt import QMainWindow, Qt, QIcon, QStatusBar, QFont, QWidget, \
|
|||||||
QToolBar, QSize, pyqtSignal, QPixmap, QToolButton, QAction, \
|
QToolBar, QSize, pyqtSignal, QPixmap, QToolButton, QAction, \
|
||||||
QDialogButtonBox, QHBoxLayout
|
QDialogButtonBox, QHBoxLayout
|
||||||
|
|
||||||
from calibre.constants import __appname__, __version__, islinux, isosx
|
from calibre.constants import __appname__, __version__, islinux
|
||||||
from calibre.gui2 import gprefs, min_available_height, available_width, \
|
from calibre.gui2 import gprefs, min_available_height, available_width, \
|
||||||
warning_dialog
|
warning_dialog
|
||||||
from calibre.gui2.preferences import init_gui, AbortCommit, get_plugin
|
from calibre.gui2.preferences import init_gui, AbortCommit, get_plugin
|
||||||
@ -164,7 +164,7 @@ class Preferences(QMainWindow):
|
|||||||
self.must_restart = False
|
self.must_restart = False
|
||||||
self.committed = False
|
self.committed = False
|
||||||
|
|
||||||
self.resize(900, 760 if isosx else 710)
|
self.resize(900, 720)
|
||||||
nh, nw = min_available_height()-25, available_width()-10
|
nh, nw = min_available_height()-25, available_width()-10
|
||||||
if nh < 0:
|
if nh < 0:
|
||||||
nh = 800
|
nh = 800
|
||||||
@ -201,7 +201,6 @@ class Preferences(QMainWindow):
|
|||||||
self.cw.layout().addWidget(self.bb)
|
self.cw.layout().addWidget(self.bb)
|
||||||
self.bb.rejected.connect(self.close, type=Qt.QueuedConnection)
|
self.bb.rejected.connect(self.close, type=Qt.QueuedConnection)
|
||||||
self.setCentralWidget(self.cw)
|
self.setCentralWidget(self.cw)
|
||||||
self.bb.setVisible(isosx)
|
|
||||||
self.browser = Browser(self)
|
self.browser = Browser(self)
|
||||||
self.browser.show_plugin.connect(self.show_plugin)
|
self.browser.show_plugin.connect(self.show_plugin)
|
||||||
self.stack.addWidget(self.browser)
|
self.stack.addWidget(self.browser)
|
||||||
|
@ -165,3 +165,11 @@ User Interface Actions
|
|||||||
:members:
|
:members:
|
||||||
:member-order: bysource
|
:member-order: bysource
|
||||||
|
|
||||||
|
Preferences Plugins
|
||||||
|
--------------------------
|
||||||
|
|
||||||
|
.. autoclass:: calibre.customize.PreferencesPlugin
|
||||||
|
:show-inheritance:
|
||||||
|
:members:
|
||||||
|
:member-order: bysource
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user