fix qprefs ui (bug 1829)

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index ce01731360b2357b823a4e7d2cbbbfbcf3e946c5..6c563eacc270eef9b243abe8029c17a70256875b 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-15  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * ui/QPrefsConvertersModule.ui:
+       * ui/QPrefsCopiersModule.ui:
+       * ui/QPrefsFileformatsModule.ui:
+       * QPrefsDialog.[Ch]: more intuitive ui (cf. bug 1829)
+
 2005-04-14  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * ui/NumberingModuleBase.ui: Remove numbering items ...

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index f2c364b1183a21c8ceb2e6de783679a16ca4cd09..050c93b044f965d186b28f4345a84a2c5762d882 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -179,6 +179,12 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        connect(fileformatsModule->formatRemovePB, SIGNAL(clicked()), this, SLOT(remove_format()));
        connect(fileformatsModule->formatModifyPB, SIGNAL(clicked()), this, SLOT(modify_format()));
        connect(fileformatsModule->formatsLB, SIGNAL(highlighted(int)), this, SLOT(switch_format(int)));
+       connect(fileformatsModule->formatED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->guiNameED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->shortcutED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->extensionED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->viewerED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
+       connect(fileformatsModule->editorED, SIGNAL(textChanged(const QString&)), this, SLOT(fileformat_changed()));
 
        connect(convertersModule->converterNewPB, SIGNAL(clicked()), this, SLOT(new_converter()));
        connect(convertersModule->converterRemovePB, SIGNAL(clicked()), this, SLOT(remove_converter()));
@@ -204,6 +210,8 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
        connect(copiersModule->copierNewPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(copiersModule->copierRemovePB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(copiersModule->copierModifyPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
+       connect(copiersModule->copierFormatCO, SIGNAL(activated(const QString&)), this, SLOT(copiers_changed()));
+       connect(copiersModule->copierED, SIGNAL(textChanged(const QString&)), this, SLOT(copiers_changed()));
 
        connect(fileformatsModule->formatNewPB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(fileformatsModule->formatRemovePB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
@@ -337,6 +345,10 @@ void QPrefsDialog::updateConverters()
 {
        QPrefConvertersModule * convertmod(convertersModule);
 
+       // save current selection
+       QString current = convertmod->converterFromCO->currentText()
+               + " -> " + convertmod->converterToCO->currentText();
+       
        convertmod->converterFromCO->clear();
        convertmod->converterToCO->clear();
 
@@ -357,6 +369,12 @@ void QPrefsDialog::updateConverters()
                convertmod->convertersLB->insertItem(toqstr(name));
        }
 
+       // restore selection
+       if (!current.isEmpty()) {
+               QListBoxItem * item = convertmod->convertersLB->findItem(current);
+               convertmod->convertersLB->setCurrentItem(item);
+       }
+       // select first element if restoring failed
        if (convertmod->convertersLB->currentItem() == -1)
                convertmod->convertersLB->setCurrentItem(0);
 
@@ -455,6 +473,8 @@ void QPrefsDialog::remove_converter()
 void QPrefsDialog::updateCopiers()
 {
        // The choice widget
+       // save current selection
+       QString current = copiersModule->copierFormatCO->currentText();
        copiersModule->copierFormatCO->clear();
 
        for (Formats::const_iterator it = form_->formats().begin(),
@@ -478,6 +498,12 @@ void QPrefsDialog::updateCopiers()
                copiersModule->AllCopiersLB->insertItem(toqstr(pretty));
        }
 
+       // restore selection
+       if (!current.isEmpty()) {
+               QListBoxItem * item = copiersModule->AllCopiersLB->findItem(current);
+               copiersModule->AllCopiersLB->setCurrentItem(item);
+       }
+       // select first element if restoring failed
        if (copiersModule->AllCopiersLB->currentItem() == -1)
                copiersModule->AllCopiersLB->setCurrentItem(0);
 }
@@ -540,6 +566,7 @@ void QPrefsDialog::switch_copierLB(int nr)
                        break;
                }
        }
+       updateCopierButtons();
 }
 
 
@@ -582,6 +609,36 @@ void QPrefsDialog::switch_copierCO(int nr)
 }
 
 
+void QPrefsDialog::copiers_changed()
+{
+       updateCopierButtons();
+}
+
+
+void QPrefsDialog::updateCopierButtons()
+{
+       QString selected = copiersModule->copierFormatCO->currentText();
+
+       bool known = false;
+       for (unsigned int i = 0; i != copiersModule->AllCopiersLB->count(); i++) {
+               if (copiersModule->AllCopiersLB->text(i) == selected)
+                       known = true;
+       }
+
+       bool const valid = !copiersModule->copierED->text().isEmpty();
+
+       Format const * fmt = getFormat(fromqstr(selected));
+       string const old_command = form_->movers().command(fmt->name());
+       string const new_command(fromqstr(copiersModule->copierED->text()));
+
+       bool modified = (old_command != new_command);
+
+       copiersModule->copierModifyPB->setEnabled(valid && known && modified);
+       copiersModule->copierNewPB->setEnabled(valid && !known);
+       copiersModule->copierRemovePB->setEnabled(known);
+}
+
+
 void QPrefsDialog::new_copier()
 {
        std::string const combo_text =
@@ -599,6 +656,8 @@ void QPrefsDialog::new_copier()
        updateCopiers();
        int const last = copiersModule->AllCopiersLB->count() - 1;
        copiersModule->AllCopiersLB->setCurrentItem(last);
+
+       updateCopierButtons();
 }
 
 
@@ -614,6 +673,7 @@ void QPrefsDialog::modify_copier()
        form_->movers().set(fmt->name(), command);
 
        updateCopiers();
+       updateCopierButtons();
 }
 
 
@@ -629,6 +689,7 @@ void QPrefsDialog::remove_copier()
        form_->movers().set(fmt_name, string());
 
        updateCopiers();
+       updateCopierButtons();
 }
 
 
