add showfile dialog to qt2 frontend

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index e6cea762c999bf8726d93d8f057a0c049dc0d6df..459c1f6d368b1cee651691af2aa1138c0982812d 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,15 @@
+2002-01-29  Edwin Leuven  <leuven@fee.uva.nl>
+
+       * Makefile.am:
+       * Dialogs.C:
+       * Makefile.dialogs:
+       * QShowFile.h:
+       * QShowFile.C:
+       * QShowFileDialog.h:
+       * QShowFileDialog.C:
+       * ui/QShowFileDialog.ui: add showfile dialog
+       * ui/QCitationDialog.ui: minor layout tweaks
+
 2002-01-25  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * Dialogs.C: removed now redundant #include "QParagraph.h".

diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C
index 30880a906685e460a0d01b5b4493a82a75ebc7e6..c4a0c7dea99a1fe7089118937da935a1587deb77 100644 (file)
--- a/src/frontends/qt2/Dialogs.C
+++ b/src/frontends/qt2/Dialogs.C
@@ -30,6 +30,7 @@
 #include "QPrintDialog.h"
 #include "QRefDialog.h"
 #include "QSearchDialog.h"
+#include "QShowFileDialog.h"
 #include "QSpellcheckerDialog.h"
 #include "QTabularCreateDialog.h"
 #include "QTexinfoDialog.h"
@@ -56,6 +57,7 @@
 #include "QPrint.h"
 #include "QRef.h"
 #include "QSearch.h"
+#include "QShowFile.h"
 #include "QSpellchecker.h"
 #include "QTabularCreate.h"
 #include "QTexinfo.h"
@@ -71,11 +73,9 @@
 #include "Qt2BC.h"
 
 // xforms stuff
-#include "xforms/FormBrowser.h"
-#include "xforms/form_browser.h"
-#include "xforms/FormDocument.h"
+//#include "xforms/FormDocument.h"
 #include "xforms/FormMathsPanel.h"
-#include "xforms/FormParagraph.h"
+//#include "xforms/FormParagraph.h"
 #include "xforms/FormPreferences.h"
 #include "xforms/FormShowFile.h"
 #include "xforms/FormTabular.h"
@@ -107,6 +107,7 @@ Dialogs::Dialogs(LyXView * lv)
        add(new GUIPrint<QPrint, Qt2BC>(*lv, *this));
        add(new GUIRef<QRef, Qt2BC>(*lv, *this));
        add(new GUISearch<QSearch, Qt2BC>(*lv, *this)); 
+       add(new GUIShowFile<QShowFile, Qt2BC>(*lv, *this));
        add(new GUISpellchecker<QSpellchecker, Qt2BC>(*lv, *this));
        add(new GUITabularCreate<QTabularCreate, Qt2BC>(*lv, *this));
        add(new GUITexinfo<QTexinfo, Qt2BC>(*lv, *this));
@@ -115,13 +116,10 @@ Dialogs::Dialogs(LyXView * lv)
        add(new GUIUrl<QURL, Qt2BC>(*lv, *this));
        add(new GUIVCLog<QVCLog, Qt2BC>(*lv, *this));
 
-       // dialogs not yet converted
-       add(new GUIShowFile<FormShowFile, xformsBC>(*lv, *this));
-
        // dialogs not yet MVCd
-       add(new FormDocument(lv, this));
+//     add(new FormDocument(lv, this));
        add(new FormMathsPanel(lv, this));
-       add(new FormParagraph(lv, this));
+//     add(new FormParagraph(lv, this));
        add(new FormPreferences(lv, this));
        add(new FormTabular(lv, this));
  

diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 6d2572b328dd46c4eff4aec20fd7bab5f0c451b8..65ab5d7b73411a6f3db72f08e18ad1a8b7f60fec 100644 (file)
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -24,7 +24,6 @@ libqt2_la_LIBADD = \
        ../xforms/DropDown.lo \
        ../xforms/FormBase.lo \
        ../xforms/FormBaseDeprecated.lo \
-       ../xforms/FormBrowser.lo \
        ../xforms/FormMathsBitmap.lo \
        ../xforms/FormMathsDeco.lo \
        ../xforms/FormMathsDelim.lo \
