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

pyqt6: More random fixes

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-24 16:02:35 +05:30
parent d9a7ff5898
commit fbacea46ab
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/custom_column_widgets.py
View File

@ -557,7 +557,7 @@ class Text(Base):
def edit(self): def edit(self):
ctrl_or_shift_pressed = (QApplication.keyboardModifiers() & ctrl_or_shift_pressed = (QApplication.keyboardModifiers() &
(Qt.KeyboardModifier.ControlModifier + Qt.KeyboardModifier.ShiftModifier)) (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.ShiftModifier))
if (self.getter() != self.initial_val and (self.getter() or self.initial_val)): if (self.getter() != self.initial_val and (self.getter() or self.initial_val)):
d = _save_dialog(self.parent, _('Values changed'), d = _save_dialog(self.parent, _('Values changed'),
_('You have changed the values. In order to use this ' _('You have changed the values. In order to use this '

2
src/calibre/gui2/dialogs/choose_library.ui
View File

@ -140,7 +140,7 @@ user categories, and other information from the old to the new library</string>
<item row="2" column="1" colspan="2"> <item row="2" column="1" colspan="2">
<widget class="HistoryLineEdit" name="location"> <widget class="HistoryLineEdit" name="location">
<property name="sizeAdjustPolicy"> <property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum> <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
</property> </property>
<property name="minimumContentsLength"> <property name="minimumContentsLength">
<number>40</number> <number>40</number>

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

@ -506,7 +506,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
def set_word_wrap(self, to_what): def set_word_wrap(self, to_what):
gprefs['gpm_template_editor_word_wrap_mode'] = to_what gprefs['gpm_template_editor_word_wrap_mode'] = to_what
self.textbox.setWordWrapMode(QTextOption.WordWrap if to_what else QTextOption.NoWrap) self.textbox.setWordWrapMode(QTextOption.WrapMode.WordWrap if to_what else QTextOption.WrapMode.NoWrap)
def load_last_template_text(self): def load_last_template_text(self):
from calibre.customize.ui import find_plugin from calibre.customize.ui import find_plugin
@ -561,7 +561,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
def set_up_font_boxes(self): def set_up_font_boxes(self):
font = self.get_current_font() font = self.get_current_font()
self.font_box.setWritingSystem(QFontDatabase.Latin) self.font_box.setWritingSystem(QFontDatabase.WritingSystem.Latin)
self.font_box.setCurrentFont(font) self.font_box.setCurrentFont(font)
self.font_box.setEditable(False) self.font_box.setEditable(False)
gprefs['gpm_template_editor_font'] = str(font.family()) gprefs['gpm_template_editor_font'] = str(font.family())

8
src/calibre/gui2/library/delegates.py
View File

@ -157,7 +157,7 @@ ClearingDoubleSpinBox = make_clearing_spinbox(QDoubleSpinBox)
def check_key_modifier(which_modifier): def check_key_modifier(which_modifier):
v = int(QApplication.keyboardModifiers() & (Qt.KeyboardModifier.ControlModifier + Qt.KeyboardModifier.ShiftModifier)) v = QApplication.keyboardModifiers() & (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.ShiftModifier)
return v == which_modifier return v == which_modifier
@ -240,7 +240,7 @@ class DateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
if check_key_modifier(Qt.KeyboardModifier.ControlModifier): if check_key_modifier(Qt.KeyboardModifier.ControlModifier):
val = UNDEFINED_QDATETIME val = UNDEFINED_QDATETIME
elif check_key_modifier(Qt.KeyboardModifier.ShiftModifier + Qt.KeyboardModifier.ControlModifier): elif check_key_modifier(Qt.KeyboardModifier.ShiftModifier | Qt.KeyboardModifier.ControlModifier):
val = now() val = now()
else: else:
val = index.data(Qt.ItemDataRole.EditRole) val = index.data(Qt.ItemDataRole.EditRole)
@ -273,7 +273,7 @@ class PubDateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
val = index.data(Qt.ItemDataRole.EditRole) val = index.data(Qt.ItemDataRole.EditRole)
if check_key_modifier(Qt.KeyboardModifier.ControlModifier): if check_key_modifier(Qt.KeyboardModifier.ControlModifier):
val = UNDEFINED_QDATETIME val = UNDEFINED_QDATETIME
elif check_key_modifier(Qt.KeyboardModifier.ShiftModifier + Qt.KeyboardModifier.ControlModifier): elif check_key_modifier(Qt.KeyboardModifier.ShiftModifier | Qt.KeyboardModifier.ControlModifier):
val = now() val = now()
elif is_date_undefined(val): elif is_date_undefined(val):
val = QDate.currentDate() val = QDate.currentDate()
@ -446,7 +446,7 @@ class CcDateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
def setEditorData(self, editor, index): def setEditorData(self, editor, index):
if check_key_modifier(Qt.KeyboardModifier.ControlModifier): if check_key_modifier(Qt.KeyboardModifier.ControlModifier):
val = UNDEFINED_QDATETIME val = UNDEFINED_QDATETIME
elif check_key_modifier(Qt.KeyboardModifier.ShiftModifier + Qt.KeyboardModifier.ControlModifier): elif check_key_modifier(Qt.KeyboardModifier.ShiftModifier | Qt.KeyboardModifier.ControlModifier):
val = now() val = now()
else: else:
val = index.data(Qt.ItemDataRole.EditRole) val = index.data(Qt.ItemDataRole.EditRole)

2
src/calibre/gui2/metadata/basic_widgets.py
View File

@ -1434,7 +1434,7 @@ class TagsEdit(EditWithComplete, ToMetadataMixin): # {{{
def edit(self, db, id_): def edit(self, db, id_):
ctrl_or_shift_pressed = (QApplication.keyboardModifiers() & ctrl_or_shift_pressed = (QApplication.keyboardModifiers() &
(Qt.KeyboardModifier.ControlModifier + Qt.KeyboardModifier.ShiftModifier)) (Qt.KeyboardModifier.ControlModifier | Qt.KeyboardModifier.ShiftModifier))
if self.changed: if self.changed:
d = save_dialog(self, _('Tags changed'), d = save_dialog(self, _('Tags changed'),
_('You have changed the tags. In order to use the tags' _('You have changed the tags. In order to use the tags'

2
src/calibre/gui2/preferences/tweaks.py
View File

@ -393,7 +393,7 @@ class ConfigWidget(ConfigWidgetBase):
self.search = sb = SearchBox2(self) self.search = sb = SearchBox2(self)
sb.sizePolicy().setHorizontalStretch(10) sb.sizePolicy().setHorizontalStretch(10)
sb.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLength) sb.setSizeAdjustPolicy(QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
sb.setMinimumContentsLength(10) sb.setMinimumContentsLength(10)
g.setColumnStretch(0, 100) g.setColumnStretch(0, 100)
g.addWidget(self.search, 0, 0, 1, 1) g.addWidget(self.search, 0, 0, 1, 1)

2
src/calibre/gui2/qt_file_dialogs.py
View File

@ -96,7 +96,7 @@ class FileDialog(QObject):
self.selected_files = [] self.selected_files = []
use_native_dialog = 'CALIBRE_NO_NATIVE_FILEDIALOGS' not in os.environ use_native_dialog = 'CALIBRE_NO_NATIVE_FILEDIALOGS' not in os.environ
with sanitize_env_vars(): with sanitize_env_vars():
opts = QFileDialog.Option() opts = QFileDialog.Option(0)
if not use_native_dialog: if not use_native_dialog:
opts |= QFileDialog.Option.DontUseNativeDialog opts |= QFileDialog.Option.DontUseNativeDialog
if has_long_filter: if has_long_filter:

2
src/calibre/gui2/widgets.py
View File

@ -1280,7 +1280,7 @@ class PaperSizes(QComboBox): # {{{
from calibre.ebooks.conversion.plugins.pdf_output import PAPER_SIZES from calibre.ebooks.conversion.plugins.pdf_output import PAPER_SIZES
choices = PAPER_SIZES choices = PAPER_SIZES
for a in sorted(choices, key=numeric_sort_key): for a in sorted(choices, key=numeric_sort_key):
s = getattr(QPageSize, a.capitalize()) s = getattr(QPageSize.PageSizeId, a.capitalize())
sz = QPageSize.definitionSize(s) sz = QPageSize.definitionSize(s)
unit = {QPageSize.Unit.Millimeter: 'mm', QPageSize.Unit.Inch: 'inch'}[QPageSize.definitionUnits(s)] unit = {QPageSize.Unit.Millimeter: 'mm', QPageSize.Unit.Inch: 'inch'}[QPageSize.definitionUnits(s)]
name = f'{QPageSize.name(s)} ({sz.width():g} x {sz.height():g} {unit})' name = f'{QPageSize.name(s)} ({sz.width():g} x {sz.height():g} {unit})'