X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FGraphicsUi.ui;h=1891ce85ca9d30741ccc65bb8500b4af415cd334;hb=49c2450f3f6cb67a36f8fa987ad287a8bff11d79;hp=6fd3094c3cf713c6a51c5087f79ef9f40f491272;hpb=a1607b414ae8a523f735e02d5bd3772f212f7d91;p=lyx.git

diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui
index 6fd3094c3c..1891ce85ca 100644
--- a/src/frontends/qt4/ui/GraphicsUi.ui
+++ b/src/frontends/qt4/ui/GraphicsUi.ui
@@ -1,18 +1,18 @@
 <ui version="4.0" >
- <class>QGraphicsUi</class>
- <widget class="QDialog" name="QGraphicsUi" >
+ <class>GraphicsUi</class>
+ <widget class="QDialog" name="GraphicsUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>432</width>
-    <height>328</height>
+    <width>482</width>
+    <height>383</height>
    </rect>
   </property>
   <property name="sizePolicy" >
    <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -31,7 +31,7 @@
     <number>6</number>
    </property>
    <item row="0" column="0" >
-    <widget class="QTabWidget" name="TabWidget" >
+    <widget class="QTabWidget" name="tabWidget" >
      <property name="toolTip" >
       <string/>
      </property>
@@ -49,19 +49,6 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item row="0" column="3" >
-        <widget class="QPushButton" name="editPB" >
-         <property name="text" >
-          <string>&amp;Edit</string>
-         </property>
-         <property name="autoDefault" >
-          <bool>false</bool>
-         </property>
-         <property name="default" >
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="2" >
         <widget class="QPushButton" name="browsePB" >
          <property name="toolTip" >
@@ -72,93 +59,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QLineEdit" name="filename" >
-         <property name="toolTip" >
-          <string>File name of image</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="filenameL" >
-         <property name="toolTip" >
-          <string>File name of image</string>
-         </property>
-         <property name="text" >
-          <string>&amp;File:</string>
-         </property>
-         <property name="buddy" >
-          <cstring>filename</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="4" >
-        <widget class="QGroupBox" name="rotationGB" >
-         <property name="title" >
-          <string>Rotate Graphics</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="0" column="0" >
-           <widget class="QLabel" name="angleL" >
-            <property name="toolTip" >
-             <string>Angle to rotate image by</string>
-            </property>
-            <property name="text" >
-             <string>A&amp;ngle (Degrees):</string>
-            </property>
-            <property name="buddy" >
-             <cstring>angle</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" >
-           <widget class="QLineEdit" name="angle" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>3</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip" >
-             <string>Angle to rotate image by</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="2" >
-           <widget class="QLabel" name="originL" >
-            <property name="toolTip" >
-             <string>The origin of the rotation</string>
-            </property>
-            <property name="text" >
-             <string>Or&amp;igin:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>origin</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="3" >
-           <widget class="QComboBox" name="origin" >
-            <property name="toolTip" >
-             <string>The origin of the rotation</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="4" >
+       <item row="1" column="0" colspan="5" >
         <widget class="QGroupBox" name="sizeGB" >
          <property name="title" >
           <string>Output Size</string>
@@ -174,10 +75,10 @@
            <number>6</number>
           </property>
           <item row="1" column="2" >
-           <widget class="LengthCombo" name="widthUnit" />
+           <widget class="lyx::frontend::LengthCombo" name="widthUnit" />
           </item>
           <item row="2" column="2" >
-           <widget class="LengthCombo" name="heightUnit" />
+           <widget class="lyx::frontend::LengthCombo" name="heightUnit" />
           </item>
           <item row="1" column="1" >
            <widget class="QLineEdit" name="Width" >
@@ -186,7 +87,7 @@
             </property>
             <property name="sizePolicy" >
              <sizepolicy>
-              <hsizetype>1</hsizetype>
+              <hsizetype>0</hsizetype>
               <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
@@ -220,7 +121,7 @@
             </property>
             <property name="sizePolicy" >
              <sizepolicy>
-              <hsizetype>1</hsizetype>
+              <hsizetype>0</hsizetype>
               <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
@@ -280,6 +181,102 @@
          </layout>
         </widget>
        </item>
