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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source 
Fixes #1562527 [Edit Metadata: Custom Text columns remain selected](https://bugs.launchpad.net/calibre/+bug/1562527)
This commit is contained in:
Kovid Goyal 2016-03-27 21:33:57 +05:30
commit a8fa22a15f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ class Text(Base):
if self.col_metadata['is_multiple']: if self.col_metadata['is_multiple']:
self.setter(val) self.setter(val)
else: else:
self.widgets[1].show_initial_value(val) self.widgets[1].setText(val)
self.initial_val = self.current_val self.initial_val = self.current_val
def setter(self, val): def setter(self, val):
@ -428,7 +428,7 @@ class Series(Base):
val = self.normalize_db_val(val) val = self.normalize_db_val(val)
self.name_widget.blockSignals(True) self.name_widget.blockSignals(True)
self.name_widget.update_items_cache(values) self.name_widget.update_items_cache(values)
self.name_widget.show_initial_value(val) self.name_widget.setText(val)
self.name_widget.blockSignals(False) self.name_widget.blockSignals(False)
self.initial_val, self.initial_index = self.current_val self.initial_val, self.initial_index = self.current_val
@ -1048,7 +1048,7 @@ class BulkText(BulkBase):
self.initial_val = val = self.normalize_db_val(val) self.initial_val = val = self.normalize_db_val(val)
self.ignore_change_signals = True self.ignore_change_signals = True
self.main_widget.blockSignals(True) self.main_widget.blockSignals(True)
self.main_widget.show_initial_value(val) self.main_widget.setText(val)
self.main_widget.blockSignals(False) self.main_widget.blockSignals(False)
self.ignore_change_signals = False self.ignore_change_signals = False