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

Enable Esc key in preferences window

Browse Source
This commit is contained in:
Kovid Goyal 2010-09-05 18:23:57 -06:00
parent b957bc1d12
commit 949156cf38
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/gui2/preferences/main.py
View File

@ -9,8 +9,8 @@ import textwrap
from functools import partial from functools import partial
from PyQt4.Qt import QMainWindow, Qt, QIcon, QStatusBar, QFont, QWidget, \ from PyQt4.Qt import QMainWindow, Qt, QIcon, QStatusBar, QFont, QWidget, \
QScrollArea, QStackedWidget, QVBoxLayout, QLabel, QFrame, \ QScrollArea, QStackedWidget, QVBoxLayout, QLabel, QFrame, QKeySequence, \
QToolBar, QSize, pyqtSignal, QSizePolicy, QToolButton QToolBar, QSize, pyqtSignal, QSizePolicy, QToolButton, QAction
from calibre.constants import __appname__, __version__ from calibre.constants import __appname__, __version__
from calibre.gui2 import gprefs, min_available_height, available_width, \ from calibre.gui2 import gprefs, min_available_height, available_width, \
@ -41,7 +41,7 @@ class StatusBar(QStatusBar): # {{{
# }}} # }}}
class Category(QWidget): class Category(QWidget): # {{{
plugin_activated = pyqtSignal(object) plugin_activated = pyqtSignal(object)
@ -82,8 +82,9 @@ class Category(QWidget):
def triggered(self, plugin, *args): def triggered(self, plugin, *args):
self.plugin_activated.emit(plugin) self.plugin_activated.emit(plugin)
# }}}
class Browser(QScrollArea): class Browser(QScrollArea): # {{{
show_plugin = pyqtSignal(object) show_plugin = pyqtSignal(object)
@ -122,7 +123,7 @@ class Browser(QScrollArea):
self._layout.addWidget(w) self._layout.addWidget(w)
w.plugin_activated.connect(self.show_plugin.emit) w.plugin_activated.connect(self.show_plugin.emit)
# }}}
class Preferences(QMainWindow): class Preferences(QMainWindow):
@ -141,6 +142,10 @@ class Preferences(QMainWindow):
nh = min(self.height(), nh) nh = min(self.height(), nh)
nw = min(self.width(), nw) nw = min(self.width(), nw)
self.resize(nw, nh) self.resize(nw, nh)
self.esc_action = QAction(self)
self.addAction(self.esc_action)
self.esc_action.setShortcut(QKeySequence(Qt.Key_Escape))
self.esc_action.triggered.connect(self.esc)
geom = gprefs.get('preferences_window_geometry', None) geom = gprefs.get('preferences_window_geometry', None)
if geom is not None: if geom is not None:
@ -236,6 +241,12 @@ class Preferences(QMainWindow):
self.stack.setCurrentIndex(0) self.stack.setCurrentIndex(0)
self.setWindowIcon(QIcon(I('config.png'))) self.setWindowIcon(QIcon(I('config.png')))
def esc(self, *args):
if self.stack.currentIndex() == 1:
self.hide_plugin()
elif self.stack.currentIndex() == 0:
self.close()
def commit(self, *args): def commit(self, *args):
try: try:
must_restart = self.showing_widget.commit() must_restart = self.showing_widget.commit()