@@ -636,6 +697,9 @@ void QPrefsDialog::updateFormats()
 {
        QPrefFileformatsModule * formatmod(fileformatsModule);
 
+       // save current selection
+       QString current = formatmod->guiNameED->text();
+       
        formatmod->formatsLB->clear();
 
        Formats::const_iterator cit = form_->formats().begin();
@@ -644,6 +708,12 @@ void QPrefsDialog::updateFormats()
                formatmod->formatsLB->insertItem(toqstr(cit->prettyname()));
        }
 
+       // restore selection
+       if (!current.isEmpty()) {
+               QListBoxItem * item = formatmod->formatsLB->findItem(current);
+               formatmod->formatsLB->setCurrentItem(item);
+       }
+       // select first element if restoring failed
        if (formatmod->formatsLB->currentItem() == -1)
                formatmod->formatsLB->setCurrentItem(0);
 }
@@ -660,17 +730,80 @@ void QPrefsDialog::switch_format(int nr)
        fileformatsModule->editorED->setText(toqstr(f.editor()));
        fileformatsModule->formatRemovePB->setEnabled(
                !form_->converters().formatIsUsed(f.name()));
+
+       updateFormatsButtons();
+}
+
+
+void QPrefsDialog::fileformat_changed()
+{
+       updateFormatsButtons();
+}
+
+
+void QPrefsDialog::updateFormatsButtons()
+{
+       QString const format = fileformatsModule->formatED->text();
+       QString const gui_name = fileformatsModule->guiNameED->text();
+       int const sel = form_->formats().getNumber(fromqstr(format));
+       bool gui_name_known = false;
+       int where = sel;
+       for (unsigned int i = 0; i != fileformatsModule->formatsLB->count(); i++) {
+               if (fileformatsModule->formatsLB->text(i) == gui_name) {
+                       gui_name_known = true;
+                       where = i;
+               }
+       }
+
+       // assure that a gui name cannot be chosen twice
+       bool const known_otherwise = gui_name_known && (where != sel);
+       
+       bool const known = !(sel < 0);
+       bool const valid = (!fileformatsModule->formatED->text().isEmpty()
+               && !fileformatsModule->guiNameED->text().isEmpty());
+
+       Format const & f(form_->formats().get(
+               fileformatsModule->formatsLB->currentItem()));
+       string const old_pretty(f.prettyname());
+       string const old_shortcut(f.shortcut());
+       string const old_extension(f.extension());
+       string const old_viewer(f.viewer());
+       string const old_editor(f.editor());
+
+       string const new_pretty(fromqstr(gui_name));
+       string const new_shortcut(fromqstr(fileformatsModule->shortcutED->text()));
+       string const new_extension(fromqstr(fileformatsModule->extensionED->text()));
+       string const new_viewer(fromqstr(fileformatsModule->viewerED->text()));
+       string const new_editor(fromqstr(fileformatsModule->editorED->text()));
+
+       bool modified = ((old_pretty != new_pretty) || (old_shortcut != new_shortcut)
+               || (old_extension != new_extension) || (old_viewer != new_viewer)
+               || (old_editor != new_editor));
+
+       fileformatsModule->formatModifyPB->setEnabled(
+               valid && known && modified && !known_otherwise);
+       fileformatsModule->formatNewPB->setEnabled(valid && !known && !gui_name_known);
+       fileformatsModule->formatRemovePB->setEnabled(known);
 }
 
 
 void QPrefsDialog::new_format()
 {
-       form_->formats().add(_("New"));
+       string const name = fromqstr(fileformatsModule->formatED->text());
+       string const prettyname = fromqstr(fileformatsModule->guiNameED->text());
+       string const extension = fromqstr(fileformatsModule->extensionED->text());
+       string const shortcut = fromqstr(fileformatsModule->shortcutED->text());
+       string const viewer = fromqstr(fileformatsModule->viewerED->text());
+       string const editor = fromqstr(fileformatsModule->editorED->text());
+
+       form_->formats().add(name, extension, prettyname, shortcut, viewer, editor);
        form_->formats().sort();
        updateFormats();
-       fileformatsModule->formatsLB->setCurrentItem(form_->formats().getNumber(_("New")));
+       fileformatsModule->formatsLB->setCurrentItem(form_->formats().getNumber(name));
        form_->converters().update(form_->formats());
+       
        updateConverters();
+       updateFormatsButtons();
 }
 
 
