X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FFindAndReplaceUi.ui;h=f2b2f662e01729a7b1f930e4314a15e0b690855a;hb=a4a610221ae62897b792ef2e5fb9bb6f65e7b1df;hp=d40df1b66db2caa145a58a45bc79e3e59c88b4ff;hpb=5eeeea31e2af79f13da7be97df533e5dbbdf826e;p=lyx.git

diff --git a/src/frontends/qt4/ui/FindAndReplaceUi.ui b/src/frontends/qt4/ui/FindAndReplaceUi.ui
index d40df1b66d..f2b2f662e0 100644
--- a/src/frontends/qt4/ui/FindAndReplaceUi.ui
+++ b/src/frontends/qt4/ui/FindAndReplaceUi.ui
@@ -1,567 +1,313 @@
-<ui version="4.0">
+<ui version="4.0" >
  <class>FindAndReplaceUi</class>
- <widget class="QWidget" name="FindAndReplaceUi">
-  <property name="geometry">
+ <widget class="QTabWidget" name="FindAndReplaceUi" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>266</width>
-    <height>494</height>
+    <width>279</width>
+    <height>300</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
+  <property name="windowTitle" >
+   <string>TabWidget</string>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>220</width>
-    <height>360</height>
-   </size>
+  <property name="currentIndex" >
+   <number>0</number>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>500</height>
-   </size>
-  </property>
-  <property name="baseSize">
-   <size>
-    <width>300</width>
-    <height>400</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Find LyX Text</string>
-  </property>
-  <property name="toolTip">
-   <string/>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab_3">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+  <widget class="QWidget" name="basicTab" >
+   <attribute name="title" >
+    <string>Sear&amp;ch</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout" >
+    <item row="0" column="0" >
+     <widget class="QLabel" name="label" >
+      <property name="text" >
+       <string>&amp;Find:</string>
+      </property>
+      <property name="buddy" >
+       <cstring>find_work_area_</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0" colspan="2" >
+     <widget class="lyx::frontend::EmbeddedWorkArea" native="1" name="find_work_area_" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <attribute name="title">
-       <string>Basic</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="0" column="0">
-        <layout class="QGridLayout" name="gridLayout">
-         <property name="sizeConstraint">
-          <enum>QLayout::SetNoConstraint</enum>
-         </property>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="wordsCB">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Whole &amp;words</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="0">
-          <widget class="QPushButton" name="findNextPB">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Find &amp;Next</string>
-           </property>
-           <property name="default">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="0">
-          <widget class="QPushButton" name="replaceNextPB">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Replace Ne&amp;xt</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="0">
-          <widget class="QPushButton" name="replaceallPB">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Replace &amp;All</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QPushButton" name="closePB">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>&amp;Close</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <widget class="QPushButton" name="findPrevPB">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Find &amp;Prev</string>
-           </property>
-           <property name="default">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="1">
-          <widget class="QPushButton" name="replacePrevPB">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Replace P&amp;rev</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QCheckBox" name="caseCB">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Case &amp;sensitive</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QCheckBox" name="ignoreFormatCB">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Ignore For&amp;mat</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QComboBox" name="regexpInsertCombo">
-           <property name="enabled">
-            <bool>true</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <item>
-            <property name="text">
-             <string>Match...</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Anything</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Any non-empty</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Any word</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Any number</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="0" column="0" colspan="2">
-          <widget class="QGroupBox" name="groupBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>60</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="baseSize">
-            <size>
-             <width>0</width>
-             <height>128</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string>Enter the text to search for in this full-featured LyX editing area</string>
-           </property>
-           <property name="title">
-            <string>Search for...</string>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_4">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>4</number>
-            </property>
-            <property name="rightMargin">
-             <number>4</number>
-            </property>
-            <property name="bottomMargin">
-             <number>4</number>
-            </property>
-            <item row="1" column="0">
-             <widget class="lyx::frontend::EmbeddedWorkArea" name="find_work_area_">
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="baseSize">
-               <size>
-                <width>0</width>
-                <height>48</height>
-               </size>
-              </property>
-              <property name="toolTip">
-               <string>Enter the text to search for in this full-featured LyX editing area</string>
-              </property>
-              <property name="widgetResizable">
-               <bool>true</bool>
-              </property>
-              <widget class="QWidget" name="scrollAreaWidgetContents">
-               <property name="geometry">
-                <rect>
-                 <x>0</x>
-                 <y>0</y>
-                 <width>208</width>
-                 <height>97</height>
-                </rect>
-               </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="4" column="0" colspan="2">
-          <widget class="QGroupBox" name="groupBox_3">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>60</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>16777215</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string>Enter the text to replace in this full-featured LyX editing area</string>
-           </property>
-           <property name="title">
-            <string>Replace with...</string>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_5">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>4</number>
-            </property>
-            <property name="rightMargin">
-             <number>4</number>
-            </property>
-            <property name="bottomMargin">
-             <number>4</number>
-            </property>
-            <item row="0" column="0">
-             <widget class="lyx::frontend::EmbeddedWorkArea" name="replace_work_area_">
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="baseSize">
-               <size>
-                <width>0</width>
-                <height>48</height>
-               </size>
-              </property>
-              <property name="toolTip">
-               <string>Enter the text to replace in this full-featured LyX editing area</string>
-              </property>
-              <property name="widgetResizable">
-               <bool>true</bool>
-              </property>
-              <widget class="QWidget" name="scrollAreaWidgetContents_2">
-               <property name="geometry">
-                <rect>
-                 <x>0</x>
-                 <y>0</y>
-                 <width>208</width>
-                 <height>96</height>
-                </rect>
-               </property>
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-              </widget>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
      </widget>
