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

Also preserve state of custom column comments widgets

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-21 08:06:46 +05:30
parent 0c88e6c5e2
commit 5c359f09c0
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,6 +254,14 @@ class Comments(Base):
val = None val = None
return val return val
@dynamic_property
def tab(self):
def fget(self):
return self._tb.tab
def fset(self, val):
self._tb.tab = val
return property(fget=fget, fset=fset)
class MultipleWidget(QWidget): class MultipleWidget(QWidget):
def __init__(self, parent): def __init__(self, parent):

14
src/calibre/gui2/metadata/single.py
View File

@ -23,7 +23,7 @@ from calibre.gui2.metadata.basic_widgets import (TitleEdit, AuthorsEdit,
RatingEdit, PublisherEdit, TagsEdit, FormatsManager, Cover, CommentsEdit, RatingEdit, PublisherEdit, TagsEdit, FormatsManager, Cover, CommentsEdit,
BuddyLabel, DateEdit, PubdateEdit, LanguagesEdit, RightClickButton) BuddyLabel, DateEdit, PubdateEdit, LanguagesEdit, RightClickButton)
from calibre.gui2.metadata.single_download import FullFetch from calibre.gui2.metadata.single_download import FullFetch
from calibre.gui2.custom_column_widgets import populate_metadata_page from calibre.gui2.custom_column_widgets import populate_metadata_page, Comments
from calibre.utils.config import tweaks from calibre.utils.config import tweaks
from calibre.ebooks.metadata.book.base import Metadata from calibre.ebooks.metadata.book.base import Metadata
from calibre.utils.localization import canonicalize_lang from calibre.utils.localization import canonicalize_lang
@ -49,6 +49,7 @@ class MetadataSingleDialogBase(ResizableDialog):
self.rows_to_refresh = set() self.rows_to_refresh = set()
self.metadata_before_fetch = None self.metadata_before_fetch = None
self.editing_multiple = editing_multiple self.editing_multiple = editing_multiple
self.comments_edit_state_at_apply = {}
ResizableDialog.__init__(self, parent) ResizableDialog.__init__(self, parent)
def setupUi(self, *args): # {{{ def setupUi(self, *args): # {{{
@ -104,6 +105,10 @@ class MetadataSingleDialogBase(ResizableDialog):
if len(self.db.custom_column_label_map): if len(self.db.custom_column_label_map):
self.create_custom_metadata_widgets() self.create_custom_metadata_widgets()
self.comments_edit_state_at_apply = {self.comments:None}
for widget in self.custom_metadata_widgets:
if isinstance(widget, Comments):
self.comments_edit_state_at_apply[widget] = None
self.do_layout() self.do_layout()
geom = gprefs.get('metasingle_window_geometry3', None) geom = gprefs.get('metasingle_window_geometry3', None)
@ -527,7 +532,7 @@ class MetadataSingleDialogBase(ResizableDialog):
# break_cycles has already been called, don't know why this should # break_cycles has already been called, don't know why this should
# happen but a user reported it # happen but a user reported it
return True return True
self.comments_tab_at_apply = self.comments.tab self.comments_edit_state_at_apply = {w:w.tab for w in self.comments_edit_state_at_apply}
for widget in self.basic_metadata_widgets: for widget in self.basic_metadata_widgets:
try: try:
if hasattr(widget, 'validate_for_commit'): if hasattr(widget, 'validate_for_commit'):
@ -635,8 +640,9 @@ class MetadataSingleDialogBase(ResizableDialog):
self.button_box.button(self.button_box.Ok).setDefault(True) self.button_box.button(self.button_box.Ok).setDefault(True)
self.button_box.button(self.button_box.Ok).setFocus(Qt.OtherFocusReason) self.button_box.button(self.button_box.Ok).setFocus(Qt.OtherFocusReason)
self(self.db.id(self.row_list[self.current_row])) self(self.db.id(self.row_list[self.current_row]))
if getattr(self, 'comments_tab_at_apply', None) == 'code': for w, state in self.comments_edit_state_at_apply.iteritems():
self.comments.tab = 'code' if state == 'code':
w.tab = 'code'
def break_cycles(self): def break_cycles(self):
# Break any reference cycles that could prevent python # Break any reference cycles that could prevent python