@@ -696,6 +829,7 @@ void QPrefsDialog::modify_format()
        fileformatsModule->formatsLB->update();
 
        updateConverters();
+       updateFormatsButtons();
 }
 
 
@@ -707,7 +841,9 @@ void QPrefsDialog::remove_format()
        form_->formats().erase(form_->formats().get(nr).name());
        updateFormats();
        form_->converters().update(form_->formats());
+       
        updateConverters();
+       updateFormatsButtons();
 }
 
 

diff --git a/src/frontends/qt2/QPrefsDialog.h b/src/frontends/qt2/QPrefsDialog.h
index 9e1a223d3455e50e482b919c88603301623328eb..facac1fd62f59f27f1c0eb0ce051b618709e8a5e 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.h
+++ b/src/frontends/qt2/QPrefsDialog.h
@@ -54,12 +54,15 @@ public:
        void updateConverters();
        void updateConverterButtons();
        void updateCopiers();
+       void updateCopierButtons();
        void updateFormats();
+       void updateFormatsButtons();
 
 public slots:
        void change_adaptor();
 
        void switch_format(int);
+       void fileformat_changed();
        void new_format();
        void modify_format();
        void remove_format();
@@ -72,6 +75,7 @@ public slots:
 
        void switch_copierLB(int nr);
        void switch_copierCO(int nr);