@@ -32,19 +31,14 @@ libqt2_la_LIBADD = \
        ../xforms/FormMathsPanel.lo \
        ../xforms/FormMathsStyle.lo \
        ../xforms/FormMathsSpace.lo \
-       ../xforms/FormParagraph.lo \
        ../xforms/FormPreferences.lo \
-       ../xforms/FormShowFile.lo \
        ../xforms/FormTabular.lo \
-       ../xforms/FormDocument.lo \
        ../xforms/FormInset.lo \
        ../xforms/MathsSymbols.lo \
        ../xforms/Menubar_pimpl.lo \
        ../xforms/RadioButtonGroup.lo \
        ../xforms/Toolbar_pimpl.lo \
        ../xforms/bmtable.lo \
-       ../xforms/form_browser.lo \
-       ../xforms/form_document.lo \
        ../xforms/form_preferences.lo \
        ../xforms/form_tabular.lo \
        ../xforms/form_maths_deco.lo \
@@ -53,7 +47,6 @@ libqt2_la_LIBADD = \
        ../xforms/form_maths_panel.lo \
        ../xforms/form_maths_space.lo \
        ../xforms/form_maths_style.lo \
-       ../xforms/form_paragraph.lo \
        ../xforms/input_validators.lo \
        ../xforms/xformsBC.lo \
        ../xforms/xforms_helpers.lo \

diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt2/Makefile.dialogs
index 468fc246f6857b8101153e6cc68f7aebad86060c..bedd976d50af90acd5757deb8b5261f93102ae3b 100644 (file)
--- a/src/frontends/qt2/Makefile.dialogs
+++ b/src/frontends/qt2/Makefile.dialogs
@@ -19,6 +19,7 @@ DIALOGS = \
        QPrint \
        QRef \
        QSearch \
+       QShowFile \
        QSpellchecker \
        QTabularCreate \
        QTexinfo \
@@ -64,6 +65,8 @@ DIALOGSOURCES = \
        QRef.C QRefDialog.C \
        QSearch.h QSearchDialog.h \
        QSearch.C QSearchDialog.C \
+       QShowFile.h QShowFileDialog.h \
+       QShowFile.C QShowFileDialog.C \
        QSpellchecker.h QSpellcheckerDialog.h \
        QSpellchecker.C QSpellcheckerDialog.C \
        QTabularCreate.h QTabularCreateDialog.h \
@@ -98,6 +101,7 @@ MOCDIALOGS = \
        QPrintDialog_moc.C \
        QRefDialog_moc.C \
        QSearchDialog_moc.C \
+       QShowFileDialog_moc.C \
        QSpellcheckerDialog_moc.C \
        QTabularCreateDialog_moc.C \
        QTexinfoDialog_moc.C \
@@ -143,6 +147,8 @@ UIDIALOGS = \
        QRefDialogBase.C \
        QSearchDialogBase.h \
        QSearchDialogBase.C \
+       QShowFileDialogBase.h \
+       QShowFileDialogBase.C \
        QSpellcheckerDialogBase.h \
        QSpellcheckerDialogBase.C \
        QTabularCreateDialogBase.h \
@@ -177,6 +183,7 @@ UIMOCDIALOGS = \
        QPrintDialogBase_moc.C \
        QRefDialogBase_moc.C \
        QSearchDialogBase_moc.C \
+       QShowFileDialogBase_moc.C \
        QSpellcheckerDialogBase_moc.C \
        QTabularCreateDialogBase_moc.C \
        QTexinfoDialogBase_moc.C \

