* reorganisation of graphics dialog

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

diff --git a/src/frontends/qt4/QGraphics.C b/src/frontends/qt4/QGraphics.C
index bd904c81cc2afb56b5b1f1a5396acb68628dd372..6dab88e6f2f1fe86b7e3353162e58314d02ad0ea 100644 (file)
--- a/src/frontends/qt4/QGraphics.C
+++ b/src/frontends/qt4/QGraphics.C
@@ -33,10 +33,10 @@
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QCheckBox>
+#include <QLabel>
 
 #include <cmath>
 
@@ -70,38 +70,20 @@ void QGraphics::build_dialog()
        bcview().setRestore(dialog_->restorePB);
        bcview().setCancel(dialog_->closePB);
 
-       bcview().addReadOnly(dialog_->rotateGB);
        bcview().addReadOnly(dialog_->latexoptions);
        bcview().addReadOnly(dialog_->subfigure);
-       bcview().addReadOnly(dialog_->subcaption);
        bcview().addReadOnly(dialog_->filenameL);
        bcview().addReadOnly(dialog_->filename);
        bcview().addReadOnly(dialog_->browsePB);
        bcview().addReadOnly(dialog_->unzipCB);
        bcview().addReadOnly(dialog_->filename);
-       bcview().addReadOnly(dialog_->lbX);
-       bcview().addReadOnly(dialog_->lbY);
-       bcview().addReadOnly(dialog_->rtX);
-       bcview().addReadOnly(dialog_->rtY);
-       bcview().addReadOnly(dialog_->lbXunit);
-       bcview().addReadOnly(dialog_->lbYunit);
-       bcview().addReadOnly(dialog_->rtXunit);
-       bcview().addReadOnly(dialog_->rtYunit);
+       bcview().addReadOnly(dialog_->bbFrame);
        bcview().addReadOnly(dialog_->draftCB);
        bcview().addReadOnly(dialog_->clip);
        bcview().addReadOnly(dialog_->unzipCB);
-       bcview().addReadOnly(dialog_->subfigure);
-       bcview().addReadOnly(dialog_->subcaption);
-       bcview().addReadOnly(dialog_->showCB);
-       bcview().addReadOnly(dialog_->Width);
-       bcview().addReadOnly(dialog_->Height);
-       bcview().addReadOnly(dialog_->displayCB);
-       bcview().addReadOnly(dialog_->displayscale);
-       bcview().addReadOnly(dialog_->widthUnit);
-       bcview().addReadOnly(dialog_->heightUnit);
-       bcview().addReadOnly(dialog_->aspectratio);
-       bcview().addReadOnly(dialog_->angle);
-       bcview().addReadOnly(dialog_->origin);
+       bcview().addReadOnly(dialog_->displayGB);
+       bcview().addReadOnly(dialog_->sizeGB);
+       bcview().addReadOnly(dialog_->rotationGB);
        bcview().addReadOnly(dialog_->latexoptions);
        bcview().addReadOnly(dialog_->getPB);
 
@@ -238,47 +220,25 @@ void QGraphics::update_contents()
        }
        dialog_->showCB->setCurrentIndex(item);
        dialog_->showCB->setEnabled(igp.display != graphics::NoDisplay && !readOnly());
-       dialog_->displayCB->setChecked(igp.display != graphics::NoDisplay);
+       dialog_->displayGB->setChecked(igp.display != graphics::NoDisplay);
        dialog_->displayscale->setEnabled(igp.display != graphics::NoDisplay && !readOnly());
-       dialog_->displayscaleL->setEnabled(igp.display != graphics::NoDisplay && !readOnly());
        dialog_->displayscale->setText(toqstr(convert<string>(igp.lyxscale)));
 