-     <widget class="QWidget" name="tab_4">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+    </item>
+    <item row="2" column="0" >
+     <widget class="QLabel" name="label_2" >
+      <property name="text" >
+       <string>Replace &amp;with:</string>
+      </property>
+      <property name="buddy" >
+       <cstring>replace_work_area_</cstring>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0" colspan="2" >
+     <widget class="lyx::frontend::EmbeddedWorkArea" native="1" name="replace_work_area_" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="0" >
+     <widget class="QCheckBox" name="caseCB" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <attribute name="title">
-       <string>Advanced</string>
-      </attribute>
-      <widget class="QWidget" name="gridLayoutWidget">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>221</width>
-         <height>143</height>
-        </rect>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_2">
-        <item row="0" column="0">
-         <widget class="QGroupBox" name="groupBox_2">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>111</height>
-           </size>
-          </property>
-          <property name="title">
-           <string>Sco&amp;pe</string>
-          </property>
-          <widget class="QRadioButton" name="scopeRB">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>40</y>
-             <width>121</width>
-             <height>23</height>
-            </rect>
-           </property>
-           <property name="toolTip">
-            <string>Current buffer only</string>
-           </property>
-           <property name="text">
-            <string>Buffer</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-          <widget class="QRadioButton" name="scopeRB_3">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>60</y>
-             <width>121</width>
-             <height>23</height>
-            </rect>
-           </property>
-           <property name="toolTip">
-            <string>Current file and all included files</string>
-           </property>
-           <property name="text">
-            <string>Document</string>
-           </property>
-          </widget>
-          <widget class="QRadioButton" name="scopeRB_2">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>20</y>
-             <width>121</width>
-             <height>23</height>
-            </rect>
-           </property>
-           <property name="toolTip">
-            <string>Current paragraph only</string>
-           </property>
-           <property name="text">
-            <string>Paragraph</string>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-          </widget>
-          <widget class="QRadioButton" name="scopeRB_4">
-           <property name="geometry">
-            <rect>
-             <x>10</x>
-             <y>80</y>
-             <width>121</width>
-             <height>23</height>
-            </rect>
-           </property>
-           <property name="toolTip">
-            <string>All open buffers</string>
-           </property>
-           <property name="text">
-            <string>Open buffers</string>
-           </property>
-          </widget>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QCheckBox" name="expandMacrosCB">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="text">
-           <string>&amp;Expand macros</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
+      <property name="toolTip" >
+       <string>Perform a case-sensitive search</string>
+      </property>
+      <property name="text" >
+       <string>Case &amp;sensitive</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1" >
+     <widget class="QPushButton" name="findNextPB" >
+      <property name="enabled" >
+       <bool>true</bool>
+      </property>
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+        <horstretch>100</horstretch>
+        <verstretch>32</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Find next occurrence [Enter]</string>
+      </property>
+      <property name="text" >
+       <string>Find &amp;Next</string>
+      </property>
+      <property name="default" >
+       <bool>true</bool>
+      </property>
      </widget>