diff --git a/src/frontends/qt2/QShowFile.C b/src/frontends/qt2/QShowFile.C
new file mode 100644 (file)
index 0000000..fc944dc
--- /dev/null
+++ b/src/frontends/qt2/QShowFile.C
@@ -0,0 +1,48 @@
+/**
+ * \file QShowFile.C
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#include <config.h>
+
+#include "QShowFileDialog.h"
+#include "ControlShowFile.h"
+#include "QShowFile.h"
+#include "Qt2BC.h"
+#include "gettext.h"
+
+#include <qtextview.h>
+#include <qpushbutton.h>
+
+typedef Qt2CB<ControlShowFile, Qt2DB<QShowFileDialog> > base_class;
+ 
+QShowFile::QShowFile(ControlShowFile & c)
+       : base_class(c, _("ShowFile"))
+{
+}
+
+
+void QShowFile::build_dialog()
+{
+       dialog_.reset(new QShowFileDialog(this));
+
+       bc().setCancel(dialog_->closePB);
+}
+
+ 
+void QShowFile::update_contents()
+{
+       dialog_->setName(controller().getFileName().c_str());
+
+       string contents = controller().getFileContents();
+       if (contents.empty()) {
+               contents = "Error -> Cannot load file!";
+       }
+
+       dialog_->text->setText(contents.c_str());
+}
+
+

diff --git a/src/frontends/qt2/QShowFile.h b/src/frontends/qt2/QShowFile.h
new file mode 100644 (file)
index 0000000..8838f44
--- /dev/null
+++ b/src/frontends/qt2/QShowFile.h
@@ -0,0 +1,35 @@
+// -*- C++ -*-
+/**
+ * \file QShowFile.h
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#ifndef QSHOWFILE_H
+#define QSHOWFILE_H
+
+#include "Qt2Base.h"
+
+class ControlShowFile;
+class QShowFileDialog;
+
+class QShowFile :
+       public Qt2CB<ControlShowFile, Qt2DB<QShowFileDialog> > 
+{
+       friend class QShowFileDialog;
+ 
+public: 
+       QShowFile(ControlShowFile &);
+
+private: 
+       /// Apply changes
+       virtual void apply() {};
+       /// update
+       virtual void update_contents();
+       /// build the dialog
+       virtual void build_dialog();
+};
+
+#endif // QSHOWFILE_H

diff --git a/src/frontends/qt2/QShowFileDialog.C b/src/frontends/qt2/QShowFileDialog.C
new file mode 100644 (file)
index 0000000..2d64f7b
--- /dev/null
+++ b/src/frontends/qt2/QShowFileDialog.C
@@ -0,0 +1,29 @@
+/**
+ * \file QShowFileDialog.C
+ * Copyright 2001 the LyX Team
+ * Read the file COPYING
+ *
+ * \author John Levon <moz@compsoc.man.ac.uk>
+ */
+
+#include "QShowFileDialog.h"
+#include "Dialogs.h"
+#include "QShowFile.h"
+
+#include <qwidget.h>
+#include <qpushbutton.h>
+
+QShowFileDialog::QShowFileDialog(QShowFile * form)
+       : QShowFileDialogBase(0, 0, false, 0),
+       form_(form)
+{
+       connect(closePB, SIGNAL(clicked()),
+               form, SLOT(slotClose()));
+}
+
+ 
+void QShowFileDialog::closeEvent(QCloseEvent * e)
+{
+       form_->slotWMHide();
+       e->accept();
+}

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

diff --git a/src/frontends/qt2/ui/QCitationDialog.ui b/src/frontends/qt2/ui/QCitationDialog.ui
index c51a9a501d935d84660e4e202e6287b7b3da8229..a423d474a507b6963ee46906a04e9edcd9c9c7a1 100644 (file)
--- a/src/frontends/qt2/ui/QCitationDialog.ui
+++ b/src/frontends/qt2/ui/QCitationDialog.ui
@@ -13,15 +13,15 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>522</width>
-            <height>365</height>
+            <width>509</width>
+            <height>351</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Citation</string>
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
@@ -30,13 +30,154 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget>
+        <widget row="4"  column="0"  rowspan="1"  colspan="3" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout17</cstring>
+                <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>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>restorePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Restore</string>
+                    </property>
+                </widget>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer4</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>OK</string>
+                    </property>
+                    <property stdset="1">
+                        <name>autoDefault</name>
+                        <bool>true</bool>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>false</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>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>closePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Cancel</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+        <widget row="3"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>textAfterLA</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Text after</string>
+            </property>
+        </widget>
+        <widget row="1"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>citationStyleLA</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Citation style</string>
+            </property>
+        </widget>
+        <widget row="1"  column="1" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>citationStyleCO</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string>Natbib citation style to use</string>
+            </property>
+        </widget>
+        <widget row="2"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>textBeforeLA</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Text before</string>
+            </property>
+        </widget>
+        <widget row="0"  column="2" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout16</cstring>
+            </property>
+            <vbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -49,9 +190,9 @@
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout24</cstring>
+                        <cstring>Layout13</cstring>
                     </property>