+       void copiers_changed();
        void new_copier();
        void modify_copier();
        void remove_copier();

diff --git a/src/frontends/qt2/ui/QPrefConvertersModule.ui b/src/frontends/qt2/ui/QPrefConvertersModule.ui
index 0665bf07bfe9728f771ffb7c3ed30b831a6bcc98..6fb38ad860f7b60504107b1f523b862cec7088be 100644 (file)
--- a/src/frontends/qt2/ui/QPrefConvertersModule.ui
+++ b/src/frontends/qt2/ui/QPrefConvertersModule.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>466</width>
+            <width>458</width>
             <height>265</height>
         </rect>
     </property>
@@ -30,98 +30,6 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="0"  column="0" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout7</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="0"  column="0"  rowspan="1"  colspan="2" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>formatsLA_2</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Converters</string>
-                    </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>convertersLB</cstring>
-                    </property>
-                </widget>
-                <spacer row="2"  column="1" >
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer8</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>orientation</name>
-                        <enum>Horizontal</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>sizeType</name>
-                        <enum>Expanding</enum>
-                    </property>
-                    <property>
-                        <name>sizeHint</name>
-                        <size>
-                            <width>20</width>
-                            <height>20</height>
-                        </size>
-                    </property>
-                </spacer>
-                <widget row="2"  column="0" >
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>converterRemovePB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>&amp;Remove</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="0"  rowspan="1"  colspan="2" >
-                    <class>QListBox</class>
-                    <item>
-                        <property>
-                            <name>text</name>
-                            <string>New Item</string>
-                        </property>
-                    </item>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>convertersLB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>7</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>vScrollBarMode</name>
-                        <enum>AlwaysOn</enum>
-                    </property>
-                    <property stdset="1">
-                        <name>hScrollBarMode</name>
-                        <enum>AlwaysOff</enum>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
         <widget row="0"  column="1" >
             <class>QLayoutWidget</class>
             <property stdset="1">
@@ -339,6 +247,115 @@
                 </widget>
             </grid>
         </widget>
+        <widget row="0"  column="0" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout6</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="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>formatsLA_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Converters</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>convertersLB</cstring>
+                    </property>
+                </widget>
+                <widget row="2"  column="0" >
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout5</cstring>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <spacer>
+                            <property>
+                                <name>name</name>
+                                <cstring>Spacer8</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>converterRemovePB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Remove</string>
+                            </property>
+                        </widget>
+                    </hbox>
+                </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>convertersLB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>7</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>vScrollBarMode</name>
+                        <enum>AlwaysOn</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>hScrollBarMode</name>
+                        <enum>AlwaysOff</enum>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
     </grid>
 </widget>
 <tabstops>

diff --git a/src/frontends/qt2/ui/QPrefCopiersModule.ui b/src/frontends/qt2/ui/QPrefCopiersModule.ui
index e446ec5d0b2758e9f681c45bb81e423078876097..d2455e4f707ccd4ebae034167b3b7c7518289194 100644 (file)
--- a/src/frontends/qt2/ui/QPrefCopiersModule.ui
+++ b/src/frontends/qt2/ui/QPrefCopiersModule.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>547</width>
+            <width>428</width>
             <height>261</height>
         </rect>
     </property>
@@ -21,7 +21,7 @@
         <name>caption</name>
         <string>File Conversion</string>
     </property>
-    <hbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
@@ -30,13 +30,13 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout4</cstring>
+                <cstring>Layout7</cstring>
             </property>
-            <vbox>
+            <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -45,28 +45,41 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
-                    <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>AllCopiersLA</cstring>
+                        <cstring>AllCopiersLB</cstring>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>C&amp;opiers</string>
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>7</vsizetype>
+                        </sizepolicy>
                     </property>
