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: QCombobox::currentIndexChanged is now not subscriptable

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-24 15:47:36 +05:30
parent 32cbd1ee4b
commit d9a7ff5898
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
21 changed files with 63 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/catalog/catalog_epub_mobi.py
View File

@ -418,7 +418,7 @@ class PluginWidget(QWidget,Ui_Form):
# Hook Preset signals
self.preset_delete_pb.clicked.connect(self.preset_remove)
self.preset_save_pb.clicked.connect(self.preset_save)
self.preset_field.currentIndexChanged[native_string_type].connect(self.preset_change)
self.preset_field.currentIndexChanged.connect(self.preset_change)
self.blocking_all_signals = False
@ -613,11 +613,11 @@ class PluginWidget(QWidget,Ui_Form):
self.preset_field_values = sorted(self.presets, key=sort_key)
self.preset_field.addItems(self.preset_field_values)
def preset_change(self, item_name):
def preset_change(self, idx):
'''
Update catalog options from current preset
'''
if not item_name:
if idx < 0:
return
current_preset = self.preset_field.currentText()
@ -840,7 +840,7 @@ class CheckableTableWidgetItem(QTableWidgetItem):
def __init__(self, checked=False, is_tristate=False):
QTableWidgetItem.__init__(self, '')
self.setFlags(Qt.ItemFlags(Qt.ItemFlag.ItemIsSelectable | Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsEnabled))
self.setFlags(Qt.ItemFlag.ItemIsSelectable | Qt.ItemFlag.ItemIsUserCheckable | Qt.ItemFlag.ItemIsEnabled)
if is_tristate:
self.setFlags(self.flags() | Qt.ItemFlag.ItemIsTristate)
if checked:

2
src/calibre/gui2/convert/bulk.py
View File

@ -47,7 +47,7 @@ class BulkConfig(Config):
'values saved in a previous conversion (if they exist) instead '
'of using the defaults specified in the Preferences'))
self.output_formats.currentIndexChanged[native_string_type].connect(self.setup_pipeline)
self.output_formats.currentIndexChanged.connect(self.setup_pipeline)
self.groups.setSpacing(5)
self.groups.activated[(QModelIndex)].connect(self.show_pane)
self.groups.clicked[(QModelIndex)].connect(self.show_pane)

2
src/calibre/gui2/convert/search_and_replace.py
View File

@ -44,7 +44,7 @@ class SearchAndReplaceWidget(Widget, Ui_Form):
self.sr_search.doc_update.connect(self.update_doc)
proto = QTableWidgetItem()
proto.setFlags(Qt.ItemFlags(Qt.ItemFlag.ItemIsSelectable + Qt.ItemFlag.ItemIsEnabled))
proto.setFlags(Qt.ItemFlag.ItemIsSelectable | Qt.ItemFlag.ItemIsEnabled)
self.search_replace.setItemPrototype(proto)
self.search_replace.setColumnCount(2)
self.search_replace.setColumnWidth(0, 320)

5
src/calibre/gui2/convert/single.py
View File

@ -27,7 +27,6 @@ from calibre.gui2.convert.search_and_replace import SearchAndReplaceWidget
from calibre.gui2.convert.structure_detection import StructureDetectionWidget
from calibre.gui2.convert.toc import TOCWidget
from calibre.utils.config import prefs
from polyglot.builtins import native_string_type
class GroupModel(QAbstractListModel):
@ -80,8 +79,8 @@ class Config(QDialog):
preferred_output_format)
self.setup_pipeline()
self.input_formats.currentIndexChanged[native_string_type].connect(self.setup_pipeline)
self.output_formats.currentIndexChanged[native_string_type].connect(self.setup_pipeline)
self.input_formats.currentIndexChanged.connect(self.setup_pipeline)
self.output_formats.currentIndexChanged.connect(self.setup_pipeline)
self.groups.setSpacing(5)
self.groups.entered[(QModelIndex)].connect(self.show_group_help)
rb = self.buttonBox.button(QDialogButtonBox.StandardButton.RestoreDefaults)

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

