mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-08 02:34:06 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
Fix #2085445 [User Categories Editor Resizing](https://bugs.launchpad.net/calibre/+bug/2085445)
This commit is contained in:
commit
a4c4a8fa33
@ -6,7 +6,7 @@ from collections import defaultdict, namedtuple
|
|||||||
from qt.core import QApplication, QDialog, QIcon, QListWidgetItem, Qt
|
from qt.core import QApplication, QDialog, QIcon, QListWidgetItem, Qt
|
||||||
|
|
||||||
from calibre.constants import islinux
|
from calibre.constants import islinux
|
||||||
from calibre.gui2 import error_dialog, warning_dialog
|
from calibre.gui2 import error_dialog, gprefs, warning_dialog
|
||||||
from calibre.gui2.dialogs.confirm_delete import confirm
|
from calibre.gui2.dialogs.confirm_delete import confirm
|
||||||
from calibre.gui2.dialogs.tag_categories_ui import Ui_TagCategories
|
from calibre.gui2.dialogs.tag_categories_ui import Ui_TagCategories
|
||||||
from calibre.utils.icu import lower as icu_lower
|
from calibre.utils.icu import lower as icu_lower
|
||||||
@ -115,6 +115,7 @@ class TagCategories(QDialog, Ui_TagCategories):
|
|||||||
if self.current_cat_name is None:
|
if self.current_cat_name is None:
|
||||||
self.category_box.setCurrentIndex(0)
|
self.category_box.setCurrentIndex(0)
|
||||||
self.select_category(0)
|
self.select_category(0)
|
||||||
|
self.restore_geometry(gprefs, 'user_category_editor_dialog_geometry')
|
||||||
|
|
||||||
def copy_category_name_to_clipboard_clicked(self):
|
def copy_category_name_to_clipboard_clicked(self):
|
||||||
t = self.category_box.itemText(self.category_box.currentIndex())
|
t = self.category_box.itemText(self.category_box.currentIndex())
|
||||||
@ -369,4 +370,9 @@ class TagCategories(QDialog, Ui_TagCategories):
|
|||||||
for tup in self.user_categories[cat]:
|
for tup in self.user_categories[cat]:
|
||||||
cat_values.append([tup.v, tup.k, 0])
|
cat_values.append([tup.v, tup.k, 0])
|
||||||
self.categories[cat] = cat_values
|
self.categories[cat] = cat_values
|
||||||
|
super().save_geometry(gprefs, 'user_category_editor_dialog_geometry')
|
||||||
QDialog.accept(self)
|
QDialog.accept(self)
|
||||||
|
|
||||||
|
def reject(self):
|
||||||
|
super().save_geometry(gprefs, 'user_category_editor_dialog_geometry')
|
||||||
|
QDialog.reject(self)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user