-                    <property>
-                        <name>buddy</name>
-                        <cstring>AllCopiersLB</cstring>
+                    <property stdset="1">
+                        <name>vScrollBarMode</name>
+                        <enum>Auto</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>hScrollBarMode</name>
+                        <enum>AlwaysOff</enum>
                     </property>
                 </widget>
-                <widget>
+                <widget row="2"  column="0" >
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout1</cstring>
+                        <cstring>Layout6</cstring>
                     </property>
-                    <grid>
+                    <hbox>
                         <property stdset="1">
                             <name>margin</name>
                             <number>0</number>
@@ -75,46 +88,28 @@
                             <name>spacing</name>
                             <number>6</number>
                         </property>
-                        <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-                            <class>QListBox</class>
-                            <item>
-                                <property>
-                                    <name>text</name>
-                                    <string>New Item</string>
-                                </property>
-                            </item>
-                            <property stdset="1">
+                        <spacer>
+                            <property>
                                 <name>name</name>
-                                <cstring>AllCopiersLB</cstring>
+                                <cstring>Spacer3</cstring>
                             </property>
                             <property stdset="1">
-                                <name>sizePolicy</name>
-                                <sizepolicy>
-                                    <hsizetype>3</hsizetype>
-                                    <vsizetype>7</vsizetype>
-                                </sizepolicy>
-                            </property>
-                            <property stdset="1">
-                                <name>vScrollBarMode</name>
-                                <enum>AlwaysOn</enum>
-                            </property>
-                            <property stdset="1">
-                                <name>hScrollBarMode</name>
-                                <enum>AlwaysOff</enum>
+                                <name>orientation</name>
+                                <enum>Horizontal</enum>
                             </property>
-                        </widget>
-                        <widget row="1"  column="0" >
-                            <class>QPushButton</class>
                             <property stdset="1">
-                                <name>name</name>
-                                <cstring>copierNewPB</cstring>
+                                <name>sizeType</name>
+                                <enum>Preferred</enum>
                             </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;New</string>
+                            <property>
+                                <name>sizeHint</name>
+                                <size>
+                                    <width>20</width>
+                                    <height>20</height>
+                                </size>
                             </property>
-                        </widget>
-                        <widget row="1"  column="1" >
+                        </spacer>
+                        <widget>
                             <class>QPushButton</class>
                             <property stdset="1">
                                 <name>name</name>
@@ -125,17 +120,32 @@
                                 <string>&amp;Remove</string>
                             </property>
                         </widget>
-                    </grid>
+                    </hbox>
                 </widget>
-            </vbox>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>AllCopiersLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>C&amp;opiers</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>AllCopiersLB</cstring>
+                    </property>
+                </widget>
+            </grid>
         </widget>
-        <widget>
+        <widget row="0"  column="1" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout6</cstring>
+                <cstring>Layout9</cstring>
             </property>
-            <vbox>
+            <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -144,7 +154,67 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
+                <widget row="1"  column="0" >
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout8</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>copierNewPB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Add</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QPushButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>copierModifyPB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Modify</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>
+                <widget row="0"  column="0" >
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
@@ -212,56 +282,7 @@
                         </widget>
                     </grid>
                 </widget>
-                <widget>
-                    <class>QLayoutWidget</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout5</cstring>
-                    </property>
-                    <hbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
-                            <class>QPushButton</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>copierModifyPB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;Modify</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>
+                <spacer row="2"  column="0" >
                     <property>
                         <name>name</name>
                         <cstring>Spacer28</cstring>
@@ -282,9 +303,9 @@
                         </size>
                     </property>
                 </spacer>
-            </vbox>
+            </grid>
         </widget>
-    </hbox>
+    </grid>
 </widget>
 <tabstops>
     <tabstop>AllCopiersLB</tabstop>

