]> git.lyx.org Git - features.git/commitdiff
projects / features.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e91aba8)
Some Qt graphics dialog improvements. Yet more work needed :/
authorJohn Levon <levon@movementarian.org>
Sun, 25 Aug 2002 04:06:06 +0000 (04:06 +0000)
committerJohn Levon <levon@movementarian.org>
Sun, 25 Aug 2002 04:06:06 +0000 (04:06 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5097 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt2/ChangeLog patch | blob | history
src/frontends/qt2/QGraphics.C patch | blob | history
src/frontends/qt2/ui/QGraphicsDialog.ui patch | blob | history

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 134ea18cdaf2fefd9572354574e718e5b525cd13..5aa9d9531db86bada5dd42eb14426c7fb675284b 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-25  John Levon  <levon@movementarian.org>
+
+       * QGraphics.C:
+       * ui/QGraphicsDialog.ui: update, and some UI improvements
+ 
 2002-08-23  Rob Lahaye  <lahaye@snu.ac.kr>
 
        * lengthcombo.C: apply changes to "enum UNIT" in src/lyxlength.h
diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index 99d0263424ddca3950c073ce47412b575e5767da..395bb3bd22751330d9c6900f4de69dc3544a3602 100644 (file)
--- a/src/frontends/qt2/QGraphics.C
+++ b/src/frontends/qt2/QGraphics.C
@@ -56,17 +56,43 @@ void QGraphics::build_dialog()
        bc().setRestore(dialog_->restorePB);
        bc().setCancel(dialog_->closePB);
 
-       // FIXME: and the rest ?
        bc().addReadOnly(dialog_->rotateGB);
-       bc().addReadOnly(dialog_->latexoptionsGB);
-       bc().addReadOnly(dialog_->bbGB);
+       bc().addReadOnly(dialog_->latexoptions);
        bc().addReadOnly(dialog_->subfigure);
        bc().addReadOnly(dialog_->subcaption);
        bc().addReadOnly(dialog_->filenameL);
        bc().addReadOnly(dialog_->filename);
        bc().addReadOnly(dialog_->browsePB);
+       bc().addReadOnly(dialog_->unzipCB);
+       bc().addReadOnly(dialog_->filename);
+       bc().addReadOnly(dialog_->lbX);
+       bc().addReadOnly(dialog_->lbY);
+       bc().addReadOnly(dialog_->rtX);
+       bc().addReadOnly(dialog_->rtY);
+       bc().addReadOnly(dialog_->lbXunit);
+       bc().addReadOnly(dialog_->lbYunit);
+       bc().addReadOnly(dialog_->rtXunit);
+       bc().addReadOnly(dialog_->rtYunit);
+       bc().addReadOnly(dialog_->draftCB);
+       bc().addReadOnly(dialog_->clip);
+       bc().addReadOnly(dialog_->unzipCB);
+       bc().addReadOnly(dialog_->subfigure);
+       bc().addReadOnly(dialog_->subcaption);
+       bc().addReadOnly(dialog_->showCB);
+       bc().addReadOnly(dialog_->width);
+       bc().addReadOnly(dialog_->height);
+       bc().addReadOnly(dialog_->displayCB);
+       bc().addReadOnly(dialog_->displayscale);
+       bc().addReadOnly(dialog_->widthUnit);
+       bc().addReadOnly(dialog_->heightUnit);
+       bc().addReadOnly(dialog_->aspectratio);
+       bc().addReadOnly(dialog_->angle);
+       bc().addReadOnly(dialog_->origin);
+       bc().addReadOnly(dialog_->latexoptions);
+       bc().addReadOnly(dialog_->getPB);
 }
 
+
 void QGraphics::update_contents()
 {
        InsetGraphicsParams & igp = controller().params();
@@ -85,10 +111,7 @@ void QGraphics::update_contents()
                case BufferParams::PAPER_A5PAPER:
                case BufferParams::PAPER_B5PAPER: unit = "cm"; break;
        }
-       // ?? defaultUnit is not used !!
-       string const defaultUnit = string(unit);
 
-       // Update dialog with details from inset
        dialog_->filename->setText(igp.filename.c_str());
 
        // set the bounding box values, if exists. First we need the whole
@@ -115,8 +138,9 @@ void QGraphics::update_contents()
        }
 
        // Update the draft and clip mode
-       dialog_->draft->setChecked(igp.draft);
+       dialog_->draftCB->setChecked(igp.draft);
        dialog_->clip->setChecked(igp.clip);
+       dialog_->unzipCB->setChecked(igp.noUnzip);
 
        // Update the subcaption check button and input field
        dialog_->subfigure->setChecked(igp.subcaption);
@@ -128,10 +152,12 @@ void QGraphics::update_contents()
                case grfx::MonochromeDisplay: item = 1; break;
                case grfx::GrayscaleDisplay: item = 2; break;
                case grfx::ColorDisplay: item = 3; break;
-               case grfx::NoDisplay: item = 4; break;
+               case grfx::NoDisplay: item = 0; break;
        }
-       dialog_->show->setCurrentItem(item);
-
+       dialog_->showCB->setCurrentItem(item);
+       dialog_->showCB->setEnabled(igp.display != grfx::NoDisplay && !readOnly());
+       dialog_->displayCB->setChecked(igp.display != grfx::NoDisplay);
+       dialog_->displayscale->setEnabled(igp.display != grfx::NoDisplay && !readOnly());
        dialog_->displayscale->setText(tostr(igp.lyxscale).c_str());
 
        dialog_->widthUnit->setCurrentItem(igp.width.unit());
@@ -187,32 +213,38 @@ void QGraphics::apply()
                igp.bb = bb;
        }
 
-       igp.draft = dialog_->draft->isChecked();
+       igp.draft = dialog_->draftCB->isChecked();
        igp.clip = dialog_->clip->isChecked();
        igp.subcaption = dialog_->subfigure->isChecked();
        igp.subcaptionText = dialog_->subcaption->text();
 