+       <item row="2" column="0" colspan="5" >
+        <widget class="QGroupBox" name="rotationGB" >
+         <property name="title" >
+          <string>Rotate Graphics</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" colspan="2" >
+           <widget class="QCheckBox" name="rotateOrderCB" >
+            <property name="toolTip" >
+             <string>Check to change the order of rotating and scaling</string>
+            </property>
+            <property name="text" >
+             <string>Ro&amp;tate after scaling</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3" >
+           <widget class="QComboBox" name="origin" >
+            <property name="toolTip" >
+             <string>The origin of the rotation</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2" >
+           <widget class="QLabel" name="originL" >
+            <property name="toolTip" >
+             <string>The origin of the rotation</string>
+            </property>
+            <property name="text" >
+             <string>Or&amp;igin:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>origin</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="angle" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>0</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip" >
+             <string>Angle to rotate image by</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="angleL" >
+            <property name="toolTip" >
+             <string>Angle to rotate image by</string>
+            </property>
+            <property name="text" >
+             <string>A&amp;ngle (Degrees):</string>
+            </property>
+            <property name="buddy" >
+             <cstring>angle</cstring>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="filenameL" >
+         <property name="toolTip" >
+          <string>File name of image</string>
+         </property>
+         <property name="text" >
+          <string>&amp;File:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>filename</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="filename" >
+         <property name="toolTip" >
+          <string>File name of image</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Clipping" >
@@ -323,8 +320,8 @@
          </property>
          <property name="sizePolicy" >
           <sizepolicy>
-           <hsizetype>5</hsizetype>
-           <vsizetype>1</vsizetype>
+           <hsizetype>0</hsizetype>
+           <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -333,7 +330,7 @@
           <enum>QFrame::StyledPanel</enum>
          </property>
          <property name="frameShadow" >
-          <enum>QFrame::Raised</enum>
+          <enum>QFrame::Plain</enum>
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
@@ -457,24 +454,34 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="latexoptionsLA" >
+       <item row="2" column="0" colspan="3" >
+        <widget class="QCheckBox" name="unzipCB" >
          <property name="toolTip" >
-          <string>Additional LaTeX options</string>
+          <string>Don't uncompress image before exporting to LaTeX</string>
          </property>
          <property name="text" >
-          <string>LaTeX &amp;options:</string>
-         </property>
-         <property name="buddy" >
-          <cstring>latexoptions</cstring>
+          <string>Don't un&amp;zip on export</string>
          </property>
         </widget>
        </item>
+       <item row="0" column="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>161</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="0" column="1" >
         <widget class="QLineEdit" name="latexoptions" >
          <property name="sizePolicy" >
           <sizepolicy>
-           <hsizetype>3</hsizetype>
+           <hsizetype>0</hsizetype>
            <vsizetype>0</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
@@ -485,33 +492,42 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2" >
-        <widget class="QCheckBox" name="unzipCB" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="latexoptionsLA" >
          <property name="toolTip" >
-          <string>Don't uncompress image before exporting to LaTeX</string>
+          <string>Additional LaTeX options</string>
          </property>
          <property name="text" >
-          <string>Don't un&amp;zip on export</string>
+          <string>LaTeX &amp;options:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>latexoptions</cstring>
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="2" >
-        <widget class="QCheckBox" name="draftCB" >
-         <property name="toolTip" >
-          <string>Draft mode</string>
+       <item row="5" column="0" colspan="3" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="text" >
-          <string>&amp;Draft mode</string>
+         <property name="sizeHint" >
+          <size>
+           <width>354</width>
+           <height>81</height>
+          </size>
          </property>
-        </widget>
+        </spacer>
        </item>
-       <item row="3" column="0" colspan="2" >
-        <widget class="QGroupBox" name="subfigure" >
+       <item row="3" column="0" colspan="3" >
+        <widget class="QGroupBox" name="displayGB" >
          <property name="focusPolicy" >
           <enum>Qt::StrongFocus</enum>
          </property>
+         <property name="toolTip" >
+          <string>Enable LyX to preview this graphics, only if graphics previewing is not disabled at application level (see Preference dialog).</string>
+         </property>
          <property name="title" >
-          <string>S&amp;ubfigure</string>
+          <string>Sho&amp;w in LyX</string>
          </property>
          <property name="flat" >
           <bool>true</bool>
@@ -519,142 +535,145 @@
          <property name="checkable" >
           <bool>true</bool>
          </property>
-         <property name="checked" >
-          <bool>false</bool>
-         </property>
-         <layout class="QHBoxLayout" >
+         <layout class="QGridLayout" >
           <property name="margin" >
            <number>9</number>
           </property>
           <property name="spacing" >
            <number>6</number>
           </property>
-          <item>
-           <widget class="QLabel" name="CaptionLA" >
-            <property name="toolTip" >
-             <string>The caption for the sub-figure</string>
-            </property>
-            <property name="text" >
-             <string>Ca&amp;ption:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>subcaption</cstring>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="displayscale" >
+            <property name="enabled" >
+             <bool>true</bool>
             </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="subcaption" >
             <property name="sizePolicy" >
              <sizepolicy>
-              <hsizetype>3</hsizetype>
+              <hsizetype>0</hsizetype>
               <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip" >
