Pref ui module: add a 'clear session'.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26491 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index cbc8d43ba5ad42a2bd7790dc05246e90c960bbbd..266d0591c0777692e6aa776a045559107f399e18 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -1947,6 +1947,13 @@ void PrefUserInterface::select_ui()
 }
 
 
+void PrefUserInterface::on_clearSessionPB_clicked()
+{
+       guiApp->clearSession();
+}
+
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // PrefEdit

diff --git a/src/frontends/qt4/GuiPrefs.h b/src/frontends/qt4/GuiPrefs.h
index 0eebd86f04d4f62fc78f059a5284265b3cd40057..91bae203729d03d6968558b9ce58bcf1c0ccef06 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.h
+++ b/src/frontends/qt4/GuiPrefs.h
@@ -395,6 +395,7 @@ public:
 
 public Q_SLOTS:
        void select_ui();
+       void on_clearSessionPB_clicked();
 };
 
 

diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index d3bd72b6095310d72163773257e3b2db2d27fc31..82f903faaff5f38abd986516c3c0a5990516ec6a 100644 (file)
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -10,9 +10,7 @@
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>0</hsizetype>
-    <vsizetype>0</vsizetype>
+   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -51,7 +49,7 @@
          <string>Restore to cursor position when the file was last closed</string>
         </property>
         <property name="text" >
-         <string>Allow saving/restoring of windows geometry</string>
+         <string>Allow saving/restoring of window layouts and geometries</string>
         </property>
        </widget>
       </item>
@@ -69,6 +67,13 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0" >
+       <widget class="QPushButton" name="clearSessionPB" >
+        <property name="text" >
+         <string>Clear All Session Information</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -89,12 +94,12 @@
       </property>
       <item row="1" column="0" colspan="4" >
        <layout class="QHBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
         <property name="spacing" >
          <number>6</number>
         </property>
+        <property name="margin" >
+         <number>0</number>
+        </property>
         <item>
          <widget class="QLabel" name="lastfilesLA" >
           <property name="text" >
@@ -117,7 +122,7 @@
           <property name="orientation" >
            <enum>Qt::Horizontal</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>40</width>
             <height>20</height>
@@ -132,7 +137,7 @@
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>61</width>
           <height>21</height>
@@ -149,12 +154,12 @@
       </item>
       <item row="0" column="1" >
        <widget class="QSpinBox" name="autoSaveSB" >
-        <property name="maximum" >
-         <number>300</number>
-        </property>
         <property name="minimum" >
          <number>1</number>
         </property>
+        <property name="maximum" >
+         <number>300</number>
+        </property>
        </widget>
       </item>
       <item row="0" column="0" >
@@ -179,7 +184,7 @@
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>395</width>
        <height>16</height>