-                    <grid>
+                    <vbox>
                         <property stdset="1">
                             <name>margin</name>
                             <number>0</number>
@@ -60,211 +201,79 @@
                             <name>spacing</name>
                             <number>6</number>
                         </property>
-                        <widget row="1"  column="1" >
-                            <class>QLayoutWidget</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>Layout1</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>addPB</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>sizePolicy</name>
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                        </sizepolicy>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string></string>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>pixmap</name>
-                                        <pixmap>image0</pixmap>
-                                    </property>
-                                    <property>
-                                        <name>toolTip</name>
-                                        <string>Add the selected citation</string>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QPushButton</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>delPB</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>sizePolicy</name>
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                        </sizepolicy>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string></string>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>pixmap</name>
-                                        <pixmap>image1</pixmap>
-                                    </property>
-                                    <property>
-                                        <name>toolTip</name>
-                                        <string>Remove the selected citation</string>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QPushButton</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>upPB</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>sizePolicy</name>
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                        </sizepolicy>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string></string>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>pixmap</name>
-                                        <pixmap>image2</pixmap>
-                                    </property>
-                                    <property>
-                                        <name>toolTip</name>
-                                        <string>Move the selected citation up</string>
-                                    </property>
-                                </widget>
-                                <widget>
-                                    <class>QPushButton</class>
-                                    <property stdset="1">
-                                        <name>name</name>
-                                        <cstring>downPB</cstring>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>sizePolicy</name>
-                                        <sizepolicy>
-                                            <hsizetype>0</hsizetype>
-                                            <vsizetype>0</vsizetype>
-                                        </sizepolicy>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>text</name>
-                                        <string></string>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>pixmap</name>
-                                        <pixmap>image3</pixmap>
-                                    </property>
-                                    <property>
-                                        <name>toolTip</name>
-                                        <string>Move the selected citation down</string>
-                                    </property>
-                                </widget>
-                            </vbox>
-                        </widget>
-                        <widget row="0"  column="2" >
+                        <widget>
                             <class>QLabel</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>bibliographyKeysLA</cstring>
+                                <cstring>infoLA</cstring>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Bibliography keys</string>
+                                <string>Info</string>
                             </property>
                         </widget>
-                        <widget row="0"  column="0" >
-                            <class>QLabel</class>
+                        <widget>
+                            <class>QMultiLineEdit</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>insetKeysLA</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Inset keys</string>
+                                <cstring>infoML</cstring>
                             </property>
-                        </widget>
-                        <widget row="1"  column="2" >
-                            <class>QListBox</class>
-                            <item>
-                                <property>
-                                    <name>text</name>
-                                    <string>New Item</string>
-                                </property>
-                            </item>
                             <property stdset="1">
-                                <name>name</name>
-                                <cstring>bibLB</cstring>
-                            </property>
-                            <property>
-                                <name>toolTip</name>
-                                <string>Available citation keys</string>
+                                <name>focusPolicy</name>
+                                <enum>NoFocus</enum>
                             </property>
-                        </widget>
-                        <widget row="1"  column="0" >
-                            <class>QListBox</class>
-                            <item>
-                                <property>
-                                    <name>text</name>
-                                    <string>New Item</string>
-                                </property>
-                            </item>
                             <property stdset="1">
-                                <name>name</name>
-                                <cstring>citeLB</cstring>
+                                <name>wordWrap</name>
+                                <enum>WidgetWidth</enum>
                             </property>
                             <property stdset="1">
-                                <name>selectionMode</name>
-                                <enum>Single</enum>
+                                <name>readOnly</name>
+                                <bool>true</bool>
                             </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>Citations currently selected</string>
+                                <string>Citation entry</string>
                             </property>
                         </widget>
-                    </grid>
+                    </vbox>
                 </widget>
                 <widget>
