X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FPrefFileformatsUi.ui;h=fd60ec27940fdacd2a17c99b63dbf93466521c43;hb=49c2450f3f6cb67a36f8fa987ad287a8bff11d79;hp=37828c4068f54fb4569d60ae24b3aa2460b41abb;hpb=2ebb97758c10794a944878212e4d6712fb8b6447;p=lyx.git

diff --git a/src/frontends/qt4/ui/PrefFileformatsUi.ui b/src/frontends/qt4/ui/PrefFileformatsUi.ui
index 37828c4068..fd60ec2794 100644
--- a/src/frontends/qt4/ui/PrefFileformatsUi.ui
+++ b/src/frontends/qt4/ui/PrefFileformatsUi.ui
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>PrefFileformatsUi</class>
  <widget class="QWidget" name="PrefFileformatsUi">
@@ -6,14 +5,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>443</width>
-    <height>477</height>
+    <width>386</width>
+    <height>381</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="8" column="2" colspan="2">
+    <widget class="QLineEdit" name="editorED"/>
+   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="formatsLA">
      <property name="text">
@@ -24,36 +26,14 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="formatsCB">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-     <property name="maxVisibleItems">
-      <number>20</number>
-     </property>
-     <property name="insertPolicy">
-      <enum>QComboBox::InsertAtCurrent</enum>
-     </property>
-     <property name="minimumContentsLength">
-      <number>1</number>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
+   <item row="0" column="3">
     <widget class="QPushButton" name="formatNewPB">
      <property name="text">
       <string>&amp;New...</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="3">
+   <item row="0" column="4">
     <widget class="QPushButton" name="formatRemovePB">
      <property name="text">
       <string>Re&amp;move</string>
@@ -68,13 +48,23 @@
     </widget>
    </item>
    <item row="2" column="1" colspan="2">
+    <widget class="QCheckBox" name="exportMenuCB">
+     <property name="toolTip">
+      <string>Check this to show the current format in the File &gt; Export menu</string>
+     </property>
+     <property name="text">
+      <string>Sho&amp;w in export menu</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2">
     <widget class="QCheckBox" name="vectorCB">
      <property name="text">
       <string>Vector &amp;graphics format</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="formatLA">
      <property name="text">
       <string>S&amp;hort Name:</string>
@@ -84,56 +74,56 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="4" column="1" colspan="2">
     <widget class="QLineEdit" name="formatED"/>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="extensionLA">
+   <item row="5" column="0">
+    <widget class="QLabel" name="extensionsLA">
      <property name="text">
-      <string>E&amp;xtension:</string>
+      <string>E&amp;xtensions:</string>
      </property>
      <property name="buddy">
-      <cstring>extensionED</cstring>
+      <cstring>extensionsED</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QLineEdit" name="extensionED"/>
+   <item row="5" column="1" colspan="2">
+    <widget class="QLineEdit" name="extensionsED"/>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="shortcutLA">
+   <item row="6" column="0">
+    <widget class="QLabel" name="mimeLA">
      <property name="text">
-      <string>Shortc&amp;ut:</string>
+      <string>&amp;MIME:</string>
      </property>
      <property name="buddy">
-      <cstring>shortcutED</cstring>
+      <cstring>mimeED</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
-    <widget class="QLineEdit" name="shortcutED"/>
+   <item row="6" column="1" colspan="2">
+    <widget class="QLineEdit" name="mimeED"/>
    </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="editorLA">
+   <item row="7" column="0">
+    <widget class="QLabel" name="shortcutLA">
      <property name="text">
-      <string>Ed&amp;itor:</string>
+      <string>Shortc&amp;ut:</string>
      </property>
      <property name="buddy">
-      <cstring>editorCO</cstring>
+      <cstring>shortcutED</cstring>
      </property>
     </widget>
    </item>
-   <item row="6" column="1" colspan="3">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QComboBox" name="editorCO"/>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="editorED"/>
-     </item>
-    </layout>
+   <item row="7" column="1" colspan="2">
+    <widget class="QLineEdit" name="shortcutED"/>
+   </item>
+   <item row="8" column="1">
+    <widget class="QComboBox" name="editorCO">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+     </property>
+    </widget>
    </item>
-   <item row="7" column="0">
+   <item row="9" column="0">
     <widget class="QLabel" name="viewerLA">
      <property name="text">
       <string>&amp;Viewer:</string>
@@ -143,17 +133,17 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="1" colspan="3">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QComboBox" name="viewerCO"/>
-     </item>
-     <item>
-      <widget class="QLineEdit" name="viewerED"/>
-     </item>
-    </layout>
+   <item row="9" column="1">
+    <widget class="QComboBox" name="viewerCO">
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="2" colspan="2">
+    <widget class="QLineEdit" name="viewerED"/>
    </item>
-   <item row="8" column="0">
+   <item row="10" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Co&amp;pier:</string>
@@ -163,23 +153,10 @@
      </property>
     </widget>
    </item>
-   <item row="8" column="1" colspan="2">
+   <item row="10" column="1" colspan="2">
     <widget class="QLineEdit" name="copierED"/>
    </item>
-   <item row="9" column="1">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>124</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="10" column="0" colspan="3">
+   <item row="11" column="0" colspan="5">
     <widget class="QGroupBox" name="defaultFormatGB">
      <property name="toolTip">
       <string>Specify the default output format when using (PDF)LaTeX</string>
@@ -190,14 +167,8 @@
      <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
        <widget class="QLabel" name="defaultFormatLA">
         <property name="text">
          <string>De&amp;fault Output Format:</string>
@@ -207,12 +178,77 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item>
        <widget class="QComboBox" name="defaultFormatCB"/>
       </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>148</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
+   <item row="12" column="1" colspan="2">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>124</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="8" column="0">
+    <widget class="QLabel" name="editorLA">
+     <property name="text">
+      <string>Ed&amp;itor:</string>
+     </property>
+     <property name="buddy">
+      <cstring>editorCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="5">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" colspan="2">
+    <widget class="QComboBox" name="formatsCB">
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+     <property name="maxVisibleItems">
+      <number>20</number>
+     </property>
+     <property name="insertPolicy">
+      <enum>QComboBox::InsertAtCurrent</enum>
+     </property>
+     <property name="minimumContentsLength">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
@@ -220,12 +256,16 @@
   <tabstop>formatNewPB</tabstop>
   <tabstop>formatRemovePB</tabstop>
   <tabstop>documentCB</tabstop>
+  <tabstop>exportMenuCB</tabstop>
   <tabstop>vectorCB</tabstop>
   <tabstop>formatED</tabstop>
-  <tabstop>extensionED</tabstop>
+  <tabstop>extensionsED</tabstop>
   <tabstop>shortcutED</tabstop>
+  <tabstop>editorCO</tabstop>
   <tabstop>editorED</tabstop>
+  <tabstop>viewerCO</tabstop>
   <tabstop>viewerED</tabstop>
+  <tabstop>mimeED</tabstop>
   <tabstop>copierED</tabstop>
  </tabstops>
  <includes>