diff --git a/src/calibre/gui2/cover_flow.py b/src/calibre/gui2/cover_flow.py index fa1584376f..4dcf190bcf 100644 --- a/src/calibre/gui2/cover_flow.py +++ b/src/calibre/gui2/cover_flow.py @@ -253,8 +253,7 @@ class CBDialog(QDialog): self.resize(w, h) self.action_fs_toggle = a = QAction(self) self.addAction(a) - a.setShortcuts([QKeySequence('F11', QKeySequence.SequenceFormat.PortableText), - QKeySequence('Ctrl+Shift+F', QKeySequence.SequenceFormat.PortableText)]) + a.setShortcuts([QKeySequence(QKeySequence.StandardKey.FullScreen)]) a.triggered.connect(self.toggle_fullscreen) self.action_esc_fs = a = QAction(self) a.triggered.connect(self.show_normal) diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py index d57a1708a2..0cc011a798 100644 --- a/src/calibre/gui2/preferences/look_feel.py +++ b/src/calibre/gui2/preferences/look_feel.py @@ -550,8 +550,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): keys = [QKeySequence('F11', QKeySequence.SequenceFormat.PortableText), QKeySequence( 'Ctrl+Shift+F', QKeySequence.SequenceFormat.PortableText)] keys = [unicode_type(x.toString(QKeySequence.SequenceFormat.NativeText)) for x in keys] - self.fs_help_msg.setText(unicode_type(self.fs_help_msg.text())%( - _(' or ').join(keys))) + self.fs_help_msg.setText(self.fs_help_msg.text()%( + QKeySequence(QKeySequence.StandardKey.FullScreen).toString(QKeySequence.SequenceFormat.NativeText))) self.size_calculated.connect(self.update_cg_cache_size, type=Qt.ConnectionType.QueuedConnection) self.tabWidget.currentChanged.connect(self.tab_changed) diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index 6a8d6f4e0c..9be9c002c0 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -1244,7 +1244,7 @@ them to all have the same width and height margin-left: 1.5em - You can press the %s keys to toggle full screen mode. + You can press the %s key to toggle full screen mode. true