-                    <class>QLayoutWidget</class>
+                    <class>QGroupBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout16</cstring>
+                        <cstring>GroupBox4</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>title</name>
+                        <string>Search</string>
                     </property>
                     <vbox>
                         <property stdset="1">
                             <name>margin</name>
-                            <number>0</number>
+                            <number>11</number>
                         </property>
                         <property stdset="1">
                             <name>spacing</name>
                             <number>6</number>
                         </property>
+                        <widget>
+                            <class>QLineEdit</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>searchED</cstring>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Search the available citations</string>
+                            </property>
+                        </widget>
                         <widget>
                             <class>QLayoutWidget</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>Layout13</cstring>
+                                <cstring>Layout37</cstring>
                             </property>
-                            <vbox>
+                            <hbox>
                                 <property stdset="1">
                                     <name>margin</name>
                                     <number>0</number>
@@ -274,212 +283,129 @@
                                     <number>6</number>
                                 </property>
                                 <widget>
-                                    <class>QLabel</class>
+                                    <class>QCheckBox</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>infoLA</cstring>
+                                        <cstring>searchTypeCB</cstring>
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string>Info</string>
+                                        <string>Regular E&amp;xpression</string>
+                                    </property>
+                                    <property>
+                                        <name>toolTip</name>
+                                        <string>Interpret search entry as a regular expression</string>
                                     </property>
                                 </widget>
-                                <widget>
-                                    <class>QMultiLineEdit</class>
-                                    <property stdset="1">
+                                <spacer>
+                                    <property>
                                         <name>name</name>
-                                        <cstring>infoML</cstring>
+                                        <cstring>Spacer2_2</cstring>
                                     </property>
                                     <property stdset="1">
-                                        <name>focusPolicy</name>
-                                        <enum>NoFocus</enum>
+                                        <name>orientation</name>
+                                        <enum>Horizontal</enum>
                                     </property>
                                     <property stdset="1">
-                                        <name>wordWrap</name>
-                                        <enum>WidgetWidth</enum>
+                                        <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>readOnly</name>
-                                        <bool>true</bool>
+                                        <name>name</name>
+                                        <cstring>previousPB</cstring>
                                     </property>
-                                    <property>
-                                        <name>toolTip</name>
-                                        <string>Citation entry</string>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Previous</string>
                                     </property>
                                 </widget>
-                            </vbox>
+                            </hbox>
                         </widget>
                         <widget>
-                            <class>QGroupBox</class>
+                            <class>QLayoutWidget</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>GroupBox4</cstring>
+                                <cstring>Layout38</cstring>
                             </property>
-                            <property stdset="1">
-                                <name>title</name>
-                                <string>Search</string>
-                            </property>
-                            <vbox>
+                            <hbox>
                                 <property stdset="1">
                                     <name>margin</name>
-                                    <number>11</number>
+                                    <number>0</number>
                                 </property>
                                 <property stdset="1">
                                     <name>spacing</name>
                                     <number>6</number>
                                 </property>
                                 <widget>
-                                    <class>QLineEdit</class>
+                                    <class>QCheckBox</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>searchED</cstring>
+                                        <cstring>searchCaseCB</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Case sensitive</string>
                                     </property>
                                     <property>
                                         <name>toolTip</name>
-                                        <string>Search the available citations</string>
+                                        <string>Make the search case-sensitive</string>
                                     </property>
                                 </widget>
-                                <widget>
-                                    <class>QLayoutWidget</class>
-                                    <property stdset="1">
+                                <spacer>
+                                    <property>
                                         <name>name</name>
-                                        <cstring>Layout37</cstring>
+                                        <cstring>Spacer3_2</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>searchTypeCB</cstring>
-                                            </property>
-                                            <property stdset="1">
-                                                <name>text</name>
-                                                <string>Regular E&amp;xpression</string>
-                                            </property>
-                                            <property>
-                                                <name>toolTip</name>
-                                                <string>Interpret search entry as a regular expression</string>
-                                            </property>
-                                        </widget>
-                                        <spacer>
-                                            <property>
-                                                <name>name</name>
-                                                <cstring>Spacer2_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>
-                                        <widget>
-                                            <class>QPushButton</class>
-                                            <property stdset="1">
-                                                <name>name</name>
-                                                <cstring>previousPB</cstring>
-                                            </property>
-                                            <property stdset="1">
-                                                <name>text</name>
-                                                <string>&amp;Previous</string>
-                                            </property>
-                                        </widget>
-                                    </hbox>
-                                </widget>
+                                    <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>QLayoutWidget</class>
+                                    <class>QPushButton</class>
                                     <property stdset="1">
                                         <name>name</name>