-       //// the output section (width/height)
-       // set the length combo boxes
-       // only the width has the possibility for scale%. The original
-       // units are defined in lengthcommon.C
-       // 1. the width (a listttype)
-       dialog_->widthUnit->clear();
-       dialog_->widthUnit->addItem(qt_("Scale%"));
-       for (int i = 0; i < num_units; i++)
-               dialog_->widthUnit->addItem(unit_name_gui[i]);
-
-       if (!igp.scale.empty()
-           && !float_equal(convert<double>(igp.scale), 0.0, 0.05)
-           || igp.width.empty()) {
-               dialog_->Width->setText(toqstr(igp.scale));
-               dialog_->widthUnit->setCurrentIndex(0);
-       } else {
-               // no scale means default width/height
-               dialog_->Width->setText(toqstr(convert<string>(igp.width.value())));
-               // the width cannot have a unitDefault, because
-               // it is a "Scale%" or another user defined unit!
-               // +1 instead of the "Scale%" option
-               int unit_ = igp.width.unit();
-               dialog_->widthUnit->setCurrentIndex(unit_ + 1);
-       }
-       // 2. the height (a lengthgcombo type)
+       // the output section (width/height)
+       dialog_->Scale->setText(toqstr(igp.scale));
+
+       lengthToWidgets(dialog_->Width, dialog_->widthUnit,
+               igp.width.asString(), unitDefault);
+
        lengthToWidgets(dialog_->Height, dialog_->heightUnit,
                igp.height.asString(), unitDefault);
 
-       // enable height input in case of non "Scale%" as width-unit
-       bool use_height = (dialog_->widthUnit->currentIndex() > 0);
-       dialog_->heightL->setEnabled(use_height);
-       dialog_->Height->setEnabled(use_height);
-       dialog_->heightUnit->setEnabled(use_height);
-
        dialog_->aspectratio->setChecked(igp.keepAspectRatio);
 
+       dialog_->scaleCB->setChecked(!igp.scale.empty() || igp.width.empty());
+
+       dialog_->Scale->setEnabled(!igp.scale.empty() || igp.width.empty());
+
        dialog_->angle->setText(toqstr(igp.rotateAngle));
 
        dialog_->origin->clear();
@@ -358,23 +318,19 @@ void QGraphics::apply()
                default:;
        }
 
-       if (!dialog_->displayCB->isChecked())
+       if (!dialog_->displayGB->isChecked())
                igp.display = graphics::NoDisplay;
 
-       string value = fromqstr(dialog_->Width->text());
-       if (dialog_->widthUnit->currentIndex() > 0 || isValidLength(value)) {
-               // width/height combination
-               igp.width =
-                       widgetsToLength(dialog_->Width, dialog_->widthUnit);
-               igp.scale = string();
+       if (dialog_->scaleCB->isChecked()
+               && !dialog_->Scale->text().isEmpty()) {
+               igp.scale = fromqstr(dialog_->Scale->text());
        } else {
-               // scaling instead of a width
-               igp.scale = value;
-               igp.width = LyXLength();
+               igp.scale = string();
        }
-       value = fromqstr(dialog_->Height->text());
-       igp.height =
-               LyXLength(widgetsToLength(dialog_->Height, dialog_->heightUnit));
+
+       igp.width = LyXLength(widgetsToLength(dialog_->Width, dialog_->widthUnit));
+
+       igp.height = LyXLength(widgetsToLength(dialog_->Height, dialog_->heightUnit));
 
        igp.keepAspectRatio = dialog_->aspectratio->isChecked();
 

diff --git a/src/frontends/qt4/QGraphicsDialog.C b/src/frontends/qt4/QGraphicsDialog.C
index ce6641d3fd3444662b941405b55aa079ba2a2556..2b79726e092796ea4761fcb134a48b455855aa77 100644 (file)
--- a/src/frontends/qt4/QGraphicsDialog.C
+++ b/src/frontends/qt4/QGraphicsDialog.C
@@ -14,8 +14,6 @@
 
 #include "QGraphicsDialog.h"
 #include "QGraphics.h"
-//Added by qt3to4:
-#include <QCloseEvent>
 
 #include "lengthcombo.h"
 #include "validators.h"
@@ -25,9 +23,10 @@
 
 #include "controllers/ControlGraphics.h"
 
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qvalidator.h>
+#include <QCloseEvent>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QValidator>
 
 
 using std::string;
@@ -48,41 +47,62 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form)
                form, SLOT(slotClose()));
        connect(restorePB, SIGNAL(clicked()),
                form, SLOT(slotRestore()));