@ -985,7 +985,7 @@ class BulkBase(Base):
self.main_widget.textChanged.connect(self.a_c_checkbox_changed)
if hasattr(self.main_widget, 'currentIndexChanged'):
# combobox widgets
self.main_widget.currentIndexChanged[int].connect(self.a_c_checkbox_changed)
self.main_widget.currentIndexChanged.connect(self.a_c_checkbox_changed)
if hasattr(self.main_widget, 'valueChanged'):
# spinbox widgets
self.main_widget.valueChanged.connect(self.a_c_checkbox_changed)

19
src/calibre/gui2/dialogs/metadata_bulk.py
View File

@ -520,7 +520,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.initialize_combos()
self.series.currentIndexChanged[int].connect(self.series_changed)
self.series.currentIndexChanged.connect(self.series_changed)
connect_lambda(self.rating.currentIndexChanged, self, lambda self:self.apply_rating.setChecked(True))
self.series.editTextChanged.connect(self.series_changed)
self.tag_editor_button.clicked.connect(self.tag_editor)
@ -727,18 +727,18 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.s_r_obj = None
self.replace_func.addItems(sorted(self.s_r_functions.keys()))
self.search_mode.currentIndexChanged[int].connect(self.s_r_search_mode_changed)
self.search_field.currentIndexChanged[int].connect(self.s_r_search_field_changed)
self.destination_field.currentIndexChanged[int].connect(self.s_r_destination_field_changed)
self.search_mode.currentIndexChanged.connect(self.s_r_search_mode_changed)
self.search_field.currentIndexChanged.connect(self.s_r_search_field_changed)
self.destination_field.currentIndexChanged.connect(self.s_r_destination_field_changed)
self.replace_mode.currentIndexChanged[int].connect(self.s_r_paint_results)
self.replace_func.currentIndexChanged[native_string_type].connect(self.s_r_paint_results)
self.replace_mode.currentIndexChanged.connect(self.s_r_paint_results)
self.replace_func.currentIndexChanged.connect(self.s_r_paint_results)
self.search_for.editTextChanged[native_string_type].connect(self.s_r_paint_results)
self.replace_with.editTextChanged[native_string_type].connect(self.s_r_paint_results)
self.test_text.editTextChanged[native_string_type].connect(self.s_r_paint_results)
self.comma_separated.stateChanged.connect(self.s_r_paint_results)
self.case_sensitive.stateChanged.connect(self.s_r_paint_results)
self.s_r_src_ident.currentIndexChanged[int].connect(self.s_r_identifier_type_changed)
self.s_r_src_ident.currentIndexChanged.connect(self.s_r_identifier_type_changed)
self.s_r_dst_ident.textChanged.connect(self.s_r_paint_results)
self.s_r_template.lost_focus.connect(self.s_r_template_changed)
self.central_widget.setCurrentIndex(0)
@ -762,7 +762,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.query_field.addItem("")
self.query_field_values = sorted(self.queries, key=sort_key)
self.query_field.addItems(self.query_field_values)
self.query_field.currentIndexChanged[native_string_type].connect(self.s_r_query_change)
self.query_field.currentIndexChanged.connect(self.s_r_query_change)
self.query_field.setCurrentIndex(0)
self.search_field.setCurrentIndex(0)
self.s_r_search_field_changed(0)
@ -1360,7 +1360,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.query_field.blockSignals(False)
self.query_field.setCurrentIndex(self.query_field.findText(name))
def s_r_query_change(self, item_name):
def s_r_query_change(self, idx):
item_name = self.query_field.currentText()
if not item_name:
self.s_r_reset_query_fields()
self.saved_search_name = ''

2
src/calibre/gui2/dialogs/plugin_updater.py
View File

@ -467,7 +467,7 @@ class PluginUpdaterDialog(SizePersistedDialog):
layout.addLayout(header_layout)
self.filter_combo = PluginFilterComboBox(self)
self.filter_combo.setMinimumContentsLength(20)
self.filter_combo.currentIndexChanged[int].connect(self._filter_combo_changed)
self.filter_combo.currentIndexChanged.connect(self._filter_combo_changed)
la = QLabel(_('Filter list of &plugins')+':', self)
la.setBuddy(self.filter_combo)
header_layout.addWidget(la)

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

