add graphics dialog - not quite working

the controllers really do make this piss easy to do :))

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index bb4bd33d8ab6ad424112b8955d056fa2552b7647..ed2caa3e2c43960215d4133202ccda2496aebbd9 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,15 @@
+2001-08-28  John Levon  <moz@compsoc.man.ac.uk>
+
+       * ui/QCharacterDialog.ui:
+       * ui/QThesaurusDialog.ui: fix tab order
+
+       * QGraphics.[Ch]:
+       * QGraphicsDialog.[Ch]:
+       * ui/QGraphicsDialog.ui:
+       * Makefile.am:
+       * Makefile.dialogs:
+       * Dialogs.C: add graphics dialog
+ 
 2001-08-28  John Levon  <moz@compsoc.man.ac.uk>
 
        * QThesaurus.C: clear selection on update

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 6d57fcd392a9f37f8698e67e8b9f33090bf4ba26..3c313d843da076ed3300c0c5cf3cf24446283f15 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -20,6 +20,7 @@
 #include "QErrorDialog.h"
 #include "QERTDialog.h"
 #include "QExternalDialog.h"
+#include "QGraphicsDialog.h"
 #include "QIncludeDialog.h" 
 #include "QIndexDialog.h"
 #include "QRefDialog.h"
@@ -34,6 +35,7 @@
 #include "QError.h"
 #include "QERT.h"
 #include "QExternal.h"
+#include "QGraphics.h"
 #include "QInclude.h"
 #include "QIndex.h"
 #include "QParagraph.h"
@@ -60,6 +62,7 @@
 #include "controllers/ControlError.h"
 #include "controllers/ControlERT.h"
 #include "controllers/ControlExternal.h"
+#include "controllers/ControlGraphics.h"
 #include "controllers/ControlInclude.h"
 #include "controllers/ControlIndex.h"
 #include "controllers/ControlRef.h"
@@ -70,7 +73,6 @@
 #include "controllers/ControlButtons.h"
 #include "controllers/ControlCitation.h"
 #include "controllers/ControlFloat.h"
-#include "controllers/ControlGraphics.h"
 #include "controllers/ControlLabel.h"
 #include "controllers/ControlLog.h"
 #include "controllers/ControlMinipage.h"
@@ -103,6 +105,7 @@ Dialogs::Dialogs(LyXView * lv)
        add(new GUIError<QError, Qt2BC>(*lv, *this)); 
        add(new GUIERT<QERT, Qt2BC>(*lv, *this)); 
        add(new GUIExternal<QExternal, Qt2BC>(*lv, *this)); 
+       add(new GUIGraphics<QGraphics, Qt2BC>(*lv, *this));
        add(new GUIInclude<QInclude, Qt2BC>(*lv, *this)); 
        add(new GUIIndex<QIndex, Qt2BC>(*lv, *this));
        add(new GUIRef<QRef, Qt2BC>(*lv, *this));

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 20377d436a12591c482a1d8b94bc987cbae3fe04..37f17e1073c491a4620c964e2f9795ed992afcc4 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -25,7 +25,6 @@ libqt2_la_OBJADD = \
        ../xforms/FormBaseDeprecated.lo \
        ../xforms/FormBrowser.lo \
        ../xforms/FormDocument.lo \
-       ../xforms/FormGraphics.lo \
        ../xforms/FormIndex.lo \
        ../xforms/FormInset.lo \
        ../xforms/FormLog.lo \

diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt2/Makefile.dialogs
index 1ff2358a1079c054c3623ad1032356e84116cadb..15b80b36a65f2f23da599867bfee103e8693051c 100644 (file)
--- a/src/frontends/qt2/Makefile.dialogs
+++ b/src/frontends/qt2/Makefile.dialogs
@@ -10,6 +10,7 @@ DIALOGS = \
        QError \
        QERT \
        QExternal \
+       QGraphics \
        QInclude \
        QIndex \
        QParagraph \
@@ -41,6 +42,8 @@ DIALOGSOURCES = \
        QERT.C QERTDialog.C \
        QExternal.h QExternalDialog.h \
        QExternal.C QExternalDialog.C \