-       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( 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() ) );
+       connect(filename, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_adaptor() ) );
+       connect(subcaption, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_adaptor() ) );
+       connect(subfigure, SIGNAL( toggled(bool) ),
+               this, SLOT( change_adaptor() ) );
+       connect(latexoptions, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_adaptor() ) );
+       connect(clip, SIGNAL( stateChanged(int) ),
+               this, SLOT( change_adaptor() ) );
+       connect(showCB, SIGNAL( currentIndexChanged(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(aspectratio, 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(Height, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_adaptor() ) );
+       connect(heightUnit, SIGNAL( selectionChanged(lyx::LyXLength::UNIT) ),
+               this, SLOT( change_adaptor() ) );
+       connect(widthUnit, SIGNAL( selectionChanged(lyx::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( change_adaptor() ) );
+       connect(scaleCB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()) );
+       connect(Scale, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_adaptor() ) );
+
+       connect(lbY, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_bb() ) );
+       connect(lbYunit, SIGNAL( activated(int) ),
+               this, SLOT( change_bb() ) );
+       connect(rtY, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_bb() ) );
+       connect(rtYunit, SIGNAL( activated(int) ),
+               this, SLOT( change_bb() ) );
+
+       connect(lbX, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_bb() ) );
+       connect(lbXunit, SIGNAL( activated(int) ),
+               this, SLOT( change_bb() ) );
+       connect(rtX, SIGNAL( textChanged(const QString&) ),
+               this, SLOT( change_bb() ) );
+       connect(rtXunit, SIGNAL( activated(int) ),
+               this, SLOT( change_bb() ) );
 
        angle->setValidator(new QDoubleValidator(-360, 360, 2, angle));
 
@@ -121,16 +141,6 @@ void QGraphicsDialog::change_bb()
 }
 
 
-void QGraphicsDialog::change_WUnit()
-{
-       bool useHeight = (widthUnit->currentIndex() > 0);
-       Height->setEnabled(useHeight);
-       heightUnit->setEnabled(useHeight);
-       heightL->setEnabled(useHeight);
-       form_->changed();
-}
-
-
 void QGraphicsDialog::closeEvent(QCloseEvent * e)
 {
        form_->slotWMHide();
@@ -138,7 +148,7 @@ void QGraphicsDialog::closeEvent(QCloseEvent * e)
 }
 
 
-void QGraphicsDialog::browse_clicked()
+void QGraphicsDialog::on_browsePB_clicked()
 {
        docstring const str =
                form_->controller().browse(qstring_to_ucs4(filename->text()));
@@ -147,22 +157,37 @@ void QGraphicsDialog::browse_clicked()
 }
 
 
-void QGraphicsDialog::getBB_clicked()
+void QGraphicsDialog::on_getPB_clicked()
 {
        form_->getBB();
 }
 
 
-void QGraphicsDialog::edit_clicked()
+void QGraphicsDialog::on_editPB_clicked()
 {
        form_->controller().editGraphics();
 }
 
-void QGraphicsDialog::filenameChanged(const QString & filename)
+
+void QGraphicsDialog::on_filename_textChanged(const QString & filename)
 {
        editPB->setDisabled(filename.isEmpty());
 }
 
+
+void QGraphicsDialog::on_scaleCB_toggled(bool setscale)
+{
+       Scale->setEnabled(setscale);
+       widthL->setDisabled(setscale);
+       Width->setDisabled(setscale);
+       widthUnit->setDisabled(setscale);
+       aspectratio->setDisabled(setscale);
+       bool noheight = setscale || aspectratio->checkState()==Qt::Checked;
+       heightL->setDisabled(noheight);
+       Height->setDisabled(noheight);
+       heightUnit->setDisabled(noheight);
+}
+
 } // namespace frontend
 } // namespace lyx
 

diff --git a/src/frontends/qt4/QGraphicsDialog.h b/src/frontends/qt4/QGraphicsDialog.h
index be98f8b5fda9ef7fe35e08c7a36d8ae0a10bb569..396e99d0afb87042e8b8868e581f295016522557 100644 (file)
--- a/src/frontends/qt4/QGraphicsDialog.h
+++ b/src/frontends/qt4/QGraphicsDialog.h
@@ -33,11 +33,11 @@ public:
 protected Q_SLOTS:
        virtual void change_adaptor();
        virtual void change_bb();
