Sync to pluginize

src/calibre/gui2/dialogs/config.py

@@ -392,13 +392,6 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.toolbar_button_size.setCurrentIndex(0 if icons == self.ICON_SIZES[0] else 1 if icons == self.ICON_SIZES[1] else 2)
         self.show_toolbar_text.setChecked(config['show_text_in_toolbar'])
 
-        output_formats = sorted(available_output_formats())
-        output_formats.remove('oeb')
-        for f in output_formats:
-            self.output_format.addItem(f)
-        default_index = self.output_format.findText(prefs['output_format'])
-        self.output_format.setCurrentIndex(default_index if default_index != -1 else 0)
-
         output_formats = sorted(available_output_formats())
         output_formats.remove('oeb')
         for f in output_formats:

src/calibre/gui2/dialogs/config.ui

@@ -220,7 +220,10 @@
            <item row="0" column="0">
             <widget class="QLabel" name="label_23">
              <property name="text">
-              <string>Output Format:</string>
+              <string>Preferred &amp;output format:</string>
+             </property>
+             <property name="buddy">
+              <cstring>output_format</cstring>
              </property>
             </widget>
            </item>

src/calibre/gui2/viewer/config.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog">
@@ -143,6 +144,13 @@
           </item>
          </widget>
         </item>
+        <item row="3" column="0" colspan="2">
+         <widget class="QCheckBox" name="opt_remember_window_size">
+          <property name="text">
+           <string>Remember last used &amp;window size</string>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
       <item row="2" column="0">

src/calibre/gui2/viewer/documentview.py

@@ -53,6 +53,8 @@ def config(defaults=None):
     else:
         c = StringConfig(defaults, desc)
 
+    c.add_opt('remember_window_size', default=False,
+        help=_('Remember last used window size'))
     c.add_opt('user_css', default='',
               help=_('Set the user CSS stylesheet. This can be used to customize the look of all books.'))
 
@@ -76,6 +78,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.setupUi(self)
 
         opts = config().parse()
+        self.opt_remember_window_size.setChecked(opts.remember_window_size)
         self.serif_family.setCurrentFont(QFont(opts.serif_family))
         self.sans_family.setCurrentFont(QFont(opts.sans_family))
         self.mono_family.setCurrentFont(QFont(opts.mono_family))
@@ -94,6 +97,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
         c.set('mono_font_size', self.mono_font_size.value())
         c.set('standard_font', {0:'serif', 1:'sans', 2:'mono'}[self.standard_font.currentIndex()])
         c.set('user_css', unicode(self.css.toPlainText()))
+        c.set('remember_window_size', self.opt_remember_window_size.isChecked())
         return QDialog.accept(self, *args)
 
 

src/calibre/gui2/viewer/main.py

@@ -20,7 +20,7 @@ from calibre.gui2 import Application, ORG_NAME, APP_UID, choose_files, \
 from calibre.ebooks.oeb.iterator import EbookIterator
 from calibre.ebooks import DRMError
 from calibre.constants import islinux
-from calibre.utils.config import Config, ConfigProxy, StringConfig
+from calibre.utils.config import Config, StringConfig, dynamic
 from calibre.gui2.library import SearchBox
 from calibre.ebooks.metadata import MetaInformation
 from calibre.customize.ui import available_input_formats
@@ -598,29 +598,21 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         return self
 
     def __exit__(self, *args):
+        self.write_settings()
         if self.iterator is not None:
             self.save_current_position()
             self.iterator.__exit__(*args)
 
-    def closeEvent(self, e):
-        self.write_settings()
+    def write_settings(self):
+        dynamic.set('viewer_window_geometry', self.saveGeometry())
 
     def read_settings(self):
-        geometry = settings['viewer_window_geometry']
-        if geometry is not None:
-            self.restoreGeometry(geometry)
-
-    def write_settings(self):
-        settings.set('viewer_window_geometry', self.saveGeometry())
+        c = config().parse()
+        wg = dynamic['viewer_window_geometry']
+        if wg is not None and c.remember_window_size:
+            self.restoreGeometry(wg)
 
 
-def _settings():
-    c = Config('viewer_gui', 'preferences for the calibre viewer GUI')
-    c.add_opt('viewer_window_geometry', default=None,
-            help=_('Viewer window geometry')) # value QVariant.toByteArray
-    return ConfigProxy(c)
-
-settings = _settings()
 
 
 def config(defaults=None):
@@ -633,6 +625,9 @@ def config(defaults=None):
     c.add_opt('raise_window', ['--raise-window'], default=False,
               help=_('If specified, viewer window will try to come to the '
                      'front when started.'))
+    c.add_opt('remember_window_size', default=False,
+        help=_('Remember last used window size'))
+
     return c
 
 def option_parser():