@ -106,8 +106,8 @@ class TagCategories(QDialog, Ui_TagCategories):
self.unapply_button.clicked.connect(self.unapply_button_clicked)
self.add_category_button.clicked.connect(self.add_category)
self.rename_category_button.clicked.connect(self.rename_category)
self.category_box.currentIndexChanged[int].connect(self.select_category)
self.category_filter_box.currentIndexChanged[int].connect(
self.category_box.currentIndexChanged.connect(self.select_category)
self.category_filter_box.currentIndexChanged.connect(
self.display_filtered_categories)
self.item_filter_box.textEdited.connect(self.display_filtered_items)
self.delete_category_button.clicked.connect(self.del_category)

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

@ -646,8 +646,8 @@ class ChooseTheme(Dialog):
add_row(_('&Sort by:'), sb)
sb.addItems([_('Number of icons'), _('Popularity'), _('Name'),])
sb.setEditable(False), sb.setCurrentIndex(gprefs.get('choose_icon_theme_sort_by', 1))
sb.currentIndexChanged[int].connect(self.re_sort)
sb.currentIndexChanged[int].connect(lambda : gprefs.set('choose_icon_theme_sort_by', sb.currentIndex()))
sb.currentIndexChanged.connect(self.re_sort)
sb.currentIndexChanged.connect(lambda : gprefs.set('choose_icon_theme_sort_by', sb.currentIndex()))
self.theme_list = tl = QListWidget(self)
tl.setVerticalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel)
self.delegate = Delegate(tl)

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

@ -23,7 +23,6 @@ from calibre.library.save_to_disk import plugboard_any_format_value, \
from calibre.srv.content import plugboard_content_server_value, plugboard_content_server_formats
from calibre.gui2.email import plugboard_email_value, plugboard_email_formats
from calibre.utils.formatter import validation_formatter
from polyglot.builtins import native_string_type
class ConfigWidget(ConfigWidgetBase, Ui_Form):
@ -98,10 +97,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.dest_widgets.append(w)
self.fields_layout.addWidget(w, 5+i, 1, 1, 1)
self.edit_device.currentIndexChanged[native_string_type].connect(self.edit_device_changed)
self.edit_format.currentIndexChanged[native_string_type].connect(self.edit_format_changed)
self.new_device.currentIndexChanged[native_string_type].connect(self.new_device_changed)
self.new_format.currentIndexChanged[native_string_type].connect(self.new_format_changed)
self.edit_device.currentIndexChanged.connect(self.edit_device_changed)
self.edit_format.currentIndexChanged.connect(self.edit_format_changed)
self.new_device.currentIndexChanged.connect(self.new_device_changed)
self.new_format.currentIndexChanged.connect(self.new_format_changed)
self.existing_plugboards.itemClicked.connect(self.existing_pb_clicked)
self.ok_button.clicked.connect(self.ok_clicked)
self.del_button.clicked.connect(self.del_clicked)
@ -136,7 +135,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
idx = self.dest_fields.index(dst)
self.dest_widgets[i].setCurrentIndex(idx)
def edit_device_changed(self, txt):
def edit_device_changed(self, idx):
txt = self.edit_device.currentText()
self.current_device = None
if txt == '':
self.clear_fields(new_boxes=False)
@ -157,7 +157,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.ok_button.setEnabled(True)
self.del_button.setEnabled(True)
def edit_format_changed(self, txt):
def edit_format_changed(self, idx):
txt = self.edit_format.currentText()
self.edit_device.setCurrentIndex(0)
self.current_device = None
self.current_format = None
@ -191,7 +192,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
'will probably have no effect.'),
show=True)
def new_device_changed(self, txt):
def new_device_changed(self, idx):
txt = self.new_device.currentText()
self.current_device = None
if txt == '':
self.clear_fields(edit_boxes=False)
@ -275,7 +277,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.set_fields()
def new_format_changed(self, txt):
def new_format_changed(self, idx):
txt = self.new_format.currentText()
self.current_format = None
self.current_device = None
self.new_device.setCurrentIndex(0)

10
src/calibre/gui2/preferences/search.py
View File