-       virtual void change_WUnit();
-       virtual void browse_clicked();
-       virtual void getBB_clicked();
-       virtual void edit_clicked();
-       virtual void filenameChanged(const QString &);
+       virtual void on_browsePB_clicked();
+       virtual void on_getPB_clicked();
+       virtual void on_editPB_clicked();
+       virtual void on_filename_textChanged(const QString &);
+       virtual void on_scaleCB_toggled(bool);
 protected:
        virtual void closeEvent(QCloseEvent * e);
 private:

diff --git a/src/frontends/qt4/ui/QGraphicsUi.ui b/src/frontends/qt4/ui/QGraphicsUi.ui
index 0cadf3ef744c0919ce57c477104485a7ad4a9bd4..81ffd0a64ffdd228fc433a6f53ac89b3a1432c74 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>412</width>
-    <height>411</height>
+    <width>432</width>
+    <height>332</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -38,6 +38,9 @@
      <property name="toolTip" >
       <string/>
      </property>
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
      <widget class="QWidget" name="Graphics" >
       <attribute name="title" >
        <string>&amp;Graphics</string>
@@ -49,10 +52,56 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item row="1" column="0" >
-        <widget class="QGroupBox" name="GroupBox5" >
+       <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="0" column="2" >
+        <widget class="QPushButton" name="browsePB" >
+         <property name="toolTip" >
+          <string>Select an image file</string>
+         </property>
+         <property name="text" >
+          <string>&amp;Browse...</string>
+         </property>
+        </widget>
+       </item>
+       <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="1" column="1" colspan="3" >
+        <widget class="QGroupBox" name="sizeGB" >
          <property name="title" >
-          <string>LyX Display</string>
+          <string>Output Size</string>
+         </property>
+         <property name="flat" >
+          <bool>true</bool>
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
@@ -61,189 +110,98 @@
           <property name="spacing" >
            <number>6</number>
           </property>
-          <item row="3" column="1" >
-           <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 row="1" column="2" >
+           <widget class="LengthCombo" name="widthUnit" />
           </item>
-          <item row="4" column="0" >
-           <widget class="QCheckBox" name="displayCB" >
-            <property name="toolTip" >
-             <string>Display image in LyX</string>
-            </property>
-            <property name="text" >
-             <string>&amp;Show in LyX</string>
-            </property>
-           </widget>
+          <item row="2" column="2" >
+           <widget class="LengthCombo" name="heightUnit" />
           </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="TextLabel1" >
-            <property name="toolTip" >
-             <string>Screen display</string>
-            </property>
-            <property name="text" >
-             <string>&amp;Display:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>showCB</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" >
-           <widget class="QLineEdit" name="displayscale" >
+          <item row="1" column="1" >
+           <widget class="QLineEdit" name="Width" >
             <property name="enabled" >
              <bool>true</bool>
             </property>
             <property name="sizePolicy" >
              <sizepolicy>
-              <hsizetype>5</hsizetype>
+              <hsizetype>1</hsizetype>
               <vsizetype>0</vsizetype>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="toolTip" >
-             <string>Percentage to scale by in LyX</string>
+             <string>Width of image in output</string>
             </property>
            </widget>
           </item>
-          <item row="2" 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:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>displayscale</cstring>
+          <item row="0" column="2" >
+           <spacer>
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
             </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QComboBox" name="showCB" >
-            <property name="toolTip" >
-             <string>Screen display</string>
+            <property name="sizeHint" >
+             <size>
+              <width>61</width>
+              <height>20</height>
+             </size>
             </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>
+           </spacer>
           </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="1" >
-        <widget class="QGroupBox" name="GroupBox11" >
-         <property name="title" >
-          <string>Output</string>
-         </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item row="0" column="0" colspan="2" >
-           <widget class="QLabel" name="widthL" >
-            <property name="enabled" >
-             <bool>true</bool>
-            </property>
-            <property name="text" >
-             <string>&amp;Width:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>Width</cstring>
-            </property>
-           </widget>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="Scale" />
           </item>
