X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FParagraphUi.ui;h=dd32694b06f2ddfade5b078cb7acaa1c14d1c3de;hb=0de23da9cd0ff804d5ee53133138e1acab217158;hp=c6f7d9ad152371ca05c41acb41c9b78c106edabd;hpb=67206b5d60f04dd98138284346ea99eb6fc2373d;p=lyx.git

diff --git a/src/frontends/qt4/ui/ParagraphUi.ui b/src/frontends/qt4/ui/ParagraphUi.ui
index c6f7d9ad15..dd32694b06 100644
--- a/src/frontends/qt4/ui/ParagraphUi.ui
+++ b/src/frontends/qt4/ui/ParagraphUi.ui
@@ -1,34 +1,20 @@
 <ui version="4.0" >
  <class>ParagraphUi</class>
  <widget class="QDialog" name="ParagraphUi" >
-  <property name="windowModality" >
-   <enum>Qt::NonModal</enum>
-  </property>
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>488</width>
-    <height>286</height>
+    <width>438</width>
+    <height>292</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="focusPolicy" >
    <enum>Qt::NoFocus</enum>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
-   <bool>true</bool>
-  </property>
   <layout class="QGridLayout" >
    <property name="margin" >
     <number>9</number>
@@ -36,104 +22,40 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="5" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="restorePB" >
-       <property name="text" >
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="4" column="0" >
+   <item row="4" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>16</height>
+       <width>281</width>
+       <height>31</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" >
+   <item row="4" column="2" >
+    <widget class="QCheckBox" name="synchronizedViewCB" >
+     <property name="layoutDirection" >
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="text" >
+      <string>I&amp;mmediate Apply</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
     <widget class="QGroupBox" name="labelwidthGB" >
      <property name="enabled" >
       <bool>false</bool>
      </property>
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>1</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="title" >
       <string>Label Width</string>
      </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
      <layout class="QGridLayout" >
       <property name="margin" >
        <number>9</number>
@@ -141,41 +63,36 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="0" column="1" >
-       <widget class="QLineEdit" name="labelWidth" >
-        <property name="toolTip" >
-         <string>This text defines the width of the paragraph label</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0" >
        <widget class="QLabel" name="TextLabel2" >
         <property name="toolTip" >
          <string>This text defines the width of the paragraph label</string>
         </property>
         <property name="text" >
-         <string>&amp;Longest label</string>
+         <string>Lo&amp;ngest label</string>
         </property>
         <property name="buddy" >
          <cstring>labelWidth</cstring>
         </property>
        </widget>
       </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="labelWidth" >
+        <property name="toolTip" >
+         <string>This text defines the width of the paragraph label</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="aligmentGB" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>5</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>Alignment</string>
+      <string>Line &amp;spacing</string>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
       <property name="margin" >
@@ -184,53 +101,109 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="0" column="0" colspan="4" >
-       <widget class="QRadioButton" name="alignDefaultRB" >
-        <property name="font" >
-         <font>
-          <italic>false</italic>
-         </font>
-        </property>
-        <property name="toolTip" >
-         <string>Use the default alignment for this paragraph, whatever it is.</string>
-        </property>
-        <property name="text" >
-         <string>Use Paragraph's Default Alignment</string>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="linespacingValue" >
+        <property name="enabled" >
+         <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" >
-       <widget class="QRadioButton" name="alignRightRB" >
+      <item row="0" column="0" >
+       <widget class="QComboBox" name="linespacing" >
+        <item>
+         <property name="text" >
+          <string>Default</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Single</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>1.5</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Double</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Custom</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QCheckBox" name="indentCB" >
+     <property name="text" >
+      <string>&amp;Indent Paragraph</string>
+     </property>
+    </widget>
+   </item>
+   <item rowspan="3" row="0" column="1" colspan="2" >
+    <widget class="QGroupBox" name="aligmentGB" >
+     <property name="title" >
+      <string>Alignment</string>
+     </property>
+     <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="1" column="0" >
+       <widget class="QRadioButton" name="alignJustRB" >
         <property name="text" >
-         <string>&amp;Right</string>
+         <string>&amp;Justified</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
+      <item row="2" column="0" >
        <widget class="QRadioButton" name="alignLeftRB" >
         <property name="text" >
          <string>&amp;Left</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
+      <item row="3" column="0" >
        <widget class="QRadioButton" name="alignCenterRB" >
         <property name="text" >
-         <string>&amp;Center</string>
+         <string>C&amp;enter</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QRadioButton" name="alignJustRB" >
+      <item row="4" column="0" >
+       <widget class="QRadioButton" name="alignRightRB" >
         <property name="text" >
-         <string>&amp;Justified</string>
+         <string>Ri&amp;ght</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="alignDefaultRB" >
+        <property name="toolTip" >
+         <string>Use the default alignment for this paragraph, whatever it is.</string>
+        </property>
+        <property name="text" >
+         <string>Paragraph's &amp;Default</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" >
+   <item row="5" column="0" colspan="3" >
     <layout class="QHBoxLayout" >
      <property name="margin" >
       <number>0</number>
@@ -239,100 +212,93 @@
       <number>6</number>
      </property>
      <item>
-      <widget class="QLabel" name="linespacingL" >
+      <widget class="QPushButton" name="restorePB" >
        <property name="text" >
-        <string>L&amp;ine spacing:</string>
+        <string>&amp;Restore</string>
        </property>
-       <property name="buddy" >
-        <cstring>linespacing</cstring>
+       <property name="autoDefault" >
+        <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="linespacing" >
-       <item>
-        <property name="text" >
-         <string>Default</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Single</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>1.5</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Double</string>
-        </property>
-       </item>
-       <item>
-        <property name="text" >
-         <string>Custom</string>
-        </property>
-       </item>
-      </widget>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>31</width>
+         <height>27</height>
+        </size>
+       </property>
+      </spacer>
      </item>
      <item>
-      <widget class="QLineEdit" name="linespacingValue" >
-       <property name="enabled" >
-        <bool>false</bool>
+      <widget class="QPushButton" name="okPB" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item row="2" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
      <item>
-      <widget class="QCheckBox" name="indentCB" >
+      <widget class="QPushButton" name="applyPB" >
        <property name="text" >
-        <string>Indent &amp;Paragraph</string>
+        <string>&amp;Apply</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
        </property>
       </widget>
      </item>
      <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
+      <widget class="QPushButton" name="closePB" >
+       <property name="text" >
+        <string>&amp;Close</string>
        </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
+       <property name="autoDefault" >
+        <bool>false</bool>
        </property>
-      </spacer>
+      </widget>
      </item>
     </layout>
    </item>
+   <item row="3" column="0" colspan="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>351</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>linespacing</tabstop>
   <tabstop>linespacingValue</tabstop>
-  <tabstop>indentCB</tabstop>
   <tabstop>labelWidth</tabstop>
+  <tabstop>indentCB</tabstop>
+  <tabstop>alignDefaultRB</tabstop>
+  <tabstop>alignJustRB</tabstop>
+  <tabstop>alignLeftRB</tabstop>
+  <tabstop>alignCenterRB</tabstop>
+  <tabstop>alignRightRB</tabstop>
+  <tabstop>synchronizedViewCB</tabstop>
   <tabstop>restorePB</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>applyPB</tabstop>
   <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_helpers.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>