@ -86,14 +86,14 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
r('similar_series_match_kind', db.prefs, choices=ml)
r('similar_publisher_match_kind', db.prefs, choices=ml)
self.set_similar_fields(initial=True)
self.similar_authors_search_key.currentIndexChanged[int].connect(self.something_changed)
self.similar_tags_search_key.currentIndexChanged[int].connect(self.something_changed)
self.similar_series_search_key.currentIndexChanged[int].connect(self.something_changed)
self.similar_publisher_search_key.currentIndexChanged[int].connect(self.something_changed)
self.similar_authors_search_key.currentIndexChanged.connect(self.something_changed)
self.similar_tags_search_key.currentIndexChanged.connect(self.something_changed)
self.similar_series_search_key.currentIndexChanged.connect(self.something_changed)
self.similar_publisher_search_key.currentIndexChanged.connect(self.something_changed)
self.gst_delete_button.setEnabled(False)
self.gst_save_button.setEnabled(False)
self.gst_names.currentIndexChanged[int].connect(self.gst_index_changed)
self.gst_names.currentIndexChanged.connect(self.gst_index_changed)
self.gst_names.editTextChanged.connect(self.gst_text_changed)
self.gst_value.textChanged.connect(self.gst_text_changed)
self.gst_save_button.clicked.connect(self.gst_save_clicked)

12
src/calibre/gui2/preferences/template_functions.py
View File