-          <item row="1" column="0" >
-           <widget class="QLineEdit" name="Width" >
+          <item row="2" column="1" >
+           <widget class="QLineEdit" name="Height" >
             <property name="enabled" >
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
-             <string>Width of image in output</string>
-            </property>
-           </widget>
-          </item>
-          <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>
+              <hsizetype>1</hsizetype>
+              <vsizetype>0</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>
+             <string>Height of image in output</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" >
-           <widget class="QLineEdit" name="Height" >
+          <item row="2" column="0" >
+           <widget class="QLabel" name="heightL" >
             <property name="enabled" >
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
-             <string>Height of image in output</string>
+            <property name="text" >
+             <string>&amp;Height:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>Height</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2" >
-           <widget class="QLabel" name="heightL" >
+          <item row="0" column="0" >
+           <widget class="QCheckBox" name="scaleCB" >
+            <property name="text" >
+             <string>&amp;Scale Graphics (%):</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="widthL" >
             <property name="enabled" >
              <bool>true</bool>
             </property>
             <property name="text" >
-             <string>&amp;Height:</string>
+             <string>&amp;Width:</string>
             </property>
             <property name="buddy" >
-             <cstring>Height</cstring>
+             <cstring>Width</cstring>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" colspan="2" >
+          <item row="3" column="1" colspan="2" >
            <widget class="QCheckBox" name="aspectratio" >
             <property name="enabled" >
              <bool>true</bool>
@@ -259,32 +217,35 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2" >
-        <widget class="QGroupBox" name="rotateGB" >
+       <item row="2" column="1" colspan="3" >
+        <widget class="QGroupBox" name="rotationGB" >
          <property name="title" >
-          <string>Rotation</string>
+          <string>Rotate Graphics</string>
          </property>
-         <layout class="QHBoxLayout" >
+         <property name="flat" >
+          <bool>true</bool>
+         </property>
+         <layout class="QGridLayout" >
           <property name="margin" >
-           <number>11</number>
+           <number>9</number>
           </property>
           <property name="spacing" >
            <number>6</number>
           </property>
-          <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:</string>
+             <string>A&amp;ngle (Degrees):</string>
             </property>
             <property name="buddy" >
              <cstring>angle</cstring>
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="1" >
            <widget class="QLineEdit" name="angle" >
             <property name="sizePolicy" >
              <sizepolicy>
@@ -299,7 +260,7 @@
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="2" >
            <widget class="QLabel" name="originL" >
             <property name="toolTip" >
              <string>The origin of the rotation</string>
@@ -312,7 +273,7 @@
             </property>
            </widget>
           </item>
-          <item>
+          <item row="0" column="3" >
            <widget class="QComboBox" name="origin" >
             <property name="toolTip" >
              <string>The origin of the rotation</string>
@@ -322,75 +283,6 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="0" colspan="2" >
-        <layout class="QGridLayout" >
-         <property name="margin" >
-          <number>0</number>
-         </property>
-         <property name="spacing" >
-          <number>6</number>
-         </property>
-         <item row="1" column="1" >
-          <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 row="1" column="2" >
-          <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="1" >
-          <widget class="QLineEdit" name="filename" >
-           <property name="toolTip" >
-            <string>File name of image</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2" >
-          <widget class="QPushButton" name="browsePB" >
-           <property name="toolTip" >
-            <string>Select an image file</string>
-           </property>
-           <property name="text" >
-            <string>&amp;Browse...</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>
-        </layout>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Clipping" >
@@ -404,8 +296,31 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item row="1" column="0" colspan="3" >
-        <widget class="QFrame" name="Frame3" >
+       <item row="3" column="0" colspan="2" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="0" colspan="2" >
+        <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="1" column="0" colspan="2" >
+        <widget class="QFrame" name="bbFrame" >
          <property name="enabled" >
           <bool>true</bool>
          </property>
@@ -430,7 +345,7 @@
           <property name="spacing" >
            <number>6</number>
           </property>
-          <item row="0" column="0" >
+          <item row="0" column="0" colspan="6" >
            <widget class="QLabel" name="lbL" >
             <property name="text" >
              <string>&amp;Left bottom:</string>
@@ -440,7 +355,35 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
+          <item row="3" column="1" >
+           <widget class="QLineEdit" name="rtX" />
+          </item>
+          <item row="3" column="4" >
+           <widget class="QLineEdit" name="rtY" />
+          </item>
+          <item row="1" column="4" >
+           <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="1" column="2" >
+           <widget class="QComboBox" name="lbXunit" />
+          </item>
+          <item row="3" column="2" >
+           <widget class="QComboBox" name="rtXunit" />
+          </item>
+          <item row="3" column="5" >
+           <widget class="QComboBox" name="rtYunit" />
+          </item>
+          <item row="1" column="5" >
+           <widget class="QComboBox" name="lbYunit" />
+          </item>
+          <item row="2" column="0" colspan="6" >
            <widget class="QLabel" name="rtL" >
             <property name="text" >
              <string>Right &amp;top:</string>
