From 4b7705fbbe9d91f5a1cc22197a184a11fe3e89aa Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 15 Dec 2010 23:28:21 -0700
Subject: [PATCH] ...

---
 src/calibre/gui2/viewer/config.ui | 252 ++++++++++++++----------------
 1 file changed, 118 insertions(+), 134 deletions(-)

diff --git a/src/calibre/gui2/viewer/config.ui b/src/calibre/gui2/viewer/config.ui
index 32188bdf7a..6e37170154 100644
--- a/src/calibre/gui2/viewer/config.ui
+++ b/src/calibre/gui2/viewer/config.ui
@@ -85,11 +85,7 @@
             <item row="2" column="1">
              <widget class="QFontComboBox" name="mono_family"/>
             </item>
-           </layout>
-          </item>
-          <item row="1" column="0">
-           <layout class="QGridLayout" name="gridLayout_2">
-            <item row="0" column="0">
+            <item row="3" column="0">
              <widget class="QLabel" name="label_4">
               <property name="text">
                <string>&amp;Default font size:</string>
@@ -99,7 +95,7 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
+            <item row="3" column="1">
              <widget class="QSpinBox" name="default_font_size">
               <property name="suffix">
                <string> px</string>
@@ -112,7 +108,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
+            <item row="4" column="0">
              <widget class="QLabel" name="label_5">
               <property name="text">
                <string>Monospace &amp;font size:</string>
@@ -122,7 +118,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
+            <item row="4" column="1">
              <widget class="QSpinBox" name="mono_font_size">
               <property name="suffix">
                <string> px</string>
@@ -135,7 +131,7 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
+            <item row="5" column="0">
              <widget class="QLabel" name="label_6">
               <property name="text">
                <string>S&amp;tandard font:</string>
@@ -145,7 +141,7 @@
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
+            <item row="5" column="1">
              <widget class="QComboBox" name="standard_font">
               <item>
                <property name="text">
@@ -164,133 +160,124 @@
               </item>
              </widget>
             </item>
-            <item row="8" 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>
-            <item row="9" column="0" colspan="2">
-             <widget class="QCheckBox" name="opt_remember_current_page">
-              <property name="text">
-               <string>Remember the &amp;current page when quitting</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QSpinBox" name="max_view_width">
-              <property name="suffix">
-               <string> px</string>
-              </property>
-              <property name="minimum">
-               <number>100</number>
-              </property>
-              <property name="maximum">
-               <number>10000</number>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="label_7">
-              <property name="text">
-               <string>Maximum &amp;view width:</string>
-              </property>
-              <property name="buddy">
-               <cstring>max_view_width</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="5" column="0" colspan="2">
-             <widget class="QCheckBox" name="hyphenate">
-              <property name="text">
-               <string>H&amp;yphenate (break line in the middle of large words)</string>
-              </property>
-             </widget>
-            </item>
-            <item row="6" column="1">
-             <widget class="QComboBox" name="hyphenate_default_lang">
-              <property name="toolTip">
-               <string>The default language to use for hyphenation rules. If the book does not specify a language, this will be used.</string>
-              </property>
-             </widget>
-            </item>
-            <item row="6" column="0">
-             <widget class="QLabel" name="label_8">
-              <property name="text">
-               <string>Default &amp;language for hyphenation:</string>
-              </property>
-              <property name="buddy">
-               <cstring>hyphenate_default_lang</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="7" column="0" colspan="2">
-             <widget class="QCheckBox" name="opt_fit_images">
-              <property name="text">
-               <string>&amp;Resize images larger than the viewer window (needs restart)</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="0">
-             <widget class="QLabel" name="label_11">
-              <property name="text">
-               <string>Page flip &amp;duration:</string>
-              </property>
-              <property name="buddy">
-               <cstring>opt_page_flip_duration</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="1">
-             <widget class="QDoubleSpinBox" name="opt_page_flip_duration">
-              <property name="specialValueText">
-               <string>disabled</string>
-              </property>
-              <property name="suffix">
-               <string> secs</string>
-              </property>
-              <property name="decimals">
-               <number>1</number>
-              </property>
-              <property name="minimum">
-               <double>0.100000000000000</double>
-              </property>
-              <property name="maximum">
-               <double>3.000000000000000</double>
-              </property>
-              <property name="singleStep">
-               <double>0.100000000000000</double>
-              </property>
-              <property name="value">
-               <double>0.500000000000000</double>
-              </property>
-             </widget>
-            </item>
-            <item row="10" column="0">
-             <widget class="QCheckBox" name="opt_wheel_flips_pages">
-              <property name="text">
-               <string>Mouse &amp;wheel flips pages</string>
-              </property>
-             </widget>
-            </item>
            </layout>
           </item>
          </layout>
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="8" 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>
+         <item row="9" column="0" colspan="2">
+          <widget class="QCheckBox" name="opt_remember_current_page">
+           <property name="text">
+            <string>Remember the &amp;current page when quitting</string>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0" colspan="2">
+          <widget class="QCheckBox" name="hyphenate">
+           <property name="text">
+            <string>H&amp;yphenate (break line in the middle of large words)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <widget class="QComboBox" name="hyphenate_default_lang">
+           <property name="toolTip">
+            <string>The default language to use for hyphenation rules. If the book does not specify a language, this will be used.</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="0">
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>Default &amp;language for hyphenation:</string>
+           </property>
+           <property name="buddy">
+            <cstring>hyphenate_default_lang</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0" colspan="2">
+          <widget class="QCheckBox" name="opt_fit_images">
+           <property name="text">
+            <string>&amp;Resize images larger than the viewer window (needs restart)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="label_11">
+           <property name="text">
+            <string>Page flip &amp;duration:</string>
+           </property>
+           <property name="buddy">
+            <cstring>opt_page_flip_duration</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QDoubleSpinBox" name="opt_page_flip_duration">
+           <property name="specialValueText">
+            <string>disabled</string>
+           </property>
+           <property name="suffix">
+            <string> secs</string>
+           </property>
+           <property name="decimals">
+            <number>1</number>
+           </property>
+           <property name="minimum">
+            <double>0.100000000000000</double>
+           </property>
+           <property name="maximum">
+            <double>3.000000000000000</double>
+           </property>
+           <property name="singleStep">
+            <double>0.100000000000000</double>
+           </property>
+           <property name="value">
+            <double>0.500000000000000</double>
+           </property>
+          </widget>
+         </item>
+         <item row="10" column="0" colspan="2">
+          <widget class="QCheckBox" name="opt_wheel_flips_pages">
+           <property name="text">
+            <string>Mouse &amp;wheel flips pages</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QSpinBox" name="max_view_width">
+           <property name="suffix">
+            <string> px</string>
+           </property>
+           <property name="minimum">
+            <number>100</number>
+           </property>
+           <property name="maximum">
+            <number>10000</number>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>Maximum &amp;view width:</string>
+           </property>
+           <property name="buddy">
+            <cstring>max_view_width</cstring>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>
      </widget>
@@ -342,9 +329,6 @@
   <tabstop>serif_family</tabstop>
   <tabstop>sans_family</tabstop>
   <tabstop>mono_family</tabstop>
-  <tabstop>default_font_size</tabstop>
-  <tabstop>mono_font_size</tabstop>
-  <tabstop>standard_font</tabstop>
   <tabstop>max_view_width</tabstop>
   <tabstop>opt_remember_window_size</tabstop>
   <tabstop>buttonBox</tabstop>