The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit dc7029dbf73f1942d6b05bf3785fb7a1d5dae725
Author: Juergen Spitzmueller <[email protected]>
Date:   Sat Mar 2 14:15:11 2013 +0100

    Small tweaks to the new pref pane(s)

diff --git a/src/frontends/qt4/ui/PrefDocHandlingUi.ui 
b/src/frontends/qt4/ui/PrefDocHandlingUi.ui
index aed6250..9f3366e 100644
--- a/src/frontends/qt4/ui/PrefDocHandlingUi.ui
+++ b/src/frontends/qt4/ui/PrefDocHandlingUi.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>524</width>
-    <height>440</height>
+    <height>416</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -146,40 +146,6 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QLabel" name="lastfilesLA">
-          <property name="text">
-           <string>Ma&amp;ximum last files:</string>
-          </property>
-          <property name="buddy">
-           <cstring>lastfilesSB</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="lastfilesSB">
-          <property name="maximum">
-           <number>9</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>48</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>
@@ -202,8 +168,7 @@
       <item row="1" column="0">
        <widget class="QCheckBox" name="singleInstanceCB">
         <property name="toolTip">
-         <string>Whether to open documents in an already running instance of 
LyX.
-(Set the LyXServer pipe path and restart LyX to enable this feature)</string>
+         <string>Whether to open documents in an already running instance of 
LyX. Set the LyXServer pipe path and restart LyX to enable this 
feature.</string>
         </property>
         <property name="text">
          <string>Use s&amp;ingle instance</string>
@@ -293,7 +258,6 @@
   <tabstop>autoSaveCB</tabstop>
   <tabstop>autoSaveSB</tabstop>
   <tabstop>saveCompressedCB</tabstop>
-  <tabstop>lastfilesSB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>
diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index e9cb131..76c9120 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -81,8 +81,7 @@
         <item>
          <widget class="QComboBox" name="iconSetCO">
           <property name="toolTip">
-           <string>The icon set to use. Warning: normal size of icons may be
-wrong until you save the preferences and restart LyX.</string>
+           <string>The icon set to use. Warning: normal size of icons may be 
wrong until you save the preferences and restart LyX.</string>
           </property>
          </widget>
         </item>
@@ -145,34 +144,38 @@ wrong until you save the preferences and restart 
LyX.</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
-       <widget class="QLabel" name="lastfilesLA">
-        <property name="text">
-         <string>&amp;Maximum last files:</string>
-        </property>
-        <property name="buddy">
-         <cstring>lastfilesSB</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="3" colspan="2">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>48</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="2">
-       <widget class="QSpinBox" name="lastfilesSB">
-        <property name="maximum">
-         <number>9</number>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="lastfilesLA">
+          <property name="text">
+           <string>&amp;Maximum last files:</string>
+          </property>
+          <property name="buddy">
+           <cstring>lastfilesSB</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="lastfilesSB">
+          <property name="maximum">
+           <number>9</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>48</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/ui/PrefDocHandlingUi.ui |   40 +-----------------
 src/frontends/qt4/ui/PrefUi.ui            |   63 +++++++++++++++--------------
 2 files changed, 35 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to