@@ -450,146 +393,59 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
+          <item row="3" column="3" >
+           <widget class="QLabel" name="yL_2" >
+            <property name="text" >
+             <string>y:</string>
             </property>
-            <property name="spacing" >
-             <number>6</number>
+           </widget>
+          </item>
+          <item row="1" column="3" >
+           <widget class="QLabel" name="yL" >
+            <property name="text" >
+             <string>y:</string>
             </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>
+           </widget>
           </item>
           <item row="3" column="0" >
-           <layout class="QHBoxLayout" >
-            <property name="margin" >
-             <number>0</number>
-            </property>
-            <property name="spacing" >
-             <number>6</number>
+           <widget class="QLabel" name="xL_2" >
+            <property name="text" >
+             <string>x:</string>
             </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="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::Horizontal</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>261</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="xL" >
+            <property name="text" >
+             <string>x:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
        </item>
-       <item row="0" column="1" colspan="2" >
+       <item row="2" column="0" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
          </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
+           <width>181</width>
            <height>20</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="3" column="2" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
+       <item row="2" column="1" >
+        <widget class="QPushButton" name="getPB" >
+         <property name="toolTip" >
+          <string>Get bounding box from the (EPS) file</string>
          </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+         <property name="text" >
+          <string>&amp;Get from File</string>
          </property>
-        </spacer>
+        </widget>
        </item>
       </layout>
      </widget>
@@ -599,32 +455,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" >
-        <widget class="QCheckBox" name="subfigure" >
-         <property name="toolTip" >
-          <string>Is this just one part of a figure float ?</string>
-         </property>
-         <property name="text" >
-          <string>Su&amp;bfigure</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="0" colspan="2" >
-        <widget class="QCheckBox" name="unzipCB" >
-         <property name="toolTip" >
-          <string>Don't uncompress image before exporting to LaTeX</string>
-         </property>
-         <property name="text" >
-          <string>Don't un&amp;zip on export</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="latexoptionsLA" >
          <property name="toolTip" >
           <string>Additional LaTeX options</string>
@@ -637,112 +473,184 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1" >
+       <item row="0" column="1" >
         <widget class="QLineEdit" name="latexoptions" >
+         <property name="sizePolicy" >
+          <sizepolicy>
+           <hsizetype>3</hsizetype>
+           <vsizetype>0</vsizetype>
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="toolTip" >
           <string>Additional LaTeX options</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="2" >
-        <widget class="QCheckBox" name="draftCB" >
+       <item row="2" column="0" colspan="2" >
+        <widget class="QCheckBox" name="unzipCB" >
          <property name="toolTip" >
-          <string>Draft mode</string>
+          <string>Don't uncompress image before exporting to LaTeX</string>
          </property>
          <property name="text" >
-          <string>&amp;Draft mode</string>
+          <string>Don't un&amp;zip on export</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2" >
-        <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 row="6" column="0" colspan="2" >
-        <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 row="2" column="0" colspan="2" >
-        <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 row="1" column="0" >
-        <widget class="QLabel" name="CaptionLA" >
-         <property name="enabled" >
-          <bool>false</bool>
-         </property>
+       <item row="1" column="0" colspan="2" >
+        <widget class="QCheckBox" name="draftCB" >
          <property name="toolTip" >
-          <string>The caption for the sub-figure</string>
+          <string>Draft mode</string>
          </property>
          <property name="text" >
-          <string>Ca&amp;ption:</string>
-         </property>
-         <property name="buddy" >
-          <cstring>subcaption</cstring>
+          <string>&amp;Draft mode</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" >
-        <widget class="QLineEdit" name="subcaption" >
-         <property name="enabled" >
-          <bool>false</bool>
+       <item row="3" column="0" colspan="2" >
+        <widget class="QGroupBox" name="subfigure" >
+         <property name="title" >
+          <string>Subfigure</string>
          </property>
