X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FTocUi.ui;h=8491a1255266364ac5597f486cb6bc17417a9c96;hb=75c631df7f1124b6bf53f48f8d82ecb42fdb9c52;hp=92f69f68537c23b9a460b121f50340039b1a5ad4;hpb=a1607b414ae8a523f735e02d5bd3772f212f7d91;p=lyx.git

diff --git a/src/frontends/qt4/ui/TocUi.ui b/src/frontends/qt4/ui/TocUi.ui
index 92f69f6853..8491a12552 100644
--- a/src/frontends/qt4/ui/TocUi.ui
+++ b/src/frontends/qt4/ui/TocUi.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>QTocUi</class>
- <widget class="QWidget" name="QTocUi" >
+ <class>TocUi</class>
+ <widget class="QWidget" name="TocUi" >
   <property name="windowModality" >
    <enum>Qt::NonModal</enum>
   </property>
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>257</width>
-    <height>404</height>
+    <width>202</width>
+    <height>355</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,95 +22,246 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="3" column="0" colspan="2" >
-    <layout class="QGridLayout" >
+   <item row="1" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
      <property name="margin" >
       <number>0</number>
      </property>
      <property name="spacing" >
       <number>6</number>
      </property>
-     <item row="0" column="0" >
-      <widget class="QPushButton" name="moveOutPB" >
+     <item>
+      <widget class="QLabel" name="filterLA" >
+       <property name="text" >
+        <string>Filter:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>filterLE</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="filterLE" >
        <property name="toolTip" >
-        <string>Decrease nesting depth of selected item</string>
+        <string>Enter string to filter contents</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="QComboBox" name="typeCO" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>13</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip" >
+      <string>Switch between available lists (table of contents, list of figures, list of tables, and others)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2" >
+    <widget class="QTreeView" name="tocTV" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>13</hsizetype>
+       <vsizetype>7</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QToolButton" name="updateTB" >
+       <property name="toolTip" >
+        <string>Update navigation tree</string>
        </property>
        <property name="text" >
-        <string>&lt;- P&amp;romote</string>
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset>../../../../lib/images/reload.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="1" column="2" >
-      <widget class="QPushButton" name="moveDownPB" >
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>16</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QToolButton" name="moveOutTB" >
        <property name="toolTip" >
-        <string>Move selected item down by one</string>
+        <string>Decrease nesting depth of selected item</string>
        </property>
        <property name="text" >
-        <string>D&amp;own</string>
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset>../../../../lib/images/promote.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="0" column="1" >
-      <widget class="QPushButton" name="moveInPB" >
+     <item>
+      <widget class="QToolButton" name="moveInTB" >
        <property name="toolTip" >
         <string>Increase nesting depth of selected item</string>
        </property>
        <property name="text" >
-        <string>De&amp;mote -></string>
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset>../../../../lib/images/demote.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="1" column="0" colspan="2" >
-      <widget class="QPushButton" name="updatePB" >
+     <item>
+      <widget class="QToolButton" name="moveDownTB" >
        <property name="toolTip" >
-        <string>Update navigation tree</string>
+        <string>Move selected item down by one</string>
        </property>
        <property name="text" >
-        <string>Upd&amp;ate</string>
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset>../../../../lib/images/down.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
        </property>
       </widget>
      </item>
-     <item row="0" column="2" >
-      <widget class="QPushButton" name="moveUpPB" >
+     <item>
+      <widget class="QToolButton" name="moveUpTB" >
        <property name="toolTip" >
         <string>Move selected item up by one</string>
        </property>
        <property name="text" >
-        <string>&amp;Up</string>
+        <string>...</string>
+       </property>
+       <property name="icon" >
+        <iconset>../../../../lib/images/up.png</iconset>
+       </property>
+       <property name="iconSize" >
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="typeCO" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="3" column="1" >
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>4</number>
      </property>
-     <property name="toolTip" >
-      <string>Switch between table of contents, list of figures or list of tables, if available</string>
+     <property name="spacing" >
+      <number>0</number>
      </property>
-    </widget>
+     <property name="sizeConstraint" >
+      <enum>QLayout::SetMinimumSize</enum>
+     </property>
+     <item>
+      <widget class="QCheckBox" name="sortCB" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>0</width>
+         <height>21</height>
+        </size>
+       </property>
+       <property name="text" >
+        <string>Sort</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="persistentCB" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>1</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize" >
+        <size>
+         <width>0</width>
+         <height>21</height>
+        </size>
+       </property>
+       <property name="toolTip" >
+        <string>Try to keep persistent view of the uncollapsed nodes</string>
+       </property>
+       <property name="text" >
+        <string>Keep</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QTreeView" name="tocTV" >
+   <item row="3" column="0" >
+    <widget class="QSlider" name="depthSL" >
      <property name="sizePolicy" >
       <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>7</vsizetype>
+       <hsizetype>13</hsizetype>
+       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QSlider" name="depthSL" >
      <property name="toolTip" >
       <string>Adjust the depth of the navigation tree</string>
      </property>
@@ -131,29 +282,14 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="typeLA" >
-     <property name="text" >
-      <string>&amp;Type:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>typeCO</cstring>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>typeCO</tabstop>
   <tabstop>tocTV</tabstop>
-  <tabstop>depthSL</tabstop>
-  <tabstop>moveUpPB</tabstop>
-  <tabstop>moveDownPB</tabstop>
-  <tabstop>moveInPB</tabstop>
-  <tabstop>moveOutPB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_helpers.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>