-             <string>The caption for the sub-figure</string>
+             <string>Percentage to scale by in LyX</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="scaleLA" >
+            <property name="toolTip" >
+             <string>Percentage to scale by in LyX</string>
+            </property>
+            <property name="text" >
+             <string>Sca&amp;le on Screen (%):</string>
+            </property>
+            <property name="buddy" >
+             <cstring>displayscale</cstring>
             </property>
            </widget>
           </item>
+          <item row="0" column="2" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2" >
-        <widget class="QGroupBox" name="displayGB" >
-         <property name="focusPolicy" >
-          <enum>Qt::StrongFocus</enum>
+       <item row="4" column="0" colspan="3" >
+        <widget class="QGroupBox" name="graphicsGroupGB" >
+         <property name="toolTip" >
+          <string>Assign the graphic to a group of graphics that share the same settings</string>
          </property>
          <property name="title" >
-          <string>Sho&amp;w in LyX</string>
+          <string>Graphics Group</string>
          </property>
          <property name="flat" >
           <bool>true</bool>
          </property>
-         <property name="checkable" >
-          <bool>true</bool>
-         </property>
-         <layout class="QHBoxLayout" >
+         <layout class="QGridLayout" >
           <property name="margin" >
            <number>9</number>
           </property>
           <property name="spacing" >
            <number>6</number>
           </property>
-          <item>
-           <widget class="QLabel" name="showL" >
+          <item rowspan="2" row="0" column="2" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" >
+             <size>
+              <width>121</width>
+              <height>51</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>0</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="toolTip" >
-             <string>Screen display</string>
+             <string/>
             </property>
             <property name="text" >
-             <string>&amp;Display:</string>
+             <string>A&amp;ssigned to group:</string>
             </property>
             <property name="buddy" >
-             <cstring>showCB</cstring>
+             <cstring>groupCO</cstring>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QComboBox" name="showCB" >
-            <property name="toolTip" >
-             <string>Screen display</string>
-            </property>
-            <item>
-             <property name="text" >
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>Monochrome</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>Grayscale</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>Color</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="scaleLA" >
+          <item row="1" column="1" >
+           <widget class="QPushButton" name="newGroupPB" >
             <property name="toolTip" >
-             <string>Percentage to scale by in LyX</string>
+             <string>Click to define a new graphics group.</string>
             </property>
             <property name="text" >
-             <string>Sca&amp;le on Screen (%):</string>
-            </property>
-            <property name="buddy" >
-             <cstring>displayscale</cstring>
+             <string>O&amp;pen new group...</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLineEdit" name="displayscale" >
-            <property name="enabled" >
-             <bool>true</bool>
-            </property>
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>1</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="groupCO" >
             <property name="toolTip" >
-             <string>Percentage to scale by in LyX</string>
+             <string>Select an existing group for the current graphics.</string>
+            </property>
+            <property name="editable" >
+             <bool>false</bool>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
+       <item row="1" column="0" colspan="3" >
+        <widget class="QCheckBox" name="draftCB" >
+         <property name="toolTip" >
+          <string>Draft mode</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Draft mode</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
@@ -713,7 +732,7 @@
       <widget class="QPushButton" name="applyPB" >
        <property name="sizePolicy" >
         <sizepolicy>
-         <hsizetype>1</hsizetype>
+         <hsizetype>0</hsizetype>
          <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
@@ -734,7 +753,7 @@
       <widget class="QPushButton" name="closePB" >
        <property name="sizePolicy" >
         <sizepolicy>
-         <hsizetype>1</hsizetype>
+         <hsizetype>0</hsizetype>
          <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
@@ -754,16 +773,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>LengthCombo</class>
+   <class>lyx::frontend::LengthCombo</class>
    <extends>QComboBox</extends>
-   <header>lengthcombo.h</header>
+   <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>TabWidget</tabstop>
+  <tabstop>tabWidget</tabstop>
   <tabstop>filename</tabstop>
   <tabstop>browsePB</tabstop>
-  <tabstop>editPB</tabstop>
   <tabstop>scaleCB</tabstop>
   <tabstop>Scale</tabstop>
   <tabstop>WidthCB</tabstop>
@@ -775,6 +793,7 @@
   <tabstop>aspectratio</tabstop>
   <tabstop>angle</tabstop>
   <tabstop>origin</tabstop>
+  <tabstop>rotateOrderCB</tabstop>
   <tabstop>restorePB</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>applyPB</tabstop>
@@ -792,16 +811,11 @@
   <tabstop>latexoptions</tabstop>
   <tabstop>draftCB</tabstop>
   <tabstop>unzipCB</tabstop>
-  <tabstop>subfigure</tabstop>
-  <tabstop>subcaption</tabstop>
   <tabstop>displayGB</tabstop>
-  <tabstop>showCB</tabstop>
-  <tabstop>displayscale</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_helpers.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
- <connections>
- </connections>
+ <connections/>
 </ui>