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

More stupid PyQt enums

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-20 11:06:21 +05:30
parent c857c89fbe
commit 168e58d704
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/dialogs/tag_list_editor.py
View File

@ -5,7 +5,7 @@
from functools import partial
from PyQt5.Qt import (Qt, QDialog, QTableWidgetItem, QIcon, QByteArray, QSize,
from PyQt5.Qt import (Qt, QDialog, QTableWidgetItem, QIcon, QByteArray, QSize, QAbstractItemView,
QDialogButtonBox, QTableWidget, QItemDelegate, QApplication,
pyqtSignal, QAction, QFrame, QLabel, QTimer, QMenu, QColor)
@ -296,7 +296,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
ca.triggered.connect(partial(self.search_for_books, item))
if disable_copy_paste_search:
ca.setEnabled(False)
if self.table.state() == self.table.EditingState:
if self.table.state() == QAbstractItemView.State.EditingState:
m.addSeparator()
case_menu = QMenu(_('Change case'))
action_upper_case = case_menu.addAction(_('Upper case'))

6
src/calibre/gui2/keyboard.py
View File

@ -10,7 +10,7 @@ from collections import OrderedDict
from functools import partial
from PyQt5.Qt import (QObject, QKeySequence, QAbstractItemModel, QModelIndex, QItemSelectionModel,
Qt, QStyledItemDelegate, QTextDocument, QStyle, pyqtSignal, QFrame,
Qt, QStyledItemDelegate, QTextDocument, QStyle, pyqtSignal, QFrame, QAbstractItemView,
QApplication, QSize, QRectF, QWidget, QTreeView, QHBoxLayout, QVBoxLayout,
QGridLayout, QLabel, QRadioButton, QPushButton, QToolButton, QIcon, QEvent)
try:
@ -687,7 +687,7 @@ class ShortcutConfig(QWidget): # {{{
self.changed_signal.emit()
def commit(self):
if self.view.state() == self.view.EditingState:
if self.view.state() == QAbstractItemView.State.EditingState:
self.delegate.accept_changes()
self._model.commit()
@ -700,7 +700,7 @@ class ShortcutConfig(QWidget): # {{{
@property
def is_editing(self):
return self.view.state() == self.view.EditingState
return self.view.state() == QAbstractItemView.State.EditingState
def find(self, query):
if not query:

2
src/calibre/gui2/library/alternate_views.py
View File

@ -53,7 +53,7 @@ def handle_enter_press(self, ev, special_action=None, has_edit_cell=True):
mods = ev.modifiers()
if mods & Qt.Modifier.CTRL or mods & Qt.Modifier.ALT or mods & Qt.Modifier.SHIFT or mods & Qt.Modifier.META:
return
if self.state() != self.EditingState and self.hasFocus() and self.currentIndex().isValid():
if self.state() != QAbstractItemView.State.EditingState and self.hasFocus() and self.currentIndex().isValid():
from calibre.gui2.ui import get_gui
ev.ignore()
tweak = tweaks['enter_key_behavior']

4
src/calibre/gui2/preferences/emailp.py
View File

@ -6,7 +6,7 @@
import re
import textwrap
from PyQt5.Qt import QAbstractTableModel, QFont, Qt
from PyQt5.Qt import QAbstractTableModel, QFont, Qt, QAbstractItemView
from calibre.gui2 import gprefs
from calibre.gui2.preferences import AbortCommit, ConfigWidgetBase, test_widget
@ -245,7 +245,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
# No defaults to restore to
def commit(self):
if self.email_view.state() == self.email_view.EditingState:
if self.email_view.state() == QAbstractItemView.State.EditingState:
# Ensure that the cell being edited is committed by switching focus
# to some other widget, which automatically closes the open editor
self.send_email_widget.setFocus(Qt.FocusReason.OtherFocusReason)

4
src/calibre/gui2/shortcuts.py
View File

@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
from functools import partial
from PyQt5.Qt import (
QAbstractListModel, Qt, QKeySequence, QListView, QVBoxLayout, QLabel,
QAbstractListModel, Qt, QKeySequence, QListView, QVBoxLayout, QLabel, QAbstractItemView,
QHBoxLayout, QWidget, QApplication, QStyledItemDelegate, QStyle, QIcon,
QTextDocument, QRectF, QFrame, QSize, QFont, QKeyEvent, QRadioButton, QPushButton, QToolButton, QEvent
)
@ -309,7 +309,7 @@ class ShortcutConfig(QWidget):
@property
def is_editing(self):
return self.view.state() == self.view.EditingState
return self.view.state() == QAbstractItemView.State.EditingState
if __name__ == '__main__':

4
src/calibre/gui2/tag_browser/view.py
View File

@ -10,7 +10,7 @@ import os, re, traceback
from functools import partial
from PyQt5.Qt import (
QStyledItemDelegate, Qt, QTreeView, pyqtSignal, QSize, QIcon, QApplication, QStyle,
QStyledItemDelegate, Qt, QTreeView, pyqtSignal, QSize, QIcon, QApplication, QStyle, QAbstractItemView,
QMenu, QPoint, QToolTip, QCursor, QDrag, QRect, QModelIndex,
QLinearGradient, QPalette, QColor, QPen, QBrush, QFont, QTimer
)
@ -335,7 +335,7 @@ class TagsView(QTreeView): # {{{
# I don't see how current_index can ever be not valid, but ...
if self.currentIndex().isValid():
if (gprefs['tag_browser_allow_keyboard_focus'] and
event.key() == Qt.Key.Key_Return and self.state() != self.EditingState):
event.key() == Qt.Key.Key_Return and self.state() != QAbstractItemView.State.EditingState):
self.toggle_current_index()
return
# If this is an edit request, mark the node to request whether to use VLs