clean up of the graphics dialog:

-layout
-enabling/disabling widgets
-tab order

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13574 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QGraphics.C b/src/frontends/qt4/QGraphics.C
index adbe8a79db5ae608ab31717dba2ef6be0534ed67..89c34a3ebf0da7b99854c90a500e0c1d0eb259b3 100644 (file)
--- a/src/frontends/qt4/QGraphics.C
+++ b/src/frontends/qt4/QGraphics.C
@@ -106,10 +106,10 @@ void QGraphics::build_dialog()
        bcview().addReadOnly(dialog_->getPB);
 
        // initialize the length validator
-       addCheckedLineEdit(bcview(), dialog_->Width, dialog_->sizewidthL_2);
-       addCheckedLineEdit(bcview(), dialog_->Height, dialog_->sizeheightL_2);
+       addCheckedLineEdit(bcview(), dialog_->Width, dialog_->widthL);
+       addCheckedLineEdit(bcview(), dialog_->Height, dialog_->heightL);
        addCheckedLineEdit(bcview(), dialog_->displayscale, dialog_->scaleLA);
-       addCheckedLineEdit(bcview(), dialog_->angle, dialog_->angleL_2);
+       addCheckedLineEdit(bcview(), dialog_->angle, dialog_->angleL);
        addCheckedLineEdit(bcview(), dialog_->lbX, dialog_->xL);
        addCheckedLineEdit(bcview(), dialog_->lbY, dialog_->yL);
        addCheckedLineEdit(bcview(), dialog_->rtX, dialog_->xL_2);
@@ -240,6 +240,7 @@ void QGraphics::update_contents()
        dialog_->showCB->setEnabled(igp.display != lyx::graphics::NoDisplay && !readOnly());
        dialog_->displayCB->setChecked(igp.display != lyx::graphics::NoDisplay);
        dialog_->displayscale->setEnabled(igp.display != lyx::graphics::NoDisplay && !readOnly());
+       dialog_->displayscaleL->setEnabled(igp.display != lyx::graphics::NoDisplay && !readOnly());
        dialog_->displayscale->setText(toqstr(convert<string>(igp.lyxscale)));
 
        //// the output section (width/height)
@@ -272,6 +273,7 @@ void QGraphics::update_contents()
 
        // enable height input in case of non "Scale%" as width-unit
        bool use_height = (dialog_->widthUnit->currentItem() > 0);
+       dialog_->heightL->setEnabled(use_height);
        dialog_->Height->setEnabled(use_height);
        dialog_->heightUnit->setEnabled(use_height);
 
@@ -296,6 +298,9 @@ void QGraphics::update_contents()
        else
                dialog_->origin->setCurrentItem(0);
 
+       // disable edit button when no filename is present
+       dialog_->editPB->setDisabled(dialog_->filename->text().isEmpty());
+
        //// latex section
        dialog_->latexoptions->setText(toqstr(igp.special));
 }

diff --git a/src/frontends/qt4/QGraphicsDialog.C b/src/frontends/qt4/QGraphicsDialog.C
index ac5cdf0233d8fae4ad3422cc8dbb31d500ffc55c..ab06db94650a50811d0748674e4ce36e4d996bb0 100644 (file)
--- a/src/frontends/qt4/QGraphicsDialog.C
+++ b/src/frontends/qt4/QGraphicsDialog.C
@@ -51,37 +51,38 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form)
        connect(editPB, SIGNAL(clicked()),
                this, SLOT(edit_clicked()));
 