-    </widget>
-   </item>
-  </layout>
+    </item>
+    <item row="5" column="0" >
+     <widget class="QCheckBox" name="wordsCB" >
+      <property name="enabled" >
+       <bool>true</bool>
+      </property>
+      <property name="toolTip" >
+       <string>Restrict search to whole words only</string>
+      </property>
+      <property name="text" >
+       <string>W&amp;hole words</string>
+      </property>
+     </widget>
+    </item>
+    <item row="5" column="1" >
+     <widget class="QPushButton" name="replacePB" >
+      <property name="enabled" >
+       <bool>true</bool>
+      </property>
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+        <horstretch>100</horstretch>
+        <verstretch>32</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Replace and find next occurrence [Enter]</string>
+      </property>
+      <property name="text" >
+       <string>&amp;Replace</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="0" >
+     <widget class="QCheckBox" name="searchbackCB" >
+      <property name="toolTip" >
+       <string>Shift+Enter search backwards directly</string>
+      </property>
+      <property name="text" >
+       <string>Search &amp;backwards</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="1" >
+     <widget class="QPushButton" name="replaceallPB" >
+      <property name="enabled" >
+       <bool>true</bool>
+      </property>
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+        <horstretch>100</horstretch>
+        <verstretch>32</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="toolTip" >
+       <string>Replace all occurences at once</string>
+      </property>
+      <property name="text" >
+       <string>Replace &amp;All</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="advancedTab" >
+   <attribute name="title" >
+    <string>S&amp;ettings</string>
+   </attribute>
+   <layout class="QGridLayout" name="gridLayout_2" >
+    <item row="0" column="0" colspan="2" >
+     <widget class="QGroupBox" name="groupBox_2" >
+      <property name="enabled" >
+       <bool>true</bool>
+      </property>
+      <property name="minimumSize" >
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="toolTip" >
+       <string>The scope to which the search horizon is restricted</string>
+      </property>
+      <property name="autoFillBackground" >
+       <bool>false</bool>
+      </property>
+      <property name="title" >
+       <string>Sco&amp;pe</string>
+      </property>
+      <property name="flat" >
+       <bool>false</bool>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout" >
+       <item>
+        <widget class="QRadioButton" name="CurrentDocument" >
+         <property name="enabled" >
+          <bool>true</bool>
+         </property>
+         <property name="text" >
+          <string>Current &amp;document</string>
+         </property>
+         <property name="checked" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="MasterDocument" >
+         <property name="enabled" >
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip" >
+          <string>Current document and all related documents belonging to the same master document</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Master document</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="OpenDocuments" >
+         <property name="enabled" >
+          <bool>true</bool>
+         </property>
+         <property name="toolTip" >
+          <string>All open documents</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Open documents</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QRadioButton" name="AllManualsRB" >
+         <property name="enabled" >
+          <bool>true</bool>
+         </property>
+         <property name="text" >
+          <string>All ma&amp;nuals</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+    <item row="1" column="0" >
+     <widget class="QCheckBox" name="ignoreFormatCB" >
+      <property name="enabled" >
+       <bool>true</bool>
+      </property>
+      <property name="toolTip" >
+       <string>If unchecked, the search will be limited to occurrences of the selected text and paragraph style</string>
+      </property>
+      <property name="text" >
+       <string>Ignore &amp;format</string>
+      </property>
+      <property name="checked" >
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0" colspan="2" >
+     <widget class="QCheckBox" name="keepCaseCB" >
+      <property name="toolTip" >
+       <string>Keep the case of the replacement's first letter as in each matching text first letter</string>
+      </property>
+      <property name="text" >
+       <string>&amp;Preserve first case on replace</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0" >
+     <widget class="QCheckBox" name="expandMacrosCB" >
+      <property name="enabled" >
+       <bool>false</bool>
+      </property>
+      <property name="text" >
+       <string>&amp;Expand macros</string>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="1" >
+     <spacer name="verticalSpacer" >
+      <property name="orientation" >
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0" >
+       <size>
+        <width>105</width>
+        <height>2</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>
    <class>lyx::frontend::EmbeddedWorkArea</class>
-   <extends>QScrollArea</extends>
-   <header location="global">GuiWorkArea.h</header>
+   <extends>QWidget</extends>
+   <header>GuiWorkArea.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
- <includes>
-  <include location="local">qt_helpers.h</include>
- </includes>
  <resources/>
  <connections/>
 </ui>