-                                        <cstring>Layout38</cstring>
+                                        <cstring>nextPB</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>&amp;Next</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>QCheckBox</class>
-                                            <property stdset="1">
-                                                <name>name</name>
-                                                <cstring>searchCaseCB</cstring>
-                                            </property>
-                                            <property stdset="1">
-                                                <name>text</name>
-                                                <string>&amp;Case sensitive</string>
-                                            </property>
-                                            <property>
-                                                <name>toolTip</name>
-                                                <string>Make the search case-sensitive</string>
-                                            </property>
-                                        </widget>
-                                        <spacer>
-                                            <property>
-                                                <name>name</name>
-                                                <cstring>Spacer3_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>
-                                        <widget>
-                                            <class>QPushButton</class>
-                                            <property stdset="1">
-                                                <name>name</name>
-                                                <cstring>nextPB</cstring>
-                                            </property>
-                                            <property stdset="1">
-                                                <name>text</name>
-                                                <string>&amp;Next</string>
-                                            </property>
-                                        </widget>
-                                    </hbox>
                                 </widget>
-                            </vbox>
+                            </hbox>
                         </widget>
                     </vbox>
                 </widget>
-            </hbox>
+            </vbox>
         </widget>
-        <widget>
+        <widget row="0"  column="0"  rowspan="1"  colspan="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout18</cstring>
+                <cstring>Layout24</cstring>
             </property>
-            <hbox>
+            <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -488,11 +414,11 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
+                <widget row="1"  column="1" >
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout19</cstring>
+                        <cstring>Layout1</cstring>
                     </property>
                     <vbox>
                         <property stdset="1">
@@ -504,186 +430,196 @@
                             <number>6</number>
                         </property>
                         <widget>
-                            <class>QLabel</class>
+                            <class>QPushButton</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>citationStyleLA</cstring>
+                                <cstring>addPB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>0</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                </sizepolicy>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Citation style</string>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image0</pixmap>
+                            </property>
+                            <property>
+                                <name>toolTip</name>
+                                <string>Add the selected citation</string>
                             </property>
                         </widget>
                         <widget>
-                            <class>QComboBox</class>
+                            <class>QPushButton</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>citationStyleCO</cstring>
+                                <cstring>delPB</cstring>
                             </property>
                             <property stdset="1">
                                 <name>sizePolicy</name>
                                 <sizepolicy>
-                                    <hsizetype>3</hsizetype>
+                                    <hsizetype>0</hsizetype>
                                     <vsizetype>0</vsizetype>
                                 </sizepolicy>
                             </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image1</pixmap>
+                            </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>Natbib citation style to use</string>
+                                <string>Remove the selected citation</string>
                             </property>
                         </widget>
-                    </vbox>
-                </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer16</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>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout17</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>QCheckBox</class>
+                            <class>QPushButton</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>fulllistCB</cstring>
+                                <cstring>upPB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>0</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                </sizepolicy>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>&amp;Full author list</string>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image2</pixmap>
                             </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>List all authors</string>
+                                <string>Move the selected citation up</string>
                             </property>
                         </widget>
                         <widget>
-                            <class>QCheckBox</class>
+                            <class>QPushButton</class>
                             <property stdset="1">
                                 <name>name</name>
-                                <cstring>forceuppercaseCB</cstring>
+                                <cstring>downPB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>sizePolicy</name>
+                                <sizepolicy>
+                                    <hsizetype>0</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                </sizepolicy>
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Force &amp;upper case</string>
+                                <string></string>
+                            </property>
+                            <property stdset="1">
+                                <name>pixmap</name>
+                                <pixmap>image3</pixmap>
                             </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>Force upper case in citation</string>
+                                <string>Move the selected citation down</string>
                             </property>
                         </widget>
                     </vbox>
                 </widget>
