mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge from trunk
This commit is contained in:
commit
77cde41c58
@ -213,7 +213,7 @@ generate_cover_title_font = None
|
|||||||
generate_cover_foot_font = None
|
generate_cover_foot_font = None
|
||||||
|
|
||||||
|
|
||||||
# Behavior of doubleclick on the library view. Choices:
|
# Behavior of doubleclick on the books list. Choices:
|
||||||
# open_viewer, do_nothing, edit_cell. Default: open_viewer.
|
# open_viewer, do_nothing, edit_cell. Default: open_viewer.
|
||||||
# Example: doubleclick_on_library_view = 'do_nothing'
|
# Example: doubleclick_on_library_view = 'do_nothing'
|
||||||
doubleclick_on_library_view = 'open_viewer'
|
doubleclick_on_library_view = 'open_viewer'
|
||||||
|
@ -845,7 +845,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
|
|||||||
if cf is not None and hasattr(cf, 'terminate'):
|
if cf is not None and hasattr(cf, 'terminate'):
|
||||||
cf.terminate()
|
cf.terminate()
|
||||||
cf.wait()
|
cf.wait()
|
||||||
|
self.save_state()
|
||||||
QDialog.reject(self, *args)
|
QDialog.reject(self, *args)
|
||||||
|
|
||||||
def read_state(self):
|
def read_state(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user