X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FQPrefUi.ui;h=1760cc05d32efca2704f46e8e4d79771276db429;hb=6bfc69eb38f3d395d29768a3b00aff9fa1b45fc7;hp=e78e20358942acc88b3c479c150fb7dde85a5b1f;hpb=7cff3d5d5e9ce382dd81df838df3d205be5b5513;p=lyx.git

diff --git a/src/frontends/qt4/ui/QPrefUi.ui b/src/frontends/qt4/ui/QPrefUi.ui
index e78e203589..1760cc05d3 100644
--- a/src/frontends/qt4/ui/QPrefUi.ui
+++ b/src/frontends/qt4/ui/QPrefUi.ui
@@ -1,15 +1,12 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>QPrefUi</class>
  <widget class="QWidget" name="QPrefUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>416</width>
-    <height>513</height>
+    <width>459</width>
+    <height>425</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -30,8 +27,107 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="2" column="0" >
-    <widget class="QGroupBox" name="sessionGB" >
+   <item row="3" column="2" colspan="2" >
+    <widget class="QGroupBox" name="scrollGB" >
+     <property name="title" >
+      <string>Scrolling</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>11</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="cursorFollowsCB" >
+        <property name="text" >
+         <string>Cursor follows &amp;scrollbar</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="4" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="3" >
+    <widget class="QPushButton" name="bindFilePB" >
+     <property name="text" >
+      <string>B&amp;rowse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="uiFileLA" >
+     <property name="text" >
+      <string>&amp;User interface file:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>uiFileED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="bindFileLA" >
+     <property name="text" >
+      <string>&amp;Bind file:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>bindFileED</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QLineEdit" name="uiFileED" />
+   </item>
+   <item row="0" column="3" >
+    <widget class="QPushButton" name="uiFilePB" >
+     <property name="text" >
+      <string>Bro&amp;wse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2" >
+    <widget class="QLineEdit" name="bindFileED" />
+   </item>
+   <item row="2" column="0" colspan="4" >
+    <widget class="QGroupBox" name="GeometryGB" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title" >
       <string>Session</string>
      </property>
@@ -42,8 +138,58 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="0" column="0" >
-       <layout class="QVBoxLayout" >
+      <item row="0" column="0" colspan="2" >
+       <widget class="QCheckBox" name="loadWindowSizeCB" >
+        <property name="text" >
+         <string>Save/restore window size, or use fixed size</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="4" column="0" >
+       <widget class="QCheckBox" name="loadSessionCB" >
+        <property name="text" >
+         <string>Load opened files from last session</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" >
+       <widget class="QCheckBox" name="restoreCursorCB" >
+        <property name="text" >
+         <string>Restore cursor positions</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="loadWindowLocationCB" >
+        <property name="enabled" >
+         <bool>true</bool>
+        </property>
+        <property name="toolTip" >
+         <string>Restore to cursor position when the file was last closed</string>
+        </property>
+        <property name="text" >
+         <string>Save/restore window position</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <layout class="QHBoxLayout" >
         <property name="margin" >
          <number>0</number>
         </property>
@@ -51,47 +197,95 @@
          <number>6</number>
         </property>
         <item>
-         <widget class="QCheckBox" name="restoreCursorCB" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType" >
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>30</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="windowWidthLA" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
           <property name="text" >
-           <string>Restore cursor positions</string>
+           <string>Width</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="windowWidthSB" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="maximum" >
+           <number>9999</number>
+          </property>
+          <property name="minimum" >
+           <number>200</number>
+          </property>
+          <property name="singleStep" >
+           <number>10</number>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="loadSessionCB" >
+         <widget class="QLabel" name="windowHeightLA" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
           <property name="text" >
-           <string>Load opened files from last session</string>
+           <string>Height</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="windowHeightSB" >
+          <property name="enabled" >
+           <bool>false</bool>
+          </property>
+          <property name="maximum" >
+           <number>9999</number>
+          </property>
+          <property name="minimum" >
+           <number>200</number>
+          </property>
+          <property name="singleStep" >
+           <number>10</number>
           </property>
          </widget>
         </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType" >
+           <enum>QSizePolicy::Fixed</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>30</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" >
-    <widget class="QGroupBox" name="scrollGB" >
-     <property name="title" >
-      <string>Scrolling</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>11</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QCheckBox" name="cursorFollowsCB" >
-        <property name="text" >
-         <string>Cursor follows &amp;scrollbar</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="0" >
+   <item row="3" column="0" colspan="2" >
     <widget class="QGroupBox" name="documentsGB" >
      <property name="title" >
       <string>Documents</string>
@@ -193,101 +387,27 @@
      </layout>
     </widget>
    </item>
-   <item rowspan="2" row="1" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>51</width>
-       <height>258</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="0" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>394</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0" colspan="2" >
-    <layout class="QGridLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item row="1" column="2" >
-      <widget class="QPushButton" name="bindFilePB" >
-       <property name="text" >
-        <string>B&amp;rowse...</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="uiFileLA" >
-       <property name="text" >
-        <string>&amp;User interface file:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>uiFileED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0" >
-      <widget class="QLabel" name="bindFileLA" >
-       <property name="text" >
-        <string>&amp;Bind file:</string>
-       </property>
-       <property name="buddy" >
-        <cstring>bindFileED</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="QLineEdit" name="uiFileED" />
-     </item>
-     <item row="0" column="2" >
-      <widget class="QPushButton" name="uiFilePB" >
-       <property name="text" >
-        <string>Bro&amp;wse...</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="QLineEdit" name="bindFileED" />
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>uiFileED</tabstop>
   <tabstop>uiFilePB</tabstop>
   <tabstop>bindFileED</tabstop>
   <tabstop>bindFilePB</tabstop>
-  <tabstop>cursorFollowsCB</tabstop>
+  <tabstop>loadWindowSizeCB</tabstop>
+  <tabstop>windowWidthSB</tabstop>
+  <tabstop>windowHeightSB</tabstop>
+  <tabstop>loadWindowLocationCB</tabstop>
+  <tabstop>restoreCursorCB</tabstop>
+  <tabstop>loadSessionCB</tabstop>
   <tabstop>autoSaveCB</tabstop>
   <tabstop>autoSaveSB</tabstop>
   <tabstop>lastfilesSB</tabstop>
+  <tabstop>cursorFollowsCB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>