@ -169,7 +169,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
raise AbortInitialize()
self.build_function_names_box()
self.function_name.currentIndexChanged[native_string_type].connect(self.function_index_changed)
self.function_name.currentIndexChanged.connect(self.function_index_changed)
self.function_name.editTextChanged.connect(self.function_name_edited)
self.argument_count.valueChanged.connect(self.enable_replace_button)
self.documentation.textChanged.connect(self.enable_replace_button)
@ -187,7 +187,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.te_textbox = self.template_editor.textbox
self.te_name = self.template_editor.template_name
self.st_build_function_names_box()
self.te_name.currentIndexChanged[native_string_type].connect(self.st_function_index_changed)
self.te_name.currentIndexChanged.connect(self.st_function_index_changed)
self.te_name.editTextChanged.connect(self.st_template_name_edited)
self.st_create_button.clicked.connect(self.st_create_button_clicked)
self.st_delete_button.clicked.connect(self.st_delete_button_clicked)
@ -305,8 +305,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.replace_button.setEnabled(False)
self.program.setReadOnly(False)
def function_index_changed(self, txt):
txt = str(txt)
def function_index_changed(self, idx):
txt = self.function_name.currentText()
self.create_button.setEnabled(False)
if not txt:
self.argument_count.clear()
@ -426,8 +426,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
self.st_test_template_button.setEnabled(b)
self.te_textbox.setReadOnly(False)
def st_function_index_changed(self, txt):
txt = str(txt)
def st_function_index_changed(self, idx):
txt = self.te_name.currentText()
if self.st_current_program_name:
if self.st_current_program_text != self.te_textbox.toPlainText():
box = warning_dialog(self.gui, _('Template functions'),

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

@ -268,7 +268,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
current_model = CurrentModel(key, gui)
self.models[key] = (all_model, current_model)
self.what.setCurrentIndex(0)
self.what.currentIndexChanged[int].connect(self.what_changed)
self.what.currentIndexChanged.connect(self.what_changed)
self.what_changed(0)
self.add_action_button.clicked.connect(self.add_action)

10
src/calibre/gui2/pyqt6_compat.py
View File

@ -8,8 +8,9 @@
from qt.core import (
QAbstractItemView, QAction, QComboBox, QDialog, QDialogButtonBox, QDrag,
QEventLoop, QFontMetrics, QFrame, QImage, QIODevice, QLineEdit, QMenu,
QMessageBox, QModelIndex, QSinglePointEvent, Qt, QThread, QToolButton, QPalette
QEventLoop, QFontMetrics, QFormLayout, QFrame, QImage, QIODevice, QLineEdit,
QMenu, QMessageBox, QModelIndex, QPalette, QSinglePointEvent, Qt, QThread,
QToolButton
)
from calibre_extensions import progress_indicator
@ -57,7 +58,10 @@ QModelIndex.child = lambda self, row, column: self.model().index(row, column, se
QFontMetrics.width = lambda self, text: self.horizontalAdvance(text)
# Restore enum values to various classes
for cls in (Qt, QDialog, QToolButton, QAbstractItemView, QDialogButtonBox, QFrame, QComboBox, QLineEdit, QAction, QImage, QIODevice, QPalette):
for cls in (
Qt, QDialog, QToolButton, QAbstractItemView, QDialogButtonBox, QFrame, QComboBox,
QLineEdit, QAction, QImage, QIODevice, QPalette, QFormLayout
):
for var in tuple(vars(cls).values()):
m = getattr(var, '__members__', {})
for k, v in m.items():

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

@ -191,7 +191,7 @@ class CreateVirtualLibrary(QDialog): # {{{
self.original_search = virt_libs.get(editing, '')
self.vl_text.setText(self.original_search)
self.new_name = editing
self.vl_name.currentIndexChanged[int].connect(self.name_index_changed)
self.vl_name.currentIndexChanged.connect(self.name_index_changed)
self.vl_name.lineEdit().textEdited.connect(self.name_text_edited)
self.resize(self.sizeHint()+QSize(150, 25))

2
src/calibre/gui2/tweak_book/editor/themes.py
View File

@ -568,7 +568,7 @@ class ThemeEditor(Dialog):
t.setMinimumWidth(200)
if t.count() > 0:
t.setCurrentIndex(0)
t.currentIndexChanged[int].connect(self.show_theme)
t.currentIndexChanged.connect(self.show_theme)
h.addWidget(t)
self.add_button = b = QPushButton(QIcon(I('plus.png')), _('Add &new theme'), self)

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

@ -71,7 +71,7 @@ class BasicSettings(QWidget): # {{{
def choices_widget(self, name, choices, fallback_val, none_val, prefs=None):
prefs = prefs or tprefs
widget = QComboBox(self)
widget.currentIndexChanged[int].connect(self.emit_changed)
widget.currentIndexChanged.connect(self.emit_changed)
for key, human in sorted(iteritems(choices), key=lambda key_human: key_human[1] or key_human[0]):
widget.addItem(human or key, key)

2
src/calibre/gui2/tweak_book/reports.py
View File

@ -1078,7 +1078,7 @@ class CSSWidget(QWidget):
o.addItems([_('Ascending'), _('Descending')])
o.setCurrentIndex(0 if self.read_state('sort-ascending', True) else 1)
o.setEditable(False)
o.currentIndexChanged[int].connect(self.resort)
o.currentIndexChanged.connect(self.resort)
h.addWidget(o)
h.addStretch(10)
self.summary = la = QLabel('\xa0')

4
src/calibre/gui2/tweak_book/search.py
View File

@ -334,7 +334,7 @@ class SearchWidget(QWidget):
da.setToolTip('<p>'+_("Make the '.' special character match any character at all, including a newline"))
ol.addWidget(da)
self.mode_box.currentIndexChanged[int].connect(self.mode_changed)
self.mode_box.currentIndexChanged.connect(self.mode_changed)
self.mode_changed(self.mode_box.currentIndex())
def edit_function(self):
@ -739,7 +739,7 @@ class EditSearch(QFrame): # {{{
h.addWidget(b)
b.clicked.connect(self.emit_done)
self.mode_box.currentIndexChanged[int].connect(self.mode_changed)
self.mode_box.currentIndexChanged.connect(self.mode_changed)
self.mode_changed(self.mode_box.currentIndex())
def edit_function(self):

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

@ -747,7 +747,7 @@ class ComboBoxWithHelp(QComboBox): # {{{
def __init__(self, parent=None):
QComboBox.__init__(self, parent)
self.currentIndexChanged[int].connect(self.index_changed)
self.currentIndexChanged.connect(self.index_changed)
self.help_text = ''
self.state_set = False

2
src/calibre/gui2/wizard/__init__.py
View File

@ -685,7 +685,7 @@ class LibraryPage(QWizardPage, LibraryUI):
self.registerField('library_location', self.location)
self.button_change.clicked.connect(self.change)
self.init_languages()
self.language.currentIndexChanged[int].connect(self.change_language)
self.language.currentIndexChanged.connect(self.change_language)
self.location.textChanged.connect(self.location_text_changed)
self.set_move_lib_label_text()