-    connect( subfigure, SIGNAL( toggled(bool) ), subcaption, SLOT( setEnabled(bool) ) );
-    connect( browsePB, SIGNAL( clicked() ), this, SLOT( browse_clicked() ) );
-    connect( filename, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( subcaption, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( subfigure, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
-    connect( latexoptions, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( clip, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
-    connect( lbX, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
-    connect( showCB, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
-    connect( displayscale, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( Width, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( widthUnit, SIGNAL( activated(int) ), this, SLOT( change_WUnit() ) );
-    connect( aspectratio, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
-    connect( displayCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
-    connect( draftCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
-    connect( unzipCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
-    connect( displayCB, SIGNAL( toggled(bool) ), showCB, SLOT( setEnabled(bool) ) );
-    connect( displayCB, SIGNAL( toggled(bool) ), displayscale, SLOT( setEnabled(bool) ) );
-    connect( Height, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( heightUnit, SIGNAL( selectionChanged(LyXLength::UNIT) ), this, SLOT( change_adaptor() ) );
-    connect( angle, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
-    connect( origin, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
-    connect( getPB, SIGNAL( clicked() ), this, SLOT( getBB_clicked() ) );
-    connect( getPB, SIGNAL( clicked() ), this, SLOT( change_adaptor() ) );
-    connect( lbY, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
-    connect( rtX, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
-    connect( rtY, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
-    connect( lbXunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
-    connect( lbYunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
-    connect( rtXunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
-    connect( rtYunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
+       connect( subfigure, SIGNAL( toggled(bool) ), subcaption, SLOT( setEnabled(bool) ) );
+       connect( browsePB, SIGNAL( clicked() ), this, SLOT( browse_clicked() ) );
+       connect( filename, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
+       connect( filename, SIGNAL( textChanged(const QString&) ), this, SLOT( filenameChanged(const QString&) ) );
+       connect( subcaption, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
+       connect( subfigure, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
+       connect( latexoptions, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
+       connect( clip, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
+       connect( lbX, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
+       connect( showCB, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
+       connect( displayscale, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
+       connect( Width, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
+       connect( widthUnit, SIGNAL( activated(int) ), this, SLOT( change_WUnit() ) );
+       connect( aspectratio, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
+       connect( displayCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
+       connect( draftCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
+       connect( unzipCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
+       connect( displayCB, SIGNAL( toggled(bool) ), showCB, SLOT( setEnabled(bool) ) );
+       connect( displayCB, SIGNAL( toggled(bool) ), displayscale, SLOT( setEnabled(bool) ) );
+       connect( Height, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
+       connect( heightUnit, SIGNAL( selectionChanged(LyXLength::UNIT) ), this, SLOT( change_adaptor() ) );
+       connect( angle, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
+       connect( origin, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
+       connect( getPB, SIGNAL( clicked() ), this, SLOT( getBB_clicked() ) );
+       connect( getPB, SIGNAL( clicked() ), this, SLOT( change_adaptor() ) );
+       connect( lbY, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
+       connect( rtX, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
+       connect( rtY, SIGNAL( textChanged(const QString&) ), this, SLOT( change_bb() ) );
+       connect( lbXunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
+       connect( lbYunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
+       connect( rtXunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
+       connect( rtYunit, SIGNAL( activated(int) ), this, SLOT( change_bb() ) );
 
        angle->setValidator(new QDoubleValidator(-360, 360, 2, angle));
 
@@ -125,6 +126,7 @@ void QGraphicsDialog::change_WUnit()
        bool useHeight = (widthUnit->currentItem() > 0);
        Height->setEnabled(useHeight);
        heightUnit->setEnabled(useHeight);
+       heightL->setEnabled(useHeight);
        form_->changed();
 }
 
@@ -156,5 +158,10 @@ void QGraphicsDialog::edit_clicked()
        form_->controller().editGraphics();
 }
 
+void QGraphicsDialog::filenameChanged(const QString & filename)
+{
+       editPB->setDisabled(filename.isEmpty());
+}
+
 } // namespace frontend
 } // namespace lyx

diff --git a/src/frontends/qt4/QGraphicsDialog.h b/src/frontends/qt4/QGraphicsDialog.h
index d51020f9180ff1f2d0d013184722e434d94a046f..82685b5d0e65a238164e9457a5ad7231461eb9ec 100644 (file)
--- a/src/frontends/qt4/QGraphicsDialog.h
+++ b/src/frontends/qt4/QGraphicsDialog.h
@@ -17,6 +17,7 @@
 
 #include <QCloseEvent>
 #include <QDialog>
+#include <QString>
 
 namespace lyx {
 namespace frontend {
@@ -36,6 +37,7 @@ protected slots:
        virtual void browse_clicked();
        virtual void getBB_clicked();
        virtual void edit_clicked();
+       virtual void filenameChanged(const QString &);
 protected:
        virtual void closeEvent(QCloseEvent * e);
 private:

diff --git a/src/frontends/qt4/ui/QGraphicsUi.ui b/src/frontends/qt4/ui/QGraphicsUi.ui
index dc89093c0e73a67180b1d76c742b906454b26d16..0cadf3ef744c0919ce57c477104485a7ad4a9bd4 100644 (file)
--- a/src/frontends/qt4/ui/QGraphicsUi.ui
+++ b/src/frontends/qt4/ui/QGraphicsUi.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>451</width>
-    <height>549</height>
+    <width>412</width>
+    <height>411</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -28,102 +28,11 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="1" 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>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::MinimumExpanding</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>true</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>1</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="sizePolicy" >
-        <sizepolicy>
-         <hsizetype>1</hsizetype>
-         <vsizetype>0</vsizetype>
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="0" column="0" >
     <widget class="QTabWidget" name="TabWidget" >
      <property name="toolTip" >
@@ -135,126 +44,91 @@
       </attribute>
       <layout class="QGridLayout" >
        <property name="margin" >
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item row="3" column="1" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</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 row="2" column="0" colspan="2" >
-        <widget class="QGroupBox" name="rotateGB" >
+       <item row="1" column="0" >
+        <widget class="QGroupBox" name="GroupBox5" >
          <property name="title" >
-          <string>Rotation</string>
+          <string>LyX Display</string>
          </property>
-         <layout class="QHBoxLayout" >
+         <layout class="QGridLayout" >
           <property name="margin" >
-           <number>11</number>
+           <number>9</number>
           </property>
           <property name="spacing" >
            <number>6</number>
           </property>
-          <item>
-           <widget class="QLabel" name="angleL_2" >
-            <property name="toolTip" >
-             <string>Angle to rotate image by</string>
+          <item row="3" column="1" >
+           <widget class="QLabel" name="displayscaleL" >
+            <property name="enabled" >
+             <bool>true</bool>
             </property>
-            <property name="text" >
-             <string>A&amp;ngle:</string>
+            <property name="focusPolicy" >
+             <enum>Qt::NoFocus</enum>
             </property>
-            <property name="buddy" >
-             <cstring>angle</cstring>
+            <property name="text" >
+             <string>%</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLineEdit" name="angle" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>3</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
+          <item row="4" column="0" >
+           <widget class="QCheckBox" name="displayCB" >
             <property name="toolTip" >
-             <string>Angle to rotate image by</string>
+             <string>Display image in LyX</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Show in LyX</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="originL_2" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="TextLabel1" >
             <property name="toolTip" >
-             <string>The origin of the rotation</string>
+             <string>Screen display</string>
             </property>
             <property name="text" >
-             <string>Or&amp;igin:</string>
+             <string>&amp;Display:</string>
             </property>
             <property name="buddy" >
-             <cstring>origin</cstring>
+             <cstring>showCB</cstring>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QComboBox" name="origin" >
-            <property name="toolTip" >
-             <string>The origin of the rotation</string>
+          <item row="3" column="0" >
+           <widget class="QLineEdit" name="displayscale" >
+            <property name="enabled" >
+             <bool>true</bool>
             </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <widget class="QGroupBox" name="GroupBox5" >
-         <property name="title" >
-          <string>LyX Display</string>
-         </property>
-         <layout class="QVBoxLayout" >
-          <property name="margin" >
-           <number>11</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QCheckBox" name="displayCB" >
-            <property name="toolTip" >
-             <string>Display image in LyX</string>
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>5</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <property name="text" >
-             <string>&amp;Show in LyX</string>
+            <property name="toolTip" >
+             <string>Percentage to scale by in LyX</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="TextLabel1" >
+          <item row="2" column="0" >
+           <widget class="QLabel" name="scaleLA" >
             <property name="toolTip" >
-             <string>Screen display</string>
+             <string>Percentage to scale by in LyX</string>
             </property>
             <property name="text" >
-             <string>Display:</string>
+             <string>Sca&amp;le:</string>
             </property>
             <property name="buddy" >
-             <cstring>showCB</cstring>
+             <cstring>displayscale</cstring>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="1" column="0" >
            <widget class="QComboBox" name="showCB" >
             <property name="toolTip" >
              <string>Screen display</string>
@@ -281,60 +155,6 @@
             </item>
            </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="scaleLA" >
-            <property name="toolTip" >
-             <string>Percentage to scale by in LyX</string>
-            </property>
-            <property name="text" >
-             <string>Scale:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>displayscale</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <item>
-             <widget class="QLineEdit" name="displayscale" >
-              <property name="enabled" >
-               <bool>true</bool>
-              </property>
-              <property name="sizePolicy" >
-               <sizepolicy>
-                <hsizetype>5</hsizetype>
-                <vsizetype>0</vsizetype>
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="toolTip" >
-               <string>Percentage to scale by in LyX</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="displayscaleL" >
-              <property name="enabled" >
-               <bool>true</bool>
-              </property>
-              <property name="focusPolicy" >
-               <enum>Qt::NoFocus</enum>
-              </property>
-              <property name="text" >
-               <string>%</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
          </layout>
         </widget>
        </item>
@@ -343,15 +163,15 @@
          <property name="title" >
           <string>Output</string>
          </property>
-         <layout class="QVBoxLayout" >
+         <layout class="QGridLayout" >
           <property name="margin" >
-           <number>11</number>
+           <number>9</number>
           </property>
           <property name="spacing" >
            <number>6</number>
           </property>
-          <item>
-           <widget class="QLabel" name="sizewidthL_2" >
+          <item row="0" column="0" colspan="2" >
+           <widget class="QLabel" name="widthL" >
             <property name="enabled" >
              <bool>true</bool>
             </property>
@@ -363,31 +183,55 @@
             </property>
            </widget>
           </item>
-          <item>
-           <layout class="QVBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
+          <item row="1" column="0" >
+           <widget class="QLineEdit" name="Width" >
+            <property name="enabled" >
+             <bool>true</bool>
             </property>
-            <property name="spacing" >
-             <number>6</number>
+            <property name="toolTip" >
+             <string>Width of image in output</string>
             </property>
-            <item>
-             <widget class="QLineEdit" name="Width" >
-              <property name="enabled" >
-               <bool>true</bool>
-              </property>
-              <property name="toolTip" >
-               <string>Width of image in output</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="widthUnit" />
-            </item>
-           </layout>
+           </widget>
           </item>
-          <item>
-           <widget class="QLabel" name="sizeheightL_2" >
+          <item row="1" column="1" >
+           <widget class="QComboBox" name="widthUnit" />
+          </item>
+          <item row="3" column="1" >
+           <widget class="LengthCombo" name="heightUnit" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>3</hsizetype>
+              <vsizetype>5</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize" >
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="focusPolicy" >
+             <enum>Qt::StrongFocus</enum>
+            </property>
+            <property name="toolTip" >
+             <string>Units of height value</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QLineEdit" name="Height" >
+            <property name="enabled" >
+             <bool>true</bool>
+            </property>
+            <property name="toolTip" >
+             <string>Height of image in output</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2" >
+           <widget class="QLabel" name="heightL" >
             <property name="enabled" >
              <bool>true</bool>
             </property>
@@ -399,51 +243,7 @@
             </property>
            </widget>
           </item>
-          <item>
-           <layout class="QVBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <property name="spacing" >
-             <number>6</number>
-            </property>
-            <item>
-             <widget class="QLineEdit" name="Height" >
-              <property name="enabled" >
-               <bool>true</bool>
-              </property>
-              <property name="toolTip" >
-               <string>Height of image in output</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="LengthCombo" name="heightUnit" >
-              <property name="sizePolicy" >
-               <sizepolicy>
-                <hsizetype>3</hsizetype>
-                <vsizetype>5</vsizetype>
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize" >
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="focusPolicy" >
-               <enum>Qt::StrongFocus</enum>
-              </property>
-              <property name="toolTip" >
-               <string>Units of height value</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
+          <item row="4" column="0" colspan="2" >
            <widget class="QCheckBox" name="aspectratio" >
             <property name="enabled" >
              <bool>true</bool>
@@ -459,6 +259,69 @@
          </layout>
         </widget>
        </item>
+       <item row="2" column="0" colspan="2" >
+        <widget class="QGroupBox" name="rotateGB" >
+         <property name="title" >
+          <string>Rotation</string>
+         </property>
+         <layout class="QHBoxLayout" >
+          <property name="margin" >
+           <number>11</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="angleL" >
+            <property name="toolTip" >
+             <string>Angle to rotate image by</string>
+            </property>
+            <property name="text" >
+             <string>A&amp;ngle:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>angle</cstring>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <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>
+           <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>
+           <widget class="QComboBox" name="origin" >
+            <property name="toolTip" >
+             <string>The origin of the rotation</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item row="0" column="0" colspan="2" >
         <layout class="QGridLayout" >
          <property name="margin" >
@@ -536,58 +399,12 @@
       </attribute>
       <layout class="QGridLayout" >
        <property name="margin" >
-        <number>11</number>
+        <number>9</number>
        </property>
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item row="0" column="0" colspan="2" >
-        <layout class="QHBoxLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item>
-          <widget class="QCheckBox" name="clip" >
-           <property name="toolTip" >
-            <string>Clip to bounding box values</string>
-           </property>
-           <property name="text" >
-            <string>Clip to &amp;bounding box</string>
-           </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="getPB" >
-           <property name="toolTip" >
-            <string>Get bounding box from the (EPS) file</string>
-           </property>
-           <property name="text" >
-            <string>&amp;Get from File</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0" >
+       <item row="1" column="0" colspan="3" >
         <widget class="QFrame" name="Frame3" >
          <property name="enabled" >
           <bool>true</bool>
@@ -595,7 +412,7 @@
          <property name="sizePolicy" >
           <sizepolicy>
            <hsizetype>5</hsizetype>
-           <vsizetype>7</vsizetype>
+           <vsizetype>1</vsizetype>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -608,42 +425,12 @@
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
-           <number>11</number>
+           <number>9</number>
           </property>
           <property name="spacing" >
            <number>6</number>
           </property>
-          <item row="1" column="2" >
-           <widget class="QComboBox" name="lbXunit" />
-          </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="yL" >
-            <property name="text" >
-             <string>y</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="2" >
-           <widget class="QComboBox" name="lbYunit" />
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="xL" >
-            <property name="text" >
-             <string>x</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" >
-           <widget class="QLineEdit" name="lbY" />
-          </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="lbX" >
-            <property name="toolTip" >
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" colspan="2" >
+          <item row="0" column="0" >
            <widget class="QLabel" name="lbL" >
             <property name="text" >
              <string>&amp;Left bottom:</string>
@@ -653,23 +440,7 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="2" >
-           <widget class="QComboBox" name="rtYunit" />
-          </item>
-          <item row="4" column="2" >
-           <widget class="QComboBox" name="rtXunit" />
-          </item>
-          <item row="4" column="1" >
-           <widget class="QLineEdit" name="rtX" />
-          </item>
-          <item row="4" column="0" >
-           <widget class="QLabel" name="xL_2" >
-            <property name="text" >
-             <string>x</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" colspan="3" >
+          <item row="2" column="0" >
            <widget class="QLabel" name="rtL" >
             <property name="text" >
              <string>Right &amp;top:</string>
@@ -679,26 +450,125 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0" >
-           <widget class="QLabel" name="yL_2" >
-            <property name="text" >
-             <string>y</string>
+          <item row="1" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
             </property>
-           </widget>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="xL" >
+              <property name="text" >
+               <string>x</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="lbX" >
+              <property name="toolTip" >
+               <string/>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="lbXunit" />
+            </item>
+            <item>
+             <widget class="QLabel" name="yL" >
+              <property name="text" >
+               <string>y</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="lbY" />
+            </item>
+            <item>
+             <widget class="QComboBox" name="lbYunit" />
+            </item>
+           </layout>
           </item>
-          <item row="5" column="1" >
-           <widget class="QLineEdit" name="rtY" />
+          <item row="3" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="xL_2" >
+              <property name="text" >
+               <string>x</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="rtX" />
+            </item>
+            <item>
+             <widget class="QComboBox" name="rtXunit" />
+            </item>
+            <item>
+             <widget class="QLabel" name="yL_2" >
+              <property name="text" >
+               <string>y</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="rtY" />
+            </item>
+            <item>
+             <widget class="QComboBox" name="rtYunit" />
+            </item>
+           </layout>
           </item>
          </layout>
         </widget>
        </item>
-       <item row="2" column="0" >
+       <item row="0" column="0" >
+        <widget class="QCheckBox" name="clip" >
+         <property name="toolTip" >
+          <string>Clip to bounding box values</string>
+         </property>
+         <property name="text" >
+          <string>Clip to &amp;bounding box</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="2" >
+        <widget class="QPushButton" name="getPB" >
+         <property name="toolTip" >
+          <string>Get bounding box from the (EPS) file</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Get from File</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2" >
         <spacer>
          <property name="orientation" >
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>261</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="1" colspan="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType" >
-          <enum>QSizePolicy::MinimumExpanding</enum>
+          <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" >
           <size>
@@ -708,6 +578,19 @@
          </property>
         </spacer>
        </item>
+       <item row="3" column="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="ExtraOptions" >
@@ -821,6 +704,9 @@
        </item>
        <item row="1" column="0" >
         <widget class="QLabel" name="CaptionLA" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
          <property name="toolTip" >
           <string>The caption for the sub-figure</string>
          </property>
@@ -862,6 +748,97 @@
      </widget>
     </widget>
    </item>
+   <item row="1" 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>
+       <property name="default" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::MinimumExpanding</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>true</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyPB" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>&amp;Apply</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+       <property name="default" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closePB" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>1</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Close</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <pixmapfunction></pixmapfunction>
@@ -878,9 +855,10 @@
   <tabstop>TabWidget</tabstop>
   <tabstop>filename</tabstop>
   <tabstop>browsePB</tabstop>
-  <tabstop>displayCB</tabstop>
+  <tabstop>editPB</tabstop>
   <tabstop>showCB</tabstop>
   <tabstop>displayscale</tabstop>
+  <tabstop>displayCB</tabstop>
   <tabstop>Width</tabstop>
   <tabstop>widthUnit</tabstop>
   <tabstop>Height</tabstop>
@@ -909,5 +887,86 @@
   <tabstop>closePB</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>displayCB</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>TextLabel1</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>112</x>
+     <y>269</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>74</x>
+     <y>158</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>displayCB</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>scaleLA</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>125</x>
+     <y>269</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>91</x>
+     <y>212</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>subfigure</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>CaptionLA</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>56</x>
+     <y>56</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>44</x>
+     <y>62</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>subfigure</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>subcaption</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>69</x>
+     <y>54</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>110</x>
+     <y>62</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>displayCB</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>displayscaleL</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>53</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>235</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>