-       switch (dialog_->show->currentItem()) {
+       switch (dialog_->showCB->currentItem()) {
                case 0: igp.display = grfx::DefaultDisplay; break;
                case 1: igp.display = grfx::MonochromeDisplay; break;
                case 2: igp.display = grfx::GrayscaleDisplay; break;
                case 3: igp.display = grfx::ColorDisplay; break;
-               case 4: igp.display = grfx::NoDisplay; break;
                default:;
        }
 
+       if (!dialog_->displayCB->isChecked())
+               igp.display = grfx::NoDisplay;
+ 
        string value(dialog_->width->text());
        igp.width = LyXLength(strToDbl(value), dialog_->widthUnit->currentLengthItem());
        value = string(dialog_->height->text());
        igp.height = LyXLength(strToDbl(value), dialog_->heightUnit->currentLengthItem());
 
        igp.keepAspectRatio = dialog_->aspectratio->isChecked();
+
+       igp.noUnzip = dialog_->unzipCB->isChecked();
  
        igp.lyxscale = strToInt(string(dialog_->displayscale->text()));
 
        igp.rotateAngle = strToDbl(string(dialog_->angle->text()));
-       while (igp.rotateAngle < -360.0) igp.rotateAngle += 360.0;
-       while (igp.rotateAngle >  360.0) igp.rotateAngle -= 360.0;
+       while (igp.rotateAngle < -360.0)
+               igp.rotateAngle += 360.0;
+       while (igp.rotateAngle >  360.0)
+               igp.rotateAngle -= 360.0;
 
        if ((dialog_->origin->currentItem()) > 0)
                igp.rotateOrigin = dialog_->origin->currentText();
diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialog.ui
index af9ded4434a194f44fd1300433d22348ea6ebca8..b07d03d285d10da14198a29758148e6246900bb5 100644 (file)
--- a/src/frontends/qt2/ui/QGraphicsDialog.ui
+++ b/src/frontends/qt2/ui/QGraphicsDialog.ui
@@ -14,7 +14,7 @@
             <x>0</x>
             <y>0</y>
             <width>332</width>
-            <height>405</height>
+            <height>470</height>
         </rect>
     </property>
     <property stdset="1">
@@ -52,7 +52,7 @@
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>F&amp;ile</string>
+                    <string>&amp;Graphics</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
@@ -92,6 +92,10 @@
                                     <name>buddy</name>
                                     <cstring>filename</cstring>
                                 </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>File name of image</string>
+                                </property>
                             </widget>
                             <widget>
                                 <class>QLineEdit</class>
@@ -121,128 +125,17 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget>
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout24</cstring>
-                        </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>displayshowL</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Dis&amp;play :</string>
-                                </property>
-                                <property>
-                                    <name>buddy</name>
-                                    <cstring>show</cstring>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QLayoutWidget</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Layout5</cstring>
-                                </property>
-                                <hbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <widget>
-                                        <class>QComboBox</class>
-                                        <item>
-                                            <property>
-                                                <name>text</name>
-                                                <string>Default</string>
-                                            </property>
-                                        </item>
-                                        <item>
-                                            <property>
-                                                <name>text</name>
-                                                <string>Monochrome</string>
-                                            </property>
-                                        </item>
-                                        <item>
-                                            <property>
-                                                <name>text</name>
-                                                <string>Grayscale</string>
-                                            </property>
-                                        </item>
-                                        <item>
-                                            <property>
-                                                <name>text</name>
-                                                <string>Color</string>
-                                            </property>
-                                        </item>
-                                        <item>
-                                            <property>
-                                                <name>text</name>
-                                                <string>Do not display</string>
-                                            </property>
-                                        </item>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>show</cstring>
-                                        </property>
-                                        <property>
-                                            <name>toolTip</name>
-                                            <string>Screen display</string>
-                                        </property>
-                                    </widget>
-                                    <spacer>
-                                        <property>
-                                            <name>name</name>
-                                            <cstring>Spacer23</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>orientation</name>
-                                            <enum>Horizontal</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizeType</name>
-                                            <enum>Expanding</enum>
-                                        </property>
-                                        <property>
-                                            <name>sizeHint</name>
-                                            <size>
-                                                <width>20</width>
-                                                <height>20</height>
-                                            </size>
-                                        </property>
-                                    </spacer>
-                                </hbox>
-                            </widget>
-                        </hbox>
-                    </widget>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>displaysizeGB</cstring>
+                            <cstring>GroupBox5</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
-                            <string>Display size</string>
+                            <string>LyX display</string>
                         </property>
-                        <grid>
+                        <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
@@ -251,10 +144,10 @@
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
-                            <spacer row="1"  column="0" >
+                            <spacer>
                                 <property>
                                     <name>name</name>
-                                    <cstring>Spacer186</cstring>
+                                    <cstring>Spacer45</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
@@ -272,38 +165,83 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget row="0"  column="0" >
-                                <class>QButtonGroup</class>
+                            <widget>
+                                <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>ButtonGroup2</cstring>
+                                    <cstring>displayCB</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>frameShape</name>
-                                    <enum>NoFrame</enum>
+                                    <name>text</name>
+                                    <string>&amp;Show in LyX</string>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Display image in LyX</string>
+                                </property>
+                            </widget>
+                            <spacer>
+                                <property>
+                                    <name>name</name>
+                                    <cstring>Spacer44</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>title</name>
-                                    <string></string>
+                                    <name>orientation</name>
+                                    <enum>Vertical</enum>
                                 </property>
                                 <property stdset="1">
-                                    <name>exclusive</name>
-                                    <bool>true</bool>
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout22</cstring>
                                 </property>
                                 <grid>
                                     <property stdset="1">
                                         <name>margin</name>
-                                        <number>11</number>
+                                        <number>0</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
                                         <number>6</number>
                                     </property>
-                                    <widget row="1"  column="1" >
+                                    <spacer row="1"  column="1" >
+                                        <property>
+                                            <name>name</name>
+                                            <cstring>Spacer42</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>orientation</name>
+                                            <enum>Vertical</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizeType</name>
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property>
+                                            <name>sizeHint</name>
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget row="0"  column="1" >
                                         <class>QLayoutWidget</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>Layout7_2</cstring>
+                                            <cstring>Layout19</cstring>
                                         </property>
                                         <hbox>
                                             <property stdset="1">
@@ -315,46 +253,44 @@
                                                 <number>6</number>
                                             </property>
                                             <widget>
-                                                <class>QLineEdit</class>
+                                                <class>QComboBox</class>
+                                                <item>
+                                                    <property>
+                                                        <name>text</name>
+                                                        <string>Default</string>
+                                                    </property>
+                                                </item>
+                                                <item>
+                                                    <property>
+                                                        <name>text</name>
+                                                        <string>Monochrome</string>
+                                                    </property>
+                                                </item>
+                                                <item>
+                                                    <property>
+                                                        <name>text</name>
+                                                        <string>Grayscale</string>
+                                                    </property>
+                                                </item>
+                                                <item>
+                                                    <property>
+                                                        <name>text</name>
+                                                        <string>Color</string>
+                                                    </property>
+                                                </item>
                                                 <property stdset="1">
                                                     <name>name</name>
-                                                    <cstring>displayscale</cstring>
-                                                </property>
-                                                <property stdset="1">
-                                                    <name>enabled</name>
-                                                    <bool>false</bool>
-                                                </property>
-                                                <property stdset="1">
-                                                    <name>sizePolicy</name>
-                                                    <sizepolicy>
-                                                        <hsizetype>3</hsizetype>
-                                                        <vsizetype>0</vsizetype>
-                                                    </sizepolicy>
+                                                    <cstring>showCB</cstring>
                                                 </property>
                                                 <property>
                                                     <name>toolTip</name>
-                                                    <string>Percentage to scale by in output</string>
-                                                </property>
-                                            </widget>
-                                            <widget>
-                                                <class>QLabel</class>
-                                                <property stdset="1">
-                                                    <name>name</name>
-                                                    <cstring>TextLabel4_2_2</cstring>
-                                                </property>
-                                                <property stdset="1">
-                                                    <name>enabled</name>
-                                                    <bool>false</bool>
-                                                </property>
-                                                <property stdset="1">
-                                                    <name>text</name>
-                                                    <string>%</string>
+                                                    <string>Screen display</string>
                                                 </property>
                                             </widget>
                                             <spacer>
                                                 <property>
                                                     <name>name</name>
-                                                    <cstring>Spacer12_2</cstring>
+                                                    <cstring>Spacer18</cstring>
                                                 </property>
                                                 <property stdset="1">
                                                     <name>orientation</name>
@@ -374,49 +310,32 @@
                                             </spacer>
                                         </hbox>
                                     </widget>
-                                    <spacer row="0"  column="1" >
-                                        <property>
-                                            <name>name</name>
-                                            <cstring>Spacer20</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>orientation</name>
-                                            <enum>Vertical</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizeType</name>
-                                            <enum>Minimum</enum>
-                                        </property>
-                                        <property>
-                                            <name>sizeHint</name>
-                                            <size>
-                                                <width>20</width>
-                                                <height>20</height>
-                                            </size>
-                                        </property>
-                                    </spacer>
-                                    <widget row="1"  column="0" >
-                                        <class>QRadioButton</class>
+                                    <widget row="0"  column="0" >
+                                        <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>displayscaleRB</cstring>
+                                            <cstring>TextLabel1</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
-                                            <string>Sca&amp;le :</string>
+                                            <string>Display :</string>
+                                        </property>
+                                        <property>
+                                            <name>buddy</name>
+                                            <cstring>showCB</cstring>
                                         </property>
                                         <property>
                                             <name>toolTip</name>
-                                            <string>Scale image size</string>
+                                            <string>Screen display</string>
                                         </property>
                                     </widget>
-                                    <widget row="2"  column="0" >
+                                    <widget row="2"  column="1" >
                                         <class>QLayoutWidget</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>Layout37</cstring>
+                                            <cstring>Layout20</cstring>
                                         </property>
-                                        <vbox>
+                                        <hbox>
                                             <property stdset="1">
                                                 <name>margin</name>
                                                 <number>0</number>
@@ -426,28 +345,50 @@
                                                 <number>6</number>
                                             </property>
                                             <widget>
-                                                <class>QRadioButton</class>
+                                                <class>QLineEdit</class>
                                                 <property stdset="1">
                                                     <name>name</name>
-                                                    <cstring>displaycustomRB</cstring>
+                                                    <cstring>displayscale</cstring>
                                                 </property>
                                                 <property stdset="1">
-                                                    <name>text</name>
-                                                    <string>Custo&amp;m :</string>
+                                                    <name>enabled</name>
+                                                    <bool>true</bool>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>sizePolicy</name>
+                                                    <sizepolicy>
+                                                        <hsizetype>1</hsizetype>
+                                                        <vsizetype>0</vsizetype>
+                                                    </sizepolicy>
                                                 </property>
                                                 <property>
                                                     <name>toolTip</name>
-                                                    <string>Custom size</string>
+                                                    <string>Percentage to scale by in LyX</string>
+                                                </property>
+                                            </widget>
+                                            <widget>
+                                                <class>QLabel</class>
+                                                <property stdset="1">
+                                                    <name>name</name>
+                                                    <cstring>TextLabel4_2_2</cstring>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>enabled</name>
+                                                    <bool>false</bool>
+                                                </property>
+                                                <property stdset="1">
+                                                    <name>text</name>
+                                                    <string>%</string>
                                                 </property>
                                             </widget>
                                             <spacer>
                                                 <property>
                                                     <name>name</name>
-                                                    <cstring>Spacer170</cstring>
+                                                    <cstring>Spacer17_2</cstring>
                                                 </property>
                                                 <property stdset="1">
                                                     <name>orientation</name>
-                                                    <enum>Vertical</enum>
+                                                    <enum>Horizontal</enum>
                                                 </property>
                                                 <property stdset="1">
                                                     <name>sizeType</name>
@@ -461,343 +402,58 @@
                                                     </size>
                                                 </property>
                                             </spacer>
-                                        </vbox>
+                                        </hbox>
                                     </widget>
-                                    <widget row="2"  column="1" >
-                                        <class>QLayoutWidget</class>
-                                        <property stdset="1">
+                                    <spacer row="1"  column="0" >
+                                        <property>
                                             <name>name</name>
-                                            <cstring>Layout32</cstring>
+                                            <cstring>Spacer41</cstring>
                                         </property>
-                                        <vbox>
-                                            <property stdset="1">
-                                                <name>margin</name>
-                                                <number>0</number>
-                                            </property>
-                                            <property stdset="1">
-                                                <name>spacing</name>
-                                                <number>6</number>
-                                            </property>
-                                            <widget>
-                                                <class>QLayoutWidget</class>
-                                                <property stdset="1">
-                                                    <name>name</name>
-                                                    <cstring>Layout21</cstring>
-                                                </property>
-                                                <hbox>
-                                                    <property stdset="1">
-                                                        <name>margin</name>
-                                                        <number>0</number>
-                                                    </property>
-                                                    <property stdset="1">
-                                                        <name>spacing</name>
-                                                        <number>6</number>
-                                                    </property>
-                                                    <widget>
-                                                        <class>QLayoutWidget</class>
-                                                        <property stdset="1">
-                                                            <name>name</name>
-                                                            <cstring>Layout18</cstring>
-                                                        </property>
-                                                        <vbox>
-                                                            <property stdset="1">
-                                                                <name>margin</name>
-                                                                <number>0</number>
-                                                            </property>
-                                                            <property stdset="1">
-                                                                <name>spacing</name>
-                                                                <number>6</number>
-                                                            </property>
-                                                            <widget>
-                                                                <class>QLabel</class>
-                                                                <property stdset="1">
-                                                                    <name>name</name>
-                                                                    <cstring>TextLabel7</cstring>
-                                                                </property>
-                                                                <property stdset="1">
-                                                                    <name>enabled</name>
-                                                                    <bool>false</bool>
-                                                                </property>
-                                                                <property stdset="1">
-                                                                    <name>text</name>
-                                                                    <string>&amp;Width</string>
-                                                                </property>
-                                                                <property>
-                                                                    <name>buddy</name>
-                                                                    <cstring>displaywidth</cstring>
-                                                                </property>
-                                                            </widget>
-                                                            <widget>
-                                                                <class>QLayoutWidget</class>
-                                                                <property stdset="1">
-                                                                    <name>name</name>
-                                                                    <cstring>Layout16</cstring>
-                                                                </property>
-                                                                <hbox>
-                                                                    <property stdset="1">
-                                                                        <name>margin</name>
-                                                                        <number>0</number>
-                                                                    </property>
-                                                                    <property stdset="1">
-                                                                        <name>spacing</name>
-                                                                        <number>6</number>
-                                                                    </property>
-                                                                    <widget>
-                                                                        <class>QLineEdit</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>displaywidth</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>sizePolicy</name>
-                                                                            <sizepolicy>
-                                                                                <hsizetype>7</hsizetype>
-                                                                                <vsizetype>0</vsizetype>
-                                                                            </sizepolicy>
-                                                                        </property>
-                                                                        <property>
-                                                                            <name>toolTip</name>
-                                                                            <string>Width of image on screen</string>
-                                                                        </property>
-                                                                    </widget>
-                                                                    <widget>
-                                                                        <class>LengthCombo</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>displaywidthUnit</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>minimumSize</name>
-                                                                            <size>
-                                                                                <width>30</width>
-                                                                                <height>0</height>
-                                                                            </size>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>focusPolicy</name>
-                                                                            <enum>StrongFocus</enum>
-                                                                        </property>
-                                                                    </widget>
-                                                                </hbox>
-                                                            </widget>
-                                                        </vbox>
-                                                    </widget>
-                                                    <widget>
-                                                        <class>QLayoutWidget</class>
-                                                        <property stdset="1">
-                                                            <name>name</name>
-                                                            <cstring>Layout19</cstring>
-                                                        </property>
-                                                        <vbox>
-                                                            <property stdset="1">
-                                                                <name>margin</name>
-                                                                <number>0</number>
-                                                            </property>
-                                                            <property stdset="1">
-                                                                <name>spacing</name>
-                                                                <number>6</number>
-                                                            </property>
-                                                            <widget>
-                                                                <class>QLabel</class>
-                                                                <property stdset="1">
-                                                                    <name>name</name>
-                                                                    <cstring>TextLabel7_2</cstring>
-                                                                </property>
-                                                                <property stdset="1">
-                                                                    <name>enabled</name>
-                                                                    <bool>false</bool>
-                                                                </property>
-                                                                <property stdset="1">
-                                                                    <name>text</name>
-                                                                    <string>&amp;Height</string>
-                                                                </property>
-                                                                <property>
-                                                                    <name>buddy</name>
-                                                                    <cstring>displayheight</cstring>
-                                                                </property>
-                                                            </widget>
-                                                            <widget>
-                                                                <class>QLayoutWidget</class>
-                                                                <property stdset="1">
-                                                                    <name>name</name>
-                                                                    <cstring>Layout17</cstring>
-                                                                </property>
-                                                                <hbox>
-                                                                    <property stdset="1">
-                                                                        <name>margin</name>
-                                                                        <number>0</number>
-                                                                    </property>
-                                                                    <property stdset="1">
-                                                                        <name>spacing</name>
-                                                                        <number>6</number>
-                                                                    </property>
-                                                                    <widget>
-                                                                        <class>QLineEdit</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>displayheight</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                        <property>
-                                                                            <name>toolTip</name>
-                                                                            <string>Height of image on screen</string>
-                                                                        </property>
-                                                                    </widget>
-                                                                    <widget>
-                                                                        <class>LengthCombo</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>displayheightUnit</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>minimumSize</name>
-                                                                            <size>
-                                                                                <width>30</width>
-                                                                                <height>0</height>
-                                                                            </size>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>focusPolicy</name>
-                                                                            <enum>StrongFocus</enum>
-                                                                        </property>
-                                                                    </widget>
-                                                                </hbox>
-                                                            </widget>
-                                                        </vbox>
-                                                    </widget>
-                                                </hbox>
-                                            </widget>
-                                            <widget>
-                                                <class>QLayoutWidget</class>
-                                                <property stdset="1">
-                                                    <name>name</name>
-                                                    <cstring>Layout31</cstring>
-                                                </property>
-                                                <hbox>
-                                                    <property stdset="1">
-                                                        <name>margin</name>
-                                                        <number>0</number>
-                                                    </property>
-                                                    <property stdset="1">
-                                                        <name>spacing</name>
-                                                        <number>6</number>
-                                                    </property>
-                                                    <widget>
-                                                        <class>QCheckBox</class>
-                                                        <property stdset="1">
-                                                            <name>name</name>
-                                                            <cstring>displayratioCB</cstring>
-                                                        </property>
-                                                        <property stdset="1">
-                                                            <name>enabled</name>
-                                                            <bool>false</bool>
-                                                        </property>
-                                                        <property stdset="1">
-                                                            <name>text</name>
-                                                            <string>&amp;Keep aspect ratio</string>
-                                                        </property>
-                                                    </widget>
-                                                    <spacer>
-                                                        <property>
-                                                            <name>name</name>
-                                                            <cstring>Spacer17</cstring>
-                                                        </property>
-                                                        <property stdset="1">
-                                                            <name>orientation</name>
-                                                            <enum>Horizontal</enum>
-                                                        </property>
-                                                        <property stdset="1">
-                                                            <name>sizeType</name>
-                                                            <enum>Expanding</enum>
-                                                        </property>
-                                                        <property>
-                                                            <name>sizeHint</name>
-                                                            <size>
-                                                                <width>20</width>
-                                                                <height>20</height>
-                                                            </size>
-                                                        </property>
-                                                    </spacer>
-                                                </hbox>
-                                            </widget>
-                                        </vbox>
-                                    </widget>
-                                    <widget row="0"  column="0" >
-                                        <class>QRadioButton</class>
+                                        <property stdset="1">
+                                            <name>orientation</name>
+                                            <enum>Vertical</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizeType</name>
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property>
+                                            <name>sizeHint</name>
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget row="2"  column="0" >
+                                        <class>QLabel</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>displaydefaultRB</cstring>
+                                            <cstring>scaleLA</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
-                                            <string>Ima&amp;ge size</string>
+                                            <string>Scale :</string>
                                         </property>
-                                        <property stdset="1">
-                                            <name>checked</name>
-                                            <bool>true</bool>
+                                        <property>
+                                            <name>buddy</name>
+                                            <cstring>displayscale</cstring>
                                         </property>
                                         <property>
                                             <name>toolTip</name>
-                                            <string>Original image size</string>
+                                            <string>Percentage to scale by in LyX</string>
                                         </property>
                                     </widget>
                                 </grid>
                             </widget>
-                        </grid>
-                    </widget>
-                    <widget>
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout18</cstring>
-                        </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QCheckBox</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>draft</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Draft mode</string>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Draft mode</string>
-                                </property>
-                            </widget>
                             <spacer>
                                 <property>
                                     <name>name</name>
-                                    <cstring>Spacer8</cstring>
+                                    <cstring>Spacer43</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
-                                    <enum>Horizontal</enum>
+                                    <enum>Vertical</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
@@ -811,169 +467,31 @@
                                     </size>
                                 </property>
                             </spacer>
-                        </hbox>
+                        </vbox>
                     </widget>
-                </vbox>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Output si&amp;ze</string>
-                </attribute>
-                <hbox>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
-                    </property>
                     <widget>
-                        <class>QButtonGroup</class>
+                        <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>ButtonGroup19</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>frameShape</name>
-                            <enum>NoFrame</enum>
+                            <cstring>GroupBox11</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
-                            <string></string>
+                            <string>Output</string>
                         </property>
-                        <grid>
+                        <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget row="1"  column="0" >
-                                <class>QRadioButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>scaleRB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Scale</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>checked</name>
-                                    <bool>false</bool>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Scale the image size</string>
-                                </property>
-                            </widget>
-                            <widget row="0"  column="0" >
-                                <class>QRadioButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>defaultRB</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Image size</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>checked</name>
-                                    <bool>true</bool>
-                                </property>
-                                <property>
-                                    <name>toolTip</name>
-                                    <string>Use the image's natural size</string>
-                                </property>
-                            </widget>
-                            <widget row="1"  column="1" >
-                                <class>QLayoutWidget</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Layout7</cstring>
-                                </property>
-                                <hbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <widget>
-                                        <class>QLineEdit</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>scale</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>enabled</name>
-                                            <bool>false</bool>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizePolicy</name>
-                                            <sizepolicy>
-                                                <hsizetype>3</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                            </sizepolicy>
-                                        </property>
-                                        <property>
-                                            <name>toolTip</name>
-                                            <string>Percentage to scale by in output</string>
-                                        </property>
-                                    </widget>
-                                    <widget>
-                                        <class>QLabel</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>TextLabel4_2</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>enabled</name>
-                                            <bool>false</bool>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string>%</string>
-                                        </property>
-                                    </widget>
-                                    <spacer>
-                                        <property>
-                                            <name>name</name>
-                                            <cstring>Spacer12</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>orientation</name>
-                                            <enum>Horizontal</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizeType</name>
-                                            <enum>Expanding</enum>
-                                        </property>
-                                        <property>
-                                            <name>sizeHint</name>
-                                            <size>
-                                                <width>20</width>
-                                                <height>20</height>
-                                            </size>
-                                        </property>
-                                    </spacer>
-                                </hbox>
-                            </widget>
-                            <spacer row="0"  column="1" >
+                                <number>6</number>
+                            </property>
+                            <spacer>
                                 <property>
                                     <name>name</name>
-                                    <cstring>Spacer119</cstring>
+                                    <cstring>Spacer47</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
@@ -981,7 +499,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
-                                    <enum>Minimum</enum>
+                                    <enum>Expanding</enum>
                                 </property>
                                 <property>
                                     <name>sizeHint</name>
@@ -991,66 +509,13 @@
                                     </size>
                                 </property>
                             </spacer>
-                            <widget row="2"  column="0" >
-                                <class>QLayoutWidget</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Layout34</cstring>
-                                </property>
-                                <vbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <widget>
-                                        <class>QRadioButton</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>customRB</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string>&amp;Custom</string>
-                                        </property>
-                                        <property>
-                                            <name>toolTip</name>
-                                            <string>Define a custom size</string>
-                                        </property>
-                                    </widget>
-                                    <spacer>
-                                        <property>
-                                            <name>name</name>
-                                            <cstring>Spacer150</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>orientation</name>
-                                            <enum>Vertical</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizeType</name>
-                                            <enum>Expanding</enum>
-                                        </property>
-                                        <property>
-                                            <name>sizeHint</name>
-                                            <size>
-                                                <width>20</width>
-                                                <height>20</height>
-                                            </size>
-                                        </property>
-                                    </spacer>
-                                </vbox>
-                            </widget>
-                            <widget row="2"  column="1" >
+                            <widget>
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Layout35</cstring>
+                                    <cstring>Layout23</cstring>
                                 </property>
-                                <vbox>
+                                <hbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>0</number>
@@ -1063,9 +528,9 @@
                                         <class>QLayoutWidget</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>Layout33</cstring>
+                                            <cstring>Layout32_2</cstring>
                                         </property>
-                                        <vbox>
+                                        <hbox>
                                             <property stdset="1">
                                                 <name>margin</name>
                                                 <number>0</number>
@@ -1078,9 +543,9 @@
                                                 <class>QLayoutWidget</class>
                                                 <property stdset="1">
                                                     <name>name</name>
-                                                    <cstring>Layout32</cstring>
+                                                    <cstring>Layout26_2</cstring>
                                                 </property>
-                                                <hbox>
+                                                <vbox>
                                                     <property stdset="1">
                                                         <name>margin</name>
                                                         <number>0</number>
@@ -1089,13 +554,32 @@
                                                         <name>spacing</name>
                                                         <number>6</number>
                                                     </property>
+                                                    <widget>
+                                                        <class>QLabel</class>
+                                                        <property stdset="1">
+                                                            <name>name</name>
+                                                            <cstring>sizewidthL_2</cstring>
+                                                        </property>
+                                                        <property stdset="1">
+                                                            <name>enabled</name>
+                                                            <bool>true</bool>
+                                                        </property>
+                                                        <property stdset="1">
+                                                            <name>text</name>
+                                                            <string>&amp;Width</string>
+                                                        </property>
+                                                        <property>
+                                                            <name>buddy</name>
+                                                            <cstring>width</cstring>
+                                                        </property>
+                                                    </widget>
                                                     <widget>
                                                         <class>QLayoutWidget</class>
                                                         <property stdset="1">
                                                             <name>name</name>
-                                                            <cstring>Layout26</cstring>
+                                                            <cstring>Layout18_2</cstring>
                                                         </property>
-                                                        <vbox>
+                                                        <hbox>
                                                             <property stdset="1">
                                                                 <name>margin</name>
                                                                 <number>0</number>
@@ -1105,171 +589,57 @@
                                                                 <number>6</number>
                                                             </property>
                                                             <widget>
-                                                                <class>QLabel</class>
+                                                                <class>QLineEdit</class>
                                                                 <property stdset="1">
                                                                     <name>name</name>
-                                                                    <cstring>sizewidthL</cstring>
+                                                                    <cstring>width</cstring>
                                                                 </property>
                                                                 <property stdset="1">
                                                                     <name>enabled</name>
-                                                                    <bool>false</bool>
-                                                                </property>
-                                                                <property stdset="1">
-                                                                    <name>text</name>
-                                                                    <string>&amp;Width</string>
+                                                                    <bool>true</bool>
                                                                 </property>
                                                                 <property>
-                                                                    <name>buddy</name>
-                                                                    <cstring>width</cstring>
+                                                                    <name>toolTip</name>
+                                                                    <string>Width of image in output</string>
                                                                 </property>
                                                             </widget>
                                                             <widget>
-                                                                <class>QLayoutWidget</class>
+                                                                <class>LengthCombo</class>
                                                                 <property stdset="1">
                                                                     <name>name</name>
-                                                                    <cstring>Layout18</cstring>
+                                                                    <cstring>widthUnit</cstring>
                                                                 </property>
-                                                                <hbox>
-                                                                    <property stdset="1">
-                                                                        <name>margin</name>
-                                                                        <number>0</number>
-                                                                    </property>
-                                                                    <property stdset="1">
-                                                                        <name>spacing</name>
-                                                                        <number>6</number>
-                                                                    </property>
-                                                                    <widget>
-                                                                        <class>QLineEdit</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>width</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                    </widget>
-                                                                    <widget>
-                                                                        <class>LengthCombo</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>widthUnit</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>minimumSize</name>
-                                                                            <size>
-                                                                                <width>30</width>
-                                                                                <height>0</height>
-                                                                            </size>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>focusPolicy</name>
-                                                                            <enum>StrongFocus</enum>
-                                                                        </property>
-                                                                    </widget>
-                                                                </hbox>
-                                                            </widget>
-                                                        </vbox>
-                                                    </widget>
-                                                    <widget>
-                                                        <class>QLayoutWidget</class>
-                                                        <property stdset="1">
-                                                            <name>name</name>
-                                                            <cstring>Layout31</cstring>
-                                                        </property>
-                                                        <vbox>
-                                                            <property stdset="1">
-                                                                <name>margin</name>
-                                                                <number>0</number>
-                                                            </property>
-                                                            <property stdset="1">
-                                                                <name>spacing</name>
-                                                                <number>6</number>
-                                                            </property>
-                                                            <widget>
-                                                                <class>QLabel</class>
                                                                 <property stdset="1">
-                                                                    <name>name</name>
-                                                                    <cstring>sizeheightL</cstring>
+                                                                    <name>enabled</name>
+                                                                    <bool>true</bool>
                                                                 </property>
                                                                 <property stdset="1">
-                                                                    <name>enabled</name>
-                                                                    <bool>false</bool>
+                                                                    <name>minimumSize</name>
+                                                                    <size>
+                                                                        <width>50</width>
+                                                                        <height>0</height>
+                                                                    </size>
                                                                 </property>
                                                                 <property stdset="1">
-                                                                    <name>text</name>
-                                                                    <string>&amp;Height</string>
+                                                                    <name>focusPolicy</name>
+                                                                    <enum>StrongFocus</enum>
                                                                 </property>
                                                                 <property>
-                                                                    <name>buddy</name>
-                                                                    <cstring>height</cstring>
-                                                                </property>
-                                                            </widget>
-                                                            <widget>
-                                                                <class>QLayoutWidget</class>
-                                                                <property stdset="1">
-                                                                    <name>name</name>
-                                                                    <cstring>Layout19</cstring>
+                                                                    <name>toolTip</name>
+                                                                    <string>Width unit</string>
                                                                 </property>
-                                                                <hbox>
-                                                                    <property stdset="1">
-                                                                        <name>margin</name>
-                                                                        <number>0</number>
-                                                                    </property>
-                                                                    <property stdset="1">
-                                                                        <name>spacing</name>
-                                                                        <number>6</number>
-                                                                    </property>
-                                                                    <widget>
-                                                                        <class>QLineEdit</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>height</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                    </widget>
-                                                                    <widget>
-                                                                        <class>LengthCombo</class>
-                                                                        <property stdset="1">
-                                                                            <name>name</name>
-                                                                            <cstring>heightUnit</cstring>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>enabled</name>
-                                                                            <bool>false</bool>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>minimumSize</name>
-                                                                            <size>
-                                                                                <width>30</width>
-                                                                                <height>0</height>
-                                                                            </size>
-                                                                        </property>
-                                                                        <property stdset="1">
-                                                                            <name>focusPolicy</name>
-                                                                            <enum>StrongFocus</enum>
-                                                                        </property>
-                                                                    </widget>
-                                                                </hbox>
                                                             </widget>
-                                                        </vbox>
+                                                        </hbox>
                                                     </widget>
-                                                </hbox>
+                                                </vbox>
                                             </widget>
                                             <widget>
                                                 <class>QLayoutWidget</class>
                                                 <property stdset="1">
                                                     <name>name</name>
-                                                    <cstring>Layout8</cstring>
+                                                    <cstring>Layout31_2</cstring>
                                                 </property>
-                                                <hbox>
+                                                <vbox>
                                                     <property stdset="1">
                                                         <name>margin</name>
                                                         <number>0</number>
@@ -1279,53 +649,325 @@
                                                         <number>6</number>
                                                     </property>
                                                     <widget>
-                                                        <class>QCheckBox</class>
+                                                        <class>QLabel</class>
                                                         <property stdset="1">
                                                             <name>name</name>
-                                                            <cstring>aspectratio</cstring>
+                                                            <cstring>sizeheightL_2</cstring>
                                                         </property>
                                                         <property stdset="1">
                                                             <name>enabled</name>
-                                                            <bool>false</bool>
+                                                            <bool>true</bool>
                                                         </property>
                                                         <property stdset="1">
                                                             <name>text</name>
-                                                            <string>&amp;Keep aspect ratio</string>
+                                                            <string>&amp;Height</string>
                                                         </property>
-                                                    </widget>
-                                                    <spacer>
                                                         <property>
-                                                            <name>name</name>
-                                                            <cstring>Spacer13</cstring>
-                                                        </property>
-                                                        <property stdset="1">
-                                                            <name>orientation</name>
-                                                            <enum>Horizontal</enum>
+                                                            <name>buddy</name>
+                                                            <cstring>height</cstring>
                                                         </property>
+                                                    </widget>
+                                                    <widget>
+                                                        <class>QLayoutWidget</class>
                                                         <property stdset="1">
-                                                            <name>sizeType</name>
-                                                            <enum>Expanding</enum>
-                                                        </property>
-                                                        <property>
-                                                            <name>sizeHint</name>
-                                                            <size>
-                                                                <width>20</width>
-                                                                <height>20</height>
-                                                            </size>
+                                                            <name>name</name>
+                                                            <cstring>Layout19_2</cstring>
                                                         </property>
-                                                    </spacer>
-                                                </hbox>
+                                                        <hbox>
+                                                            <property stdset="1">
+                                                                <name>margin</name>
+                                                                <number>0</number>
+                                                            </property>
+                                                            <property stdset="1">
+                                                                <name>spacing</name>
+                                                                <number>6</number>
+                                                            </property>
+                                                            <widget>
+                                                                <class>QLineEdit</class>
+                                                                <property stdset="1">
+                                                                    <name>name</name>
+                                                                    <cstring>height</cstring>
+                                                                </property>
+                                                                <property stdset="1">
+                                                                    <name>enabled</name>
+                                                                    <bool>true</bool>
+                                                                </property>
+                                                                <property>
+                                                                    <name>toolTip</name>
+                                                                    <string>Height of image in output</string>
+                                                                </property>
+                                                            </widget>
+                                                            <widget>
+                                                                <class>LengthCombo</class>
+                                                                <property stdset="1">
+                                                                    <name>name</name>
+                                                                    <cstring>heightUnit</cstring>
+                                                                </property>
+                                                                <property stdset="1">
+                                                                    <name>enabled</name>
+                                                                    <bool>true</bool>
+                                                                </property>
+                                                                <property stdset="1">
+                                                                    <name>minimumSize</name>
+                                                                    <size>
+                                                                        <width>50</width>
+                                                                        <height>0</height>
+                                                                    </size>
+                                                                </property>
+                                                                <property stdset="1">
+                                                                    <name>focusPolicy</name>
+                                                                    <enum>StrongFocus</enum>
+                                                                </property>
+                                                                <property>
+                                                                    <name>toolTip</name>
+                                                                    <string>Height unit</string>
+                                                                </property>
+                                                            </widget>
+                                                        </hbox>
+                                                    </widget>
+                                                </vbox>
                                             </widget>
-                                        </vbox>
+                                        </hbox>
+                                    </widget>
+                                    <spacer>
+                                        <property>
+                                            <name>name</name>
+                                            <cstring>Spacer46</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>orientation</name>
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>sizeType</name>
+                                            <enum>Expanding</enum>
+                                        </property>
+                                        <property>
+                                            <name>sizeHint</name>
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                </hbox>
+                            </widget>
+                            <widget>
+                                <class>QCheckBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>aspectratio</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>true</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>&amp;Maintain aspect ratio</string>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Maintain aspect ratio with largest dimension</string>
+                                </property>
+                            </widget>
+                            <spacer>
+                                <property>
+                                    <name>name</name>
+                                    <cstring>Spacer50</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>orientation</name>
+                                    <enum>Vertical</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </vbox>
+                    </widget>
+                    <widget>
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>rotateGB</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Rotation</string>
+                        </property>
+                        <vbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout22</cstring>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>angleL_2</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>A&amp;ngle:</string>
+                                        </property>
+                                        <property>
+                                            <name>buddy</name>
+                                            <cstring>angle</cstring>
+                                        </property>
+                                        <property>
+                                            <name>toolTip</name>
+                                            <string>Angle to rotate image by</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLineEdit</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>angle</cstring>
+                                        </property>
+                                        <property>
+                                            <name>toolTip</name>
+                                            <string>Angle to rotate image by</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLabel</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>originL_2</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>&amp;Origin:</string>
+                                        </property>
+                                        <property>
+                                            <name>buddy</name>
+                                            <cstring>origin</cstring>
+                                        </property>
+                                        <property>
+                                            <name>toolTip</name>
+                                            <string>The origin of the rotation</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QComboBox</class>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>default</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Top left</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Bottom left</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Left baseline</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Center</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Top center</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Bottom center</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Center baseline</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Top right</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Bottom right</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Right baseline</string>
+                                            </property>
+                                        </item>
+                                        <item>
+                                            <property>
+                                                <name>text</name>
+                                                <string>Reference point</string>
+                                            </property>
+                                        </item>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>origin</cstring>
+                                        </property>
+                                        <property>
+                                            <name>toolTip</name>
+                                            <string>The origin of the rotation</string>
+                                        </property>
                                     </widget>
                                     <spacer>
                                         <property>
                                             <name>name</name>
-                                            <cstring>Spacer151</cstring>
+                                            <cstring>Spacer21</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>orientation</name>
-                                            <enum>Vertical</enum>
+                                            <enum>Horizontal</enum>
                                         </property>
                                         <property stdset="1">
                                             <name>sizeType</name>
@@ -1339,11 +981,11 @@
                                             </size>
                                         </property>
                                     </spacer>
-                                </vbox>
+                                </hbox>
                             </widget>
-                        </grid>
+                        </vbox>
                     </widget>
-                </hbox>
+                </vbox>
             </widget>
             <widget>
                 <class>QWidget</class>
@@ -1365,85 +1007,25 @@
                         <number>6</number>
                     </property>
                     <widget>
-                        <class>QGroupBox</class>
+                        <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>bbGB</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>enabled</name>
-                            <bool>true</bool>
-                        </property>
-                        <property stdset="1">
-                            <name>title</name>
-                            <string>Bounding box</string>
+                            <cstring>Layout23</cstring>
                         </property>
                         <grid>
                             <property stdset="1">
                                 <name>margin</name>
-                                <number>11</number>
+                                <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
-                            <widget row="1"  column="0" >
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>lbL</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>&amp;Left bottom:</string>
-                                </property>
-                                <property>
-                                    <name>buddy</name>
-                                    <cstring>lbX</cstring>
-                                </property>
-                            </widget>
-                            <widget row="2"  column="0" >
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>rtL</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Right &amp;top:</string>
-                                </property>
-                                <property>
-                                    <name>buddy</name>
-                                    <cstring>rtX</cstring>
-                                </property>
-                            </widget>
-                            <widget row="0"  column="2" >
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>yL</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Y</string>
-                                </property>
-                            </widget>
-                            <widget row="0"  column="1" >
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>xL</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>X</string>
-                                </property>
-                            </widget>
-                            <widget row="1"  column="1" >
+                            <widget row="2"  column="1" >
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Layout25</cstring>
+                                    <cstring>Layout25_2</cstring>
                                 </property>
                                 <hbox>
                                     <property stdset="1">
@@ -1458,11 +1040,7 @@
                                         <class>QLineEdit</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>lbX</cstring>
-                                        </property>
-                                        <property>
-                                            <name>toolTip</name>
-                                            <string></string>
+                                            <cstring>rtX</cstring>
                                         </property>
                                     </widget>
                                     <widget>
@@ -1487,16 +1065,63 @@
                                         </item>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>lbXunit</cstring>
+                                            <cstring>rtXunit</cstring>
                                         </property>
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget row="2"  column="1" >
+                            <widget row="0"  column="1" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>xL</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>x</string>
+                                </property>
+                            </widget>
+                            <spacer row="0"  column="0" >
+                                <property>
+                                    <name>name</name>
+                                    <cstring>Spacer22</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>orientation</name>
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget row="1"  column="0" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>lbL</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>&amp;Left bottom:</string>
+                                </property>
+                                <property>
+                                    <name>buddy</name>
+                                    <cstring>lbX</cstring>
+                                </property>
+                            </widget>
+                            <widget row="1"  column="1" >
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Layout25_2</cstring>
+                                    <cstring>Layout25</cstring>
                                 </property>
                                 <hbox>
                                     <property stdset="1">
@@ -1511,7 +1136,11 @@
                                         <class>QLineEdit</class>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>rtX</cstring>
+                                            <cstring>lbX</cstring>
+                                        </property>
+                                        <property>
+                                            <name>toolTip</name>
+                                            <string></string>
                                         </property>
                                     </widget>
                                     <widget>
@@ -1536,7 +1165,7 @@
                                         </item>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>rtXunit</cstring>
+                                            <cstring>lbXunit</cstring>
                                         </property>
                                     </widget>
                                 </hbox>
@@ -1585,7 +1214,7 @@
                                         </item>
                                         <property stdset="1">
                                             <name>name</name>
-                                            <cstring>rtYXunit</cstring>
+                                            <cstring>rtYunit</cstring>
                                         </property>
                                     </widget>
                                 </hbox>
@@ -1639,60 +1268,86 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget row="3"  column="1"  rowspan="1"  colspan="2" >
-                                <class>QLayoutWidget</class>
+                            <widget row="0"  column="2" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>yL</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>y</string>
+                                </property>
+                            </widget>
+                            <widget row="2"  column="0" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>rtL</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Right &amp;top:</string>
+                                </property>
+                                <property>
+                                    <name>buddy</name>
+                                    <cstring>rtX</cstring>
+                                </property>
+                            </widget>
+                        </grid>
+                    </widget>
+                    <widget>
+                        <class>QLayoutWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Layout24</cstring>
+                        </property>
+                        <hbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QPushButton</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>Layout16</cstring>
+                                    <cstring>getPB</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>&amp;Get from file</string>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Get bounding box from the EPS file</string>
                                 </property>
-                                <hbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <spacer>
-                                        <property>
-                                            <name>name</name>
-                                            <cstring>Spacer6</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>orientation</name>
-                                            <enum>Horizontal</enum>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>sizeType</name>
-                                            <enum>Expanding</enum>
-                                        </property>
-                                        <property>
-                                            <name>sizeHint</name>
-                                            <size>
-                                                <width>20</width>
-                                                <height>20</height>
-                                            </size>
-                                        </property>
-                                    </spacer>
-                                    <widget>
-                                        <class>QPushButton</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>getPB</cstring>
-                                        </property>
-                                        <property stdset="1">
-                                            <name>text</name>
-                                            <string>&amp;Get from file</string>
-                                        </property>
-                                        <property>
-                                            <name>toolTip</name>
-                                            <string>Get bounding box from the EPS file</string>
-                                        </property>
-                                    </widget>
-                                </hbox>
                             </widget>
-                        </grid>
+                            <spacer>
+                                <property>
+                                    <name>name</name>
+                                    <cstring>Spacer48</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>orientation</name>
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </hbox>
                     </widget>
                     <widget>
                         <class>QLayoutWidget</class>
@@ -1747,6 +1402,27 @@
                             </spacer>
                         </hbox>
                     </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer47_2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
                 </vbox>
             </widget>
             <widget>
@@ -1757,7 +1433,7 @@
                 </property>
                 <attribute>
                     <name>title</name>
-                    <string>E&amp;xtra</string>
+                    <string>E&amp;xtra options</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
@@ -1768,20 +1444,52 @@
                         <name>spacing</name>
                         <number>6</number>
                     </property>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer72</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
                     <widget>
-                        <class>QGroupBox</class>
+                        <class>QCheckBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>rotateGB</cstring>
+                            <cstring>subfigure</cstring>
                         </property>
                         <property stdset="1">
-                            <name>title</name>
-                            <string>Rotation</string>
+                            <name>text</name>
+                            <string>Su&amp;bfigure</string>
+                        </property>
+                        <property>
+                            <name>toolTip</name>
+                            <string>Is this just one part of a figure float ?</string>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QLayoutWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Layout22</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
                                 <name>margin</name>
-                                <number>11</number>
+                                <number>0</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
@@ -1791,165 +1499,206 @@
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>angleL</cstring>
+                                    <cstring>CaptionLA</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>A&amp;ngle:</string>
+                                    <string>Ca&amp;ption :</string>
                                 </property>
                                 <property>
                                     <name>buddy</name>
-                                    <cstring>angle</cstring>
+                                    <cstring>subcaption</cstring>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Angle to rotate image by</string>
+                                    <string>The caption for the sub-figure</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>angle</cstring>
+                                    <cstring>subcaption</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Angle to rotate image by</string>
+                                    <string>The caption for the sub-figure</string>
                                 </property>
                             </widget>
+                        </hbox>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer73</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget>
+                        <class>QLayoutWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Layout26</cstring>
+                        </property>
+                        <hbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
                             <widget>
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>originL</cstring>
+                                    <cstring>latexoptionsLA</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Ori&amp;gin:</string>
+                                    <string>LaTeX &amp;options:</string>
                                 </property>
                                 <property>
                                     <name>buddy</name>
-                                    <cstring>origin</cstring>
+                                    <cstring>latexoptions</cstring>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Additional LaTeX options</string>
                                 </property>
                             </widget>
                             <widget>
-                                <class>QComboBox</class>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>default</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Top left</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Bottom left</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Left baseline</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Center</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Top center</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Bottom center</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Center baseline</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Top right</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Bottom right</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Right baseline</string>
-                                    </property>
-                                </item>
-                                <item>
-                                    <property>
-                                        <name>text</name>
-                                        <string>Reference point</string>
-                                    </property>
-                                </item>
+                                <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>origin</cstring>
+                                    <cstring>latexoptions</cstring>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>The origin of the rotation</string>
+                                    <string>Additional LaTeX options</string>
                                 </property>
                             </widget>
                         </hbox>
                     </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer74</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
                     <widget>
-                        <class>QGroupBox</class>
+                        <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>latexoptionsGB</cstring>
+                            <cstring>Layout18</cstring>
+                        </property>
+                        <hbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
+                            </property>
+                            <widget>
+                                <class>QCheckBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>draftCB</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>&amp;Draft mode</string>
+                                </property>
+                                <property>
+                                    <name>toolTip</name>
+                                    <string>Draft mode</string>
+                                </property>
+                            </widget>
+                            <spacer>
+                                <property>
+                                    <name>name</name>
+                                    <cstring>Spacer8_3</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>orientation</name>
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
+                                </property>
+                                <property>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                        </hbox>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer75</cstring>
                         </property>
                         <property stdset="1">
-                            <name>title</name>
-                            <string>LaTeX options</string>
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
                         </property>
-                        <grid>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>11</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget row="0"  column="0" >
-                                <class>QLineEdit</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>latexoptions</cstring>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
                     <widget>
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout6</cstring>
+                            <cstring>Layout18_3</cstring>
                         </property>
                         <hbox>
                             <property stdset="1">
@@ -1964,38 +1713,44 @@
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>subfigure</cstring>
+                                    <cstring>unzipCB</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Su&amp;bfigure</string>
+                                    <string>Don't un&amp;zip on export</string>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
-                                    <string>Is this just one part of a figure float ?</string>
+                                    <string>Don't uncompress image before exporting to LaTeX</string>
                                 </property>
                             </widget>
-                            <widget>
-                                <class>QLineEdit</class>
-                                <property stdset="1">
+                            <spacer>
+                                <property>
                                     <name>name</name>
-                                    <cstring>subcaption</cstring>
+                                    <cstring>Spacer8_2_2</cstring>
                                 </property>
                                 <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>false</bool>
+                                    <name>orientation</name>
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizeType</name>
+                                    <enum>Expanding</enum>
                                 </property>
                                 <property>
-                                    <name>toolTip</name>
-                                    <string>The sub-caption for the figure</string>
+                                    <name>sizeHint</name>
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
                                 </property>
-                            </widget>
+                            </spacer>
                         </hbox>
                     </widget>
                     <spacer>
                         <property>
                             <name>name</name>
-                            <cstring>Spacer26</cstring>
+                            <cstring>Spacer76</cstring>
                         </property>
                         <property stdset="1">
                             <name>orientation</name>
@@ -2079,11 +1834,11 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;OK</string>
+                        <string>OK</string>
                     </property>
                     <property stdset="1">
                         <name>autoDefault</name>
-                        <bool>false</bool>
+                        <bool>true</bool>
                     </property>
                     <property stdset="1">
                         <name>default</name>
@@ -2166,48 +1921,6 @@
     </image>
 </images>
 <connections>
-    <connection>
-        <sender>scaleRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>scale</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>scaleRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel4_2</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>customRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>width</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>customRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>height</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>customRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>sizewidthL</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>customRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>sizeheightL</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>customRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>aspectratio</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
     <connection>
         <sender>subfigure</sender>
         <signal>toggled(bool)</signal>
@@ -2220,54 +1933,12 @@
         <receiver>QGraphicsDialogBase</receiver>
         <slot>browse_clicked()</slot>
     </connection>
-    <connection>
-        <sender>getPB</sender>
-        <signal>clicked()</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>get_clicked()</slot>
-    </connection>
-    <connection>
-        <sender>customRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>widthUnit</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>customRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>heightUnit</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
     <connection>
         <sender>filename</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
-    <connection>
-        <sender>displaywidth</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>displayheight</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>displaywidthUnit</sender>
-        <signal>selectionChanged(LyXLength::UNIT)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>displayheightUnit</sender>
-        <signal>selectionChanged(LyXLength::UNIT)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
     <connection>
         <sender>subcaption</sender>
         <signal>textChanged(const QString&amp;)</signal>
@@ -2281,73 +1952,55 @@
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>defaultRB</sender>
-        <signal>stateChanged(int)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>scaleRB</sender>
-        <signal>stateChanged(int)</signal>
+        <sender>latexoptions</sender>
+        <signal>textChanged(const QString&amp;)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>customRB</sender>
+        <sender>clip</sender>
         <signal>stateChanged(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>angle</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>latexoptions</sender>
+        <sender>lbX</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>clip</sender>
-        <signal>stateChanged(int)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>draft</sender>
-        <signal>stateChanged(int)</signal>
+        <sender>lbXunit</sender>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>lbX</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <sender>lbYunit</sender>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>lbY</sender>
-        <signal>returnPressed()</signal>
+        <sender>rtXunit</sender>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>rtX</sender>
-        <signal>returnPressed()</signal>
+        <sender>rtYunit</sender>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>rtY</sender>
-        <signal>returnPressed()</signal>
+        <sender>showCB</sender>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>scale</sender>
+        <sender>displayscale</sender>
         <signal>textChanged(const QString&amp;)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
@@ -2364,12 +2017,6 @@
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
-    <connection>
-        <sender>height</sender>
-        <signal>textChanged(const QString&amp;)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
     <connection>
         <sender>heightUnit</sender>
         <signal>selectionChanged(LyXLength::UNIT)</signal>
@@ -2383,116 +2030,86 @@
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>lbXunit</sender>
-        <signal>activated(int)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>lbYunit</sender>
-        <signal>activated(int)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>rtXunit</sender>
-        <signal>activated(int)</signal>
-        <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
-    </connection>
-    <connection>
-        <sender>rtYXunit</sender>
-        <signal>activated(int)</signal>
+        <sender>displayCB</sender>
+        <signal>stateChanged(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>origin</sender>
-        <signal>activated(int)</signal>
+        <sender>draftCB</sender>
+        <signal>stateChanged(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>show</sender>
-        <signal>activated(int)</signal>
+        <sender>unzipCB</sender>
+        <signal>stateChanged(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displayscaleRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>displayscale</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>displaycustomRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>displaywidth</receiver>
-        <slot>setEnabled(bool)</slot>
-    </connection>
-    <connection>
-        <sender>displaycustomRB</sender>
+        <sender>displayCB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>displayheight</receiver>
+        <receiver>showCB</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>displayscaleRB</sender>
+        <sender>displayCB</sender>
         <signal>toggled(bool)</signal>
-        <receiver>TextLabel4_2_2</receiver>
+        <receiver>displayscale</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
-        <sender>displaycustomRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel7</receiver>
-        <slot>setEnabled(bool)</slot>
+        <sender>height</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displaycustomRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>displaywidthUnit</receiver>
-        <slot>setEnabled(bool)</slot>
+        <sender>height</sender>
+        <signal>returnPressed()</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displaycustomRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>displayheightUnit</receiver>
-        <slot>setEnabled(bool)</slot>
+        <sender>angle</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displaycustomRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>TextLabel7_2</receiver>
-        <slot>setEnabled(bool)</slot>
+        <sender>origin</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displaycustomRB</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>displayratioCB</receiver>
-        <slot>setEnabled(bool)</slot>
+        <sender>rtX</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displaycustomRB</sender>
-        <signal>stateChanged(int)</signal>
+        <sender>rtY</sender>
+        <signal>textChanged(const QString&amp;)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displayscaleRB</sender>
-        <signal>stateChanged(int)</signal>
+        <sender>lbY</sender>
+        <signal>textChanged(const QString&amp;)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
     <connection>
-        <sender>displayratioCB</sender>
-        <signal>stateChanged(int)</signal>
+        <sender>getPB</sender>
+        <signal>clicked()</signal>
         <receiver>QGraphicsDialogBase</receiver>
-        <slot>change_adaptor()</slot>
+        <slot>get_clicked()</slot>
     </connection>
     <connection>
-        <sender>displayscale</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <sender>getPB</sender>
+        <signal>clicked()</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>
@@ -2504,25 +2121,16 @@
     <tabstop>TabWidget</tabstop>
     <tabstop>filename</tabstop>
     <tabstop>browsePB</tabstop>
-    <tabstop>show</tabstop>
-    <tabstop>displaydefaultRB</tabstop>
-    <tabstop>displayscaleRB</tabstop>
-    <tabstop>displaycustomRB</tabstop>
+    <tabstop>displayCB</tabstop>
+    <tabstop>showCB</tabstop>
     <tabstop>displayscale</tabstop>
-    <tabstop>displaywidth</tabstop>
-    <tabstop>displaywidthUnit</tabstop>
-    <tabstop>displayheight</tabstop>
-    <tabstop>displayheightUnit</tabstop>
-    <tabstop>draft</tabstop>
-    <tabstop>restorePB</tabstop>
-    <tabstop>scaleRB</tabstop>
-    <tabstop>scale</tabstop>
-    <tabstop>defaultRB</tabstop>
     <tabstop>width</tabstop>
     <tabstop>widthUnit</tabstop>
     <tabstop>height</tabstop>
     <tabstop>heightUnit</tabstop>
     <tabstop>aspectratio</tabstop>
+    <tabstop>angle</tabstop>
+    <tabstop>origin</tabstop>
     <tabstop>lbX</tabstop>
     <tabstop>lbXunit</tabstop>
     <tabstop>lbY</tabstop>
@@ -2530,17 +2138,17 @@
     <tabstop>rtX</tabstop>
     <tabstop>rtXunit</tabstop>
     <tabstop>rtY</tabstop>
-    <tabstop>rtYXunit</tabstop>
+    <tabstop>rtYunit</tabstop>
     <tabstop>getPB</tabstop>
-    <tabstop>clip</tabstop>
-    <tabstop>angle</tabstop>
-    <tabstop>origin</tabstop>
-    <tabstop>latexoptions</tabstop>
     <tabstop>subfigure</tabstop>
     <tabstop>subcaption</tabstop>
+    <tabstop>latexoptions</tabstop>
+    <tabstop>draftCB</tabstop>
+    <tabstop>unzipCB</tabstop>
+    <tabstop>restorePB</tabstop>
     <tabstop>okPB</tabstop>
     <tabstop>applyPB</tabstop>
     <tabstop>closePB</tabstop>
-    <tabstop>customRB</tabstop>
+    <tabstop>clip</tabstop>
 </tabstops>
 </UI>
Repository for new features