-         <property name="toolTip" >
-          <string>The caption for the sub-figure</string>
+         <property name="flat" >
+          <bool>true</bool>
+         </property>
+         <property name="checkable" >
+          <bool>true</bool>
          </property>
+         <property name="checked" >
+          <bool>false</bool>
+         </property>
+         <layout class="QHBoxLayout" >
+          <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>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="subcaption" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>3</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip" >
+             <string>The caption for the sub-figure</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </widget>
        </item>
-       <item row="8" column="1" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
+       <item row="4" column="0" colspan="2" >
+        <widget class="QGroupBox" name="displayGB" >
+         <property name="title" >
+          <string>Show in LyX</string>
          </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
+         <property name="flat" >
+          <bool>true</bool>
          </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>20</height>
-          </size>
+         <property name="checkable" >
+          <bool>true</bool>
          </property>
-        </spacer>
+         <layout class="QHBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="showL" >
+            <property name="toolTip" >
+             <string>Screen display</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Display:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>showCB</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" >
+            <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>
+           <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>
+            <property name="toolTip" >
+             <string>Percentage to scale by in LyX</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
        </item>
       </layout>
      </widget>
@@ -845,7 +753,7 @@
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
-   <extends></extends>
+   <extends>QComboBox</extends>
    <header>lengthcombo.h</header>
    <container>0</container>
    <pixmap></pixmap>
@@ -856,18 +764,15 @@
   <tabstop>filename</tabstop>
   <tabstop>browsePB</tabstop>
   <tabstop>editPB</tabstop>
-  <tabstop>showCB</tabstop>
-  <tabstop>displayscale</tabstop>
-  <tabstop>displayCB</tabstop>
+  <tabstop>scaleCB</tabstop>
+  <tabstop>Scale</tabstop>
   <tabstop>Width</tabstop>
-  <tabstop>widthUnit</tabstop>
   <tabstop>Height</tabstop>
   <tabstop>heightUnit</tabstop>
   <tabstop>aspectratio</tabstop>
   <tabstop>angle</tabstop>
   <tabstop>origin</tabstop>
   <tabstop>clip</tabstop>
-  <tabstop>getPB</tabstop>
   <tabstop>lbX</tabstop>
   <tabstop>lbXunit</tabstop>
   <tabstop>lbY</tabstop>
@@ -876,11 +781,11 @@
   <tabstop>rtXunit</tabstop>
   <tabstop>rtY</tabstop>
   <tabstop>rtYunit</tabstop>
-  <tabstop>subfigure</tabstop>
-  <tabstop>subcaption</tabstop>
+  <tabstop>getPB</tabstop>
   <tabstop>latexoptions</tabstop>
   <tabstop>draftCB</tabstop>
   <tabstop>unzipCB</tabstop>
+  <tabstop>subcaption</tabstop>
   <tabstop>restorePB</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>applyPB</tabstop>
@@ -889,82 +794,50 @@
  <resources/>
  <connections>
   <connection>
-   <sender>displayCB</sender>
+   <sender>aspectratio</sender>
    <signal>toggled(bool)</signal>
-   <receiver>TextLabel1</receiver>
-   <slot>setEnabled(bool)</slot>
+   <receiver>heightL</receiver>
+   <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>112</x>
-     <y>269</y>
+     <x>201</x>
+     <y>193</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>74</x>
+     <x>81</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>
+   <sender>aspectratio</sender>
    <signal>toggled(bool)</signal>
-   <receiver>subcaption</receiver>
-   <slot>setEnabled(bool)</slot>
+   <receiver>Height</receiver>
+   <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>69</x>
-     <y>54</y>
+     <x>315</x>
+     <y>193</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>110</x>
-     <y>62</y>
+     <x>275</x>
+     <y>169</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>displayCB</sender>
+   <sender>aspectratio</sender>
    <signal>toggled(bool)</signal>
-   <receiver>displayscaleL</receiver>
-   <slot>setEnabled(bool)</slot>
+   <receiver>heightUnit</receiver>
+   <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>53</x>
-     <y>260</y>
+     <x>337</x>
+     <y>193</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>157</x>
-     <y>235</y>
+     <x>337</x>
+     <y>167</y>
     </hint>
    </hints>
   </connection>