+       QGraphics.h QGraphicsDialog.h \
+       QGraphics.C QGraphicsDialog.C \
        QInclude.h QIncludeDialog.h \
        QInclude.C QIncludeDialog.C \
        QIndex.h QIndexDialog.h \
@@ -74,6 +77,7 @@ MOCDIALOGS = \
        QErrorDialog_moc.C \
        QERTDialog_moc.C \
        QExternalDialog_moc.C \
+       QGraphicsDialog_moc.C \
        QIncludeDialog_moc.C \
        QIndexDialog_moc.C \
        QParagraphDialog_moc.C \
@@ -105,6 +109,8 @@ UIDIALOGS = \
        QERTDialogBase.h \
        QExternalDialogBase.C \
        QExternalDialogBase.h \
+       QGraphicsDialogBase.C \
+       QGraphicsDialogBase.h \
        QIncludeDialogBase.h \
        QIncludeDialogBase.C \
        QIndexDialogBase.h \
@@ -136,6 +142,7 @@ UIMOCDIALOGS = \
        QErrorDialogBase_moc.C \
        QERTDialogBase_moc.C \
        QExternalDialogBase_moc.C \
+       QGraphicsDialogBase_moc.C \
        QIncludeDialogBase_moc.C \
        QIndexDialogBase_moc.C \
        QParagraphDialogBase_moc.C \

diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
new file mode 100644 (file)
index 0000000..40a8bc4
--- /dev/null
+++ b/src/frontends/qt2/QGraphics.C
@@ -0,0 +1,177 @@
+/**
+ * \file QGraphics.C
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "QGraphicsDialog.h"
+#include "ControlGraphics.h"
+#include "QGraphics.h"
+#include "Qt2BC.h"
+#include "gettext.h"
+#include "debug.h" 
+
+#include "support/lstrings.h"
+ 
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qcheckbox.h>
+#include <qradiobutton.h>
+#include <qcombobox.h>
+
+typedef Qt2CB<ControlGraphics, Qt2DB<QGraphicsDialog> > base_class;
+
+QGraphics::QGraphics(ControlGraphics & c)
+       : base_class(c, _("Graphics"))
+{
+}
+
+
+void QGraphics::build_dialog()
+{
+       dialog_.reset(new QGraphicsDialog(this));
+
+       bc().setOK(dialog_->okPB);
+       bc().setApply(dialog_->applyPB);
+       bc().setCancel(dialog_->closePB);
+       bc().addReadOnly(dialog_->filenameED);
+       bc().addReadOnly(dialog_->browsePB);
+       bc().addReadOnly(dialog_->widthED);
+       bc().addReadOnly(dialog_->widthCO);
+       bc().addReadOnly(dialog_->heightED);
+       bc().addReadOnly(dialog_->heightCO);
+       bc().addReadOnly(dialog_->scaleCB);
+       bc().addReadOnly(dialog_->rotateED);
+       bc().addReadOnly(dialog_->monochromeRB);
+       bc().addReadOnly(dialog_->grayscaleRB);
+       bc().addReadOnly(dialog_->colorRB);
+       bc().addReadOnly(dialog_->dontRB);
+       bc().addReadOnly(dialog_->subcaptionED);
+}
+
+
+namespace {
+       string const numtostr(double val) {
+               string a(tostr(val));
+               if (a == "0")
+                       a = "";
+               return a;
+       }
+} // namespace anon
+ 
+void QGraphics::update_contents()
+{
+       InsetGraphicsParams & igp = controller().params();
+
+       dialog_->filenameED->setText(igp.filename.c_str());
+ 
+       QRadioButton * button;
+ 
+       switch (igp.display) {
+               case InsetGraphicsParams::COLOR: button = dialog_->colorRB; break;
+               case InsetGraphicsParams::GRAYSCALE: button = dialog_->grayscaleRB; break;
+               case InsetGraphicsParams::MONOCHROME: button = dialog_->monochromeRB; break;
+               case InsetGraphicsParams::NONE: button = dialog_->dontRB; break;
+       }
+       button->setChecked(true);
+
+       int item = 0;
+       switch (igp.widthResize) {
+               case InsetGraphicsParams::INCH: item = 1; break;
+               case InsetGraphicsParams::PERCENT_PAGE: item = 2; break;
+               case InsetGraphicsParams::PERCENT_COLUMN: item = 3; break;
+               default: break;
+       }
+ 
+       dialog_->widthCO->setCurrentItem(item);
+ 
+       item = 0;
+       switch (igp.heightResize) {
+               case InsetGraphicsParams::INCH: item = 1; break;
+               case InsetGraphicsParams::PERCENT_PAGE: item = 2; break;
+               default: break;
+       }
+ 
+       dialog_->heightCO->setCurrentItem(item);
+ 
+       // FIXME: scale ???
+ 
+       dialog_->widthED->setText(numtostr(igp.widthSize).c_str());
+       dialog_->heightED->setText(numtostr(igp.heightSize).c_str());
+       dialog_->rotateED->setText(numtostr(igp.rotateAngle).c_str());
+ 
+       dialog_->subcaptionED->setText(igp.subcaptionText.c_str());
+}
+
+
+void QGraphics::apply()
+{
+       InsetGraphicsParams & igp = controller().params();
+ 
+       if (dialog_->colorRB->isChecked())
+               igp.display = InsetGraphicsParams::COLOR;
+       else if (dialog_->grayscaleRB->isChecked())
+               igp.display = InsetGraphicsParams::GRAYSCALE;
+       else if (dialog_->monochromeRB->isChecked())
+               igp.display = InsetGraphicsParams::MONOCHROME;
+       else
+               igp.display = InsetGraphicsParams::NONE;
+        
+       igp.subcaptionText = dialog_->subcaptionED->text().latin1();
+       igp.subcaption = !igp.subcaptionText.empty();
+
+       switch (dialog_->widthCO->currentItem()) {
+               case 0: igp.widthResize = InsetGraphicsParams::CM; break;
+               case 1: igp.widthResize = InsetGraphicsParams::INCH; break;
+               case 2: igp.widthResize = InsetGraphicsParams::PERCENT_PAGE; break;
+               case 3: igp.widthResize = InsetGraphicsParams::PERCENT_COLUMN; break;
+               default:;
+       }
+       if (string(dialog_->widthED->text().latin1()).empty()) {
+               igp.widthResize = InsetGraphicsParams::DEFAULT_SIZE;
+               igp.widthSize = 0.0; 
+       } else {
+               igp.widthSize = strToDbl(dialog_->widthED->text().latin1());
+       }
+ 
+       switch (dialog_->heightCO->currentItem()) {
+               case 0: igp.heightResize = InsetGraphicsParams::CM; break;
+               case 1: igp.heightResize = InsetGraphicsParams::INCH; break;
+               case 2: igp.heightResize = InsetGraphicsParams::PERCENT_PAGE; break;
+               default:;
+       }
+       if (string(dialog_->heightED->text().latin1()).empty()) {
+               igp.heightResize = InsetGraphicsParams::DEFAULT_SIZE;
+               igp.heightSize = 0.0; 
+       } else {
+               igp.heightSize = strToDbl(dialog_->heightED->text().latin1());
+       } 
+
+       // FIXME: scale ??? 
+
+       igp.rotateAngle = strToDbl(dialog_->rotateED->text().latin1());
+
+       igp.filename = dialog_->filenameED->text().latin1();
+}
+
+
+void QGraphics::browse()
+{
+       string const & name = controller().Browse(dialog_->filenameED->text().latin1());
+       if (!name.empty())
+               dialog_->filenameED->setText(name.c_str()); 
+}
+
+
+bool QGraphics::isValid()
+{
+       return !string(dialog_->filenameED->text().latin1()).empty();
+}

diff --git a/src/frontends/qt2/QGraphics.h b/src/frontends/qt2/QGraphics.h
new file mode 100644 (file)
index 0000000..75253a7
--- /dev/null
+++ b/src/frontends/qt2/QGraphics.h
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+/**
+ * \file QGraphics.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#ifndef QGRAPHICS_H
+#define QGRAPHICS_H
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "Qt2Base.h"
+#include "insets/insetgraphics.h" 
+
+class ControlGraphics;
+class QGraphicsDialog;
+
+///
+class QGraphics
+       : public Qt2CB<ControlGraphics, Qt2DB<QGraphicsDialog> > 
+{
+public:
+       ///
+       friend class QGraphicsDialog;
+       ///
+       QGraphics(ControlGraphics &);
+
+protected:
+       virtual bool isValid();
+ 
+private:
+       /// Apply changes
+       virtual void apply();
+       /// update
+       virtual void update_contents();
+       /// build the dialog
+       virtual void build_dialog();
+
+       /// browse for a file
+       void browse(); 
+};
+
+#endif // QGRAPHICS_H

diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C
new file mode 100644 (file)
index 0000000..51fc951
--- /dev/null
+++ b/src/frontends/qt2/QGraphicsDialog.C
@@ -0,0 +1,53 @@
+/**
+ * \file QGraphicsDialog.C
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#include <config.h>
+#include <vector>
+
+#include <qwidget.h>
+#include <qpushbutton.h>
+#include <qcheckbox.h>
+
+#include "LString.h" 
+ 
+#include "QGraphicsDialog.h"
+#include "ControlGraphics.h" 
+#include "Dialogs.h"
+#include "QGraphics.h"
+#include "debug.h" 
+
+QGraphicsDialog::QGraphicsDialog(QGraphics * form)
+       : QGraphicsDialogBase(0, 0, false, 0),
+       form_(form)
+{
+       connect(okPB, SIGNAL(clicked()),
+               form, SLOT(slotOK()));
+       connect(applyPB, SIGNAL(clicked()),
+               form, SLOT(slotOK()));
+       connect(closePB, SIGNAL(clicked()),
+               form, SLOT(slotClose()));
+}
+
+ 
+void QGraphicsDialog::change_adaptor()
+{
+       form_->changed();
+}
+
+ 
+void QGraphicsDialog::closeEvent(QCloseEvent * e)
+{
+       form_->slotWMHide();
+       e->accept();
+}
+
+
+void QGraphicsDialog::browseClicked()
+{
+       form_->browse();
+}

diff --git a/src/frontends/qt2/QGraphicsDialog.h b/src/frontends/qt2/QGraphicsDialog.h
new file mode 100644 (file)
index 0000000..1135c7f
--- /dev/null
+++ b/src/frontends/qt2/QGraphicsDialog.h
@@ -0,0 +1,35 @@
+/**
+ * \file QGraphicsDialog.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#ifndef QGRAPHICSDIALOG_H
+#define QGRAPHICSDIALOG_H
+ 
+#include <config.h>
+ 
+#include "ui/QGraphicsDialogBase.h"
+
+class QGraphics;
+
+class QGraphicsDialog : public QGraphicsDialogBase
+{ Q_OBJECT
+
+public:
+       QGraphicsDialog(QGraphics * form);
+
+protected slots:
+       virtual void change_adaptor();
+       virtual void browseClicked();
+
+protected:
+       virtual void closeEvent(QCloseEvent * e);
+
+private:
+       QGraphics * form_;
+};
+
+#endif // QGRAPHICSDIALOG_H

diff --git a/src/frontends/qt2/ui/QCharacterDialog.ui b/src/frontends/qt2/ui/QCharacterDialog.ui
index e9180c97fa2a4f03d2c0e31ad79798d448500765..99afb11d2cb44ff2c6177f4ee224e8b8a3da8fe0 100644 (file)
--- a/src/frontends/qt2/ui/QCharacterDialog.ui
+++ b/src/frontends/qt2/ui/QCharacterDialog.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>372</width>
+            <width>368</width>
             <height>256</height>
         </rect>
     </property>
@@ -576,8 +576,9 @@
     <tabstop>toggleallCB</tabstop>
     <tabstop>sizeCO</tabstop>
     <tabstop>miscCO</tabstop>
-    <tabstop>applyPB</tabstop>
+    <tabstop>autoapplyCB</tabstop>
     <tabstop>okPB</tabstop>
+    <tabstop>applyPB</tabstop>
     <tabstop>closePB</tabstop>
 </tabstops>
 </UI>

diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialog.ui
new file mode 100644 (file)
index 0000000..f617ea8
--- /dev/null
+++ b/src/frontends/qt2/ui/QGraphicsDialog.ui
@@ -0,0 +1,1022 @@
+<!DOCTYPE UI><UI>
+<class>QGraphicsDialogBase</class>
+<include location="global">config.h</include>
+<include location="local">gettext.h</include>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>QGraphicsDialogBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>348</width>
+            <height>368</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Graphics</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>Layout12</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>Layout7</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>filenameLA</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Filename</string>
+                            </property>
+                            <property>
+                                <name>buddy</name>
+                                <cstring>filenameED</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string></string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLineEdit</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>filenameED</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>File name to include</string>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer10</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>
+                    </vbox>
+                </widget>
+                <widget>
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout11</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>QPushButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>browsePB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Browse ...</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Select a file</string>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer11</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>
+                    </vbox>
+                </widget>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout10</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>QGroupBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>parametersGB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>title</name>
+                        <string>Graphics parameters</string>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>11</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer3_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>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>Layout4</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>widthLA</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Width</string>
+                                    </property>
+                                    <property>
+                                        <name>buddy</name>
+                                        <cstring>widthED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Width of graphics</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QLineEdit</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>widthED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Width of graphics</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QComboBox</class>
+                                    <item>
+                                        <property>
+                                            <name>text</name>
+                                            <string>cm</string>
+                                        </property>
+                                    </item>
+                                    <item>
+                                        <property>
+                                            <name>text</name>
+                                            <string>inches</string>
+                                        </property>
+                                    </item>
+                                    <item>
+                                        <property>
+                                            <name>text</name>
+                                            <string>% of page</string>
+                                        </property>
+                                    </item>
+                                    <item>
+                                        <property>
+                                            <name>text</name>
+                                            <string>% of column</string>
+                                        </property>
+                                    </item>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>widthCO</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>sizePolicy</name>
+                                        <sizepolicy>
+                                            <hsizetype>3</hsizetype>
+                                            <vsizetype>0</vsizetype>
+                                        </sizepolicy>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Width units</string>
+                                    </property>
+                                </widget>
+                            </hbox>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer4_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>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>Layout6</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>heightLA</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Height</string>
+                                    </property>
+                                    <property>
+                                        <name>buddy</name>
+                                        <cstring>heightED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Height of graphics</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QLineEdit</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>heightED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Height of graphics</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QComboBox</class>
+                                    <item>
+                                        <property>
+                                            <name>text</name>
+                                            <string>cm</string>
+                                        </property>
+                                    </item>
+                                    <item>
+                                        <property>
+                                            <name>text</name>
+                                            <string>inches</string>
+                                        </property>
+                                    </item>
+                                    <item>
+                                        <property>
+                                            <name>text</name>
+                                            <string>% of page</string>
+                                        </property>
+                                    </item>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>heightCO</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>sizePolicy</name>
+                                        <sizepolicy>
+                                            <hsizetype>3</hsizetype>
+                                            <vsizetype>0</vsizetype>
+                                        </sizepolicy>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Height units</string>
+                                    </property>
+                                </widget>
+                            </hbox>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer5_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>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>Layout14</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>scaleCB</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>Sca&amp;le Height</string>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>FIXME</string>
+                                    </property>
+                                </widget>
+                                <spacer>
+                                    <property>
+                                        <name>name</name>
+                                        <cstring>Spacer11_2</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>Spacer10_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>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>Layout9</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>rotateLA</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Rotation</string>
+                                    </property>
+                                    <property>
+                                        <name>buddy</name>
+                                        <cstring>rotateED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>FIXME</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QLineEdit</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>rotateED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>FIXME</string>
+                                    </property>
+                                </widget>
+                                <spacer>
+                                    <property>
+                                        <name>name</name>
+                                        <cstring>Spacer2</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>Spacer6_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>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>Layout7</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>subcaptionLA</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Subcaption</string>
+                                    </property>
+                                    <property>
+                                        <name>buddy</name>
+                                        <cstring>subcaptionED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>The sub-caption of the figure</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QLineEdit</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>subcaptionED</cstring>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>The sub-caption for the figure</string>
+                                    </property>
+                                </widget>
+                            </vbox>
+                        </widget>
+                    </vbox>
+                </widget>
+                <widget>
+                    <class>QButtonGroup</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>displayBG</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>title</name>
+                        <string>LyX display</string>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>7</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>11</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer7</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>QRadioButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>monochromeRB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Monochrome</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>FIXME</string>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer4</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>QRadioButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>grayscaleRB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Grayscale</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>FIXME</string>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer5</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>QRadioButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>colorRB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Color</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>FIXME</string>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer6</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>QRadioButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>dontRB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Don't display</string>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>FIXME</string>
+                            </property>
+                        </widget>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer1</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>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout13</cstring>
+            </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>Spacer3</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>okPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;OK</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>applyPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Apply</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>closePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Close</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+    </vbox>
+</widget>
+<connections>
+    <connection>
+        <sender>grayscaleRB</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>colorRB</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>filenameED</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>browsePB</sender>
+        <signal>clicked()</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>browseClicked()</slot>
+    </connection>
+    <connection>
+        <sender>monochromeRB</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>dontRB</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>heightCO</sender>
+        <signal>highlighted(int)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>heightED</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>widthED</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>widthCO</sender>
+        <signal>highlighted(int)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>rotateED</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <connection>
+        <sender>subcaptionED</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>QGraphicsDialogBase</receiver>
+        <slot>change_adaptor()</slot>
+    </connection>
+    <slot access="public">browseClicked()</slot>
+    <slot access="public">change_adaptor()</slot>
+</connections>
+<tabstops>
+    <tabstop>filenameED</tabstop>
+    <tabstop>browsePB</tabstop>
+    <tabstop>widthED</tabstop>
+    <tabstop>widthCO</tabstop>
+    <tabstop>heightED</tabstop>
+    <tabstop>heightCO</tabstop>
+    <tabstop>scaleCB</tabstop>
+    <tabstop>rotateED</tabstop>
+    <tabstop>subcaptionED</tabstop>
+    <tabstop>monochromeRB</tabstop>
+    <tabstop>grayscaleRB</tabstop>
+    <tabstop>colorRB</tabstop>
+    <tabstop>dontRB</tabstop>
+    <tabstop>okPB</tabstop>
+    <tabstop>applyPB</tabstop>
+    <tabstop>closePB</tabstop>
+</tabstops>
+</UI>

diff --git a/src/frontends/qt2/ui/QThesaurusDialog.ui b/src/frontends/qt2/ui/QThesaurusDialog.ui
index 501c4b1174d1e8e9dc16abc64804a3dd2ad7c06e..0f3b3e4cbc150d33e6046f4704315a364d96405a 100644 (file)
--- a/src/frontends/qt2/ui/QThesaurusDialog.ui
+++ b/src/frontends/qt2/ui/QThesaurusDialog.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>482</width>
+            <width>478</width>
             <height>442</height>
         </rect>
     </property>
@@ -80,6 +80,13 @@
                         <name>name</name>
                         <cstring>Spacer2</cstring>
                     </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>1</vsizetype>
+                        </sizepolicy>
+                    </property>
                     <property stdset="1">
                         <name>orientation</name>
                         <enum>Horizontal</enum>
@@ -474,8 +481,8 @@
     <slot access="public">selectionChanged(const QString &amp;)</slot>
 </connections>
 <tabstops>
-    <tabstop>TabWidget2</tabstop>
     <tabstop>entryED</tabstop>
+    <tabstop>TabWidget2</tabstop>
     <tabstop>nounsLB</tabstop>
     <tabstop>verbsLB</tabstop>
     <tabstop>adjectivesLB</tabstop>