Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug #2018548: NoneType error when trying to open category manager

Browse Source
This commit is contained in:
Charles Haley 2023-05-05 10:26:51 +01:00
parent 4f364dc351
commit 14a331526a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,12 +165,6 @@ class TagListEditor(QDialog, Ui_TagListEditor):
self.setWindowFlags(self.windowFlags()&(~Qt.WindowType.WindowContextHelpButtonHint)) self.setWindowFlags(self.windowFlags()&(~Qt.WindowType.WindowContextHelpButtonHint))
self.setWindowIcon(icon) self.setWindowIcon(icon)
# Get saved geometry info
try:
self.table_column_widths = gprefs.get('tag_list_editor_table_widths', None)
except:
pass
# initialization # initialization
self.to_rename = {} self.to_rename = {}
self.to_delete = set() self.to_delete = set()
@ -370,6 +364,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
# I'm not sure if this is standard Qt behavior or behavior triggered by # I'm not sure if this is standard Qt behavior or behavior triggered by
# something in this class, but replacing the table fixes it. # something in this class, but replacing the table fixes it.
if self.table is not None: if self.table is not None:
self.save_geometry()
self.gridlayout.removeWidget(self.table) self.gridlayout.removeWidget(self.table)
sip.delete(self.table) sip.delete(self.table)
self.table = TleTableWidget(self) self.table = TleTableWidget(self)
@ -391,8 +386,6 @@ class TagListEditor(QDialog, Ui_TagListEditor):
vh.sectionResized.connect(self.row_height_changed) vh.sectionResized.connect(self.row_height_changed)
self.table.setColumnCount(4) self.table.setColumnCount(4)
for col,width in enumerate(self.table_column_widths):
self.table.setColumnWidth(col, width)
self.edit_delegate = EditColumnDelegate(self.table, self.check_for_deleted_items) self.edit_delegate = EditColumnDelegate(self.table, self.check_for_deleted_items)
self.edit_delegate.editing_finished.connect(self.stop_editing) self.edit_delegate.editing_finished.connect(self.stop_editing)
@ -420,7 +413,12 @@ class TagListEditor(QDialog, Ui_TagListEditor):
self.not_found_label_timer_event, type=Qt.ConnectionType.QueuedConnection) self.not_found_label_timer_event, type=Qt.ConnectionType.QueuedConnection)
self.table.setEditTriggers(QAbstractItemView.EditTrigger.EditKeyPressed) self.table.setEditTriggers(QAbstractItemView.EditTrigger.EditKeyPressed)
self.restore_geometry(gprefs, 'tag_list_editor_dialog_geometry') self.restore_geometry(gprefs, 'tag_list_editor_dialog_geometry')
self.table_column_widths = gprefs.get('tag_list_editor_table_widths', None)
if self.table_column_widths is not None:
for col,width in enumerate(self.table_column_widths):
self.table.setColumnWidth(col, width)
self.table.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) self.table.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.table.customContextMenuRequested.connect(self.show_context_menu) self.table.customContextMenuRequested.connect(self.show_context_menu)
@ -541,7 +539,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
def do_filter(self): def do_filter(self):
self.fill_in_table(None, None, False) self.fill_in_table(None, None, False)
def table_column_resized(self, col, old, new): def table_column_resized(self, *args):
self.table_column_widths = [] self.table_column_widths = []
for c in range(0, self.table.columnCount()): for c in range(0, self.table.columnCount()):
self.table_column_widths.append(self.table.columnWidth(c)) self.table_column_widths.append(self.table.columnWidth(c))