-            </hbox>
-        </widget>
-        <widget>
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout14</cstring>
-            </property>
-            <grid>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
-                <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
-                </property>
-                <widget row="1"  column="1" >
-                    <class>QLineEdit</class>
+                <widget row="0"  column="2" >
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>textAfterED</cstring>
+                        <cstring>bibliographyKeysLA</cstring>
                     </property>
                     <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Text to place after citation</string>
+                        <name>text</name>
+                        <string>Available</string>
                     </property>
                 </widget>
-                <widget row="1"  column="0" >
+                <widget row="0"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>textAfterLA</cstring>
+                        <cstring>insetKeysLA</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Text after</string>
+                        <string>Selected</string>
                     </property>
                 </widget>
-                <widget row="0"  column="1" >
-                    <class>QLineEdit</class>
+                <widget row="1"  column="2" >
+                    <class>QListBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>New Item</string>
+                        </property>
+                    </item>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>textBeforeED</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
+                        <cstring>bibLB</cstring>
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>Text to place before citation</string>
+                        <string>Available citation keys</string>
                     </property>
                 </widget>
-                <widget row="0"  column="0" >
-                    <class>QLabel</class>
+                <widget row="1"  column="0" >
+                    <class>QListBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>New Item</string>
+                        </property>
+                    </item>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>textBeforeLA</cstring>
+                        <cstring>citeLB</cstring>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Text before</string>
+                        <name>selectionMode</name>
+                        <enum>Single</enum>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Citations currently selected</string>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget>
+        <widget row="3"  column="1"  rowspan="1"  colspan="2" >
+            <class>QLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>textAfterED</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string>Text to place after citation</string>
+            </property>
+        </widget>
+        <widget row="1"  column="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout6</cstring>
+                <cstring>Layout15</cstring>
             </property>
             <hbox>
                 <property stdset="1">
@@ -694,21 +630,10 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>restorePB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Restore</string>
-                    </property>
-                </widget>
                 <spacer>
                     <property>
                         <name>name</name>
-                        <cstring>Spacer4</cstring>
+                        <cstring>Spacer8</cstring>
                     </property>
                     <property stdset="1">
                         <name>orientation</name>
@@ -727,49 +652,56 @@
                     </property>
                 </spacer>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>okPB</cstring>
+                        <cstring>fulllistCB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>OK</string>
-                    </property>
-                    <property stdset="1">
-                        <name>autoDefault</name>
-                        <bool>true</bool>
+                        <string>&amp;Full author list</string>
                     </property>
-                    <property stdset="1">
-                        <name>default</name>
-                        <bool>false</bool>
+                    <property>
+                        <name>toolTip</name>
+                        <string>List all authors</string>
                     </property>
                 </widget>
                 <widget>
-                    <class>QPushButton</class>
+                    <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>applyPB</cstring>
+                        <cstring>forceuppercaseCB</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Apply</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>closePB</cstring>
+                        <string>Force &amp;upper case</string>
                     </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Cancel</string>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Force upper case in citation</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
-    </vbox>
+        <widget row="2"  column="1"  rowspan="1"  colspan="2" >
+            <class>QLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>textBeforeED</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string>Text to place before citation</string>
+            </property>
+        </widget>
+    </grid>
 </widget>
 <images>
     <image>

diff --git a/src/frontends/qt2/ui/QShowFileDialog.ui b/src/frontends/qt2/ui/QShowFileDialog.ui
new file mode 100644 (file)
index 0000000..4036299
--- /dev/null
+++ b/src/frontends/qt2/ui/QShowFileDialog.ui
@@ -0,0 +1,102 @@
+<!DOCTYPE UI><UI>
+<class>QShowFileDialogBase</class>
+<include location="global">config.h</include>
+<include location="local">gettext.h</include>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>QShowFileDialogBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>305</width>
+            <height>259</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>File: </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>QTextView</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>text</cstring>
+            </property>
+            <property>
+                <name>toolTip</name>
+                <string></string>
+            </property>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout3</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>closePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Close</string>
+                    </property>
+                    <property stdset="1">
+                        <name>default</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+    </vbox>
+</widget>
+<connections>
+    <slot access="public">change_adaptor()</slot>
+</connections>
+</UI>