diff --git a/src/frontends/qt2/ui/QPrefFileformatsModule.ui b/src/frontends/qt2/ui/QPrefFileformatsModule.ui
index 173ec5260007e43dd64bf2536a83145a6061297f..c8d86b7de6e79d790fe85a2715a0a9195c3a2a80 100644 (file)
--- a/src/frontends/qt2/ui/QPrefFileformatsModule.ui
+++ b/src/frontends/qt2/ui/QPrefFileformatsModule.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>356</width>
+            <width>419</width>
             <height>261</height>
         </rect>
     </property>
@@ -21,7 +21,7 @@
         <name>caption</name>
         <string>File Formats</string>
     </property>
-    <hbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
             <number>11</number>
@@ -30,13 +30,13 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget>
+        <widget row="0"  column="1"  rowspan="1"  colspan="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout3</cstring>
+                <cstring>Layout4</cstring>
             </property>
-            <vbox>
+            <grid>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
@@ -45,88 +45,226 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
+                <widget row="4"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>viewerED</cstring>
+                    </property>
+                </widget>
+                <widget row="5"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>editorED</cstring>
+                    </property>
+                </widget>
+                <widget row="2"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>shortcutED</cstring>
+                    </property>
+                </widget>
+                <widget row="1"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>formatsLA</cstring>
+                        <cstring>guiNameLA</cstring>
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;File formats</string>
+                        <string>&amp;GUI name:</string>
                     </property>
                     <property>
                         <name>buddy</name>
-                        <cstring>formatsLB</cstring>
+                        <cstring>guiNameED</cstring>
                     </property>
                 </widget>
+                <widget row="0"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>formatLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>F&amp;ormat:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>formatED</cstring>
+                    </property>
+                </widget>
+                <widget row="1"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>guiNameED</cstring>
+                    </property>
+                </widget>
+                <widget row="4"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>viewerLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Viewer:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>viewerED</cstring>
+                    </property>
+                </widget>
+                <widget row="5"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>editorLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Ed&amp;itor:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>editorED</cstring>
+                    </property>
+                </widget>
+                <widget row="0"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>formatED</cstring>
+                    </property>
+                </widget>
+                <widget row="2"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>shortcutLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>S&amp;hortcut:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>shortcutED</cstring>
+                    </property>
+                </widget>
+                <widget row="3"  column="0" >
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>extensionLA</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>E&amp;xtension:</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>extensionED</cstring>
+                    </property>
+                </widget>
+                <widget row="3"  column="1" >
+                    <class>QLineEdit</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>extensionED</cstring>
+                    </property>
+                </widget>
+            </grid>
+        </widget>
+        <widget row="1"  column="1"  rowspan="1"  colspan="2" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout5</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
                 <widget>
-                    <class>QLayoutWidget</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout1</cstring>
+                        <cstring>formatNewPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Add</string>
                     </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="0" >
-                            <class>QPushButton</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>formatNewPB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;New</string>
-                            </property>
-                        </widget>
-                        <widget row="0"  column="0"  rowspan="1"  colspan="2" >
-                            <class>QListBox</class>
-                            <item>
-                                <property>
-                                    <name>text</name>
-                                    <string>New Item</string>
-                                </property>
-                            </item>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>formatsLB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>vScrollBarMode</name>
-                                <enum>AlwaysOn</enum>
-                            </property>
-                            <property stdset="1">
-                                <name>hScrollBarMode</name>
-                                <enum>AlwaysOff</enum>
-                            </property>
-                        </widget>
-                        <widget row="1"  column="1" >
-                            <class>QPushButton</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>formatRemovePB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;Remove</string>
-                            </property>
-                        </widget>
-                    </grid>
                 </widget>
-            </vbox>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>formatModifyPB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;Modify</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>MinimumExpanding</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+            </hbox>
         </widget>
-        <widget>
+        <spacer row="2"  column="2" >
+            <property>
+                <name>name</name>
+                <cstring>Spacer26</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+        <widget row="0"  column="0"  rowspan="3"  colspan="1" >
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout6</cstring>
+                <cstring>Layout10</cstring>
             </property>
             <vbox>
                 <property stdset="1">
@@ -138,159 +276,53 @@
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QLayoutWidget</class>
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout4</cstring>
+                        <cstring>formatsLA</cstring>
                     </property>
-                    <grid>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>&amp;File formats</string>
+                    </property>
+                    <property>
+                        <name>buddy</name>
+                        <cstring>formatsLB</cstring>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QListBox</class>
+                    <item>
+                        <property>
+                            <name>text</name>
+                            <string>New Item</string>
                         </property>
-                        <widget row="4"  column="1" >
-                            <class>QLineEdit</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>viewerED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="5"  column="1" >
-                            <class>QLineEdit</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>editorED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="2"  column="1" >
-                            <class>QLineEdit</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>shortcutED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="1"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>guiNameLA</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;GUI name:</string>
-                            </property>
-                            <property>
-                                <name>buddy</name>
-                                <cstring>guiNameED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="0"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>formatLA</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>F&amp;ormat:</string>
-                            </property>
-                            <property>
-                                <name>buddy</name>
-                                <cstring>formatED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="1"  column="1" >
-                            <class>QLineEdit</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>guiNameED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="4"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>viewerLA</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;Viewer:</string>
-                            </property>
-                            <property>
-                                <name>buddy</name>
-                                <cstring>viewerED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="5"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>editorLA</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Ed&amp;itor:</string>
-                            </property>
-                            <property>
-                                <name>buddy</name>
-                                <cstring>editorED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="0"  column="1" >
-                            <class>QLineEdit</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>formatED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="2"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>shortcutLA</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>S&amp;hortcut:</string>
-                            </property>
-                            <property>
-                                <name>buddy</name>
-                                <cstring>shortcutED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="3"  column="0" >
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>extensionLA</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>E&amp;xtension:</string>
-                            </property>
-                            <property>
-                                <name>buddy</name>
-                                <cstring>extensionED</cstring>
-                            </property>
-                        </widget>
-                        <widget row="3"  column="1" >
-                            <class>QLineEdit</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>extensionED</cstring>
-                            </property>
-                        </widget>
-                    </grid>
+                    </item>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>formatsLB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>7</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>vScrollBarMode</name>
+                        <enum>AlwaysOn</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>hScrollBarMode</name>
+                        <enum>AlwaysOff</enum>
+                    </property>
                 </widget>
                 <widget>
                     <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout5</cstring>
+                        <cstring>Layout7</cstring>
                     </property>
                     <hbox>
                         <property stdset="1">
@@ -301,21 +333,10 @@
                             <name>spacing</name>
                             <number>6</number>
                         </property>
-                        <widget>
-                            <class>QPushButton</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>formatModifyPB</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>&amp;Modify</string>
-                            </property>
-                        </widget>
                         <spacer>
                             <property>
                                 <name>name</name>
-                                <cstring>Spacer2</cstring>
+                                <cstring>Spacer3</cstring>
                             </property>
                             <property stdset="1">
                                 <name>orientation</name>
@@ -323,7 +344,7 @@
                             </property>
                             <property stdset="1">
                                 <name>sizeType</name>
-                                <enum>Expanding</enum>
+                                <enum>Preferred</enum>
                             </property>
                             <property>
                                 <name>sizeHint</name>
@@ -333,32 +354,43 @@
                                 </size>
                             </property>
                         </spacer>
+                        <widget>
+                            <class>QPushButton</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>formatRemovePB</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>&amp;Remove</string>
+                            </property>
+                        </widget>
                     </hbox>
                 </widget>
-                <spacer>
-                    <property>
-                        <name>name</name>
-                        <cstring>Spacer26</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>
+        <spacer row="2"  column="1" >
+            <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>Minimum</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </grid>
 </widget>
 <tabstops>
     <tabstop>formatsLB</tabstop>