jurgen's improvements to the doc dialog in qt

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

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f3d41f98fa77286d689afdbcadadf347506c995d..3542caa4cbe471fbb2ed27223813d0ab01e26461 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-16  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
+
+       * ui/QDocumentDialogBase.ui:
+       * ui/ClassModuleBase.ui:
+       * ui/LanguageModuleBase.ui:
+       * ui/PackagesModuleBase.ui:
+       * QDocument.C:
+       * QDocumentDialog.[Ch]: Rearrangement.
+
 2003-01-15  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
        * QIndex.C:

diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 6339dd4cd1b49052952b209e4b8108f4046c2096..4736cf27f3b17bda9302aef520cca8d5effe88dd 100644 (file)
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -79,6 +79,12 @@ void QDocument::build_dialog()
                        toqstr(lit->first));
        }
 
+       char const * items[] = {"default", "auto", "latin1", "latin2",
+                            "latin3", "latin4", "latin5", "latin9",
+                            "koi8-r", "koi8-u", "cp866", "cp1251",
+                            "iso88595", "pt154", 0};
+       dialog_->langModule->encodingCO->insertStrList(items);
+
        dialog_->langModule->quoteStyleCO->insertItem(qt_("``text''"));
        dialog_->langModule->quoteStyleCO->insertItem(qt_("''text''"));
        dialog_->langModule->quoteStyleCO->insertItem(qt_(",,text``"));
@@ -87,21 +93,6 @@ void QDocument::build_dialog()
        dialog_->langModule->quoteStyleCO->insertItem(qt_("»text«"));
 
        // packages
-       char const * items[] = {"default", "auto", "latin1", "latin2",
-                            "latin3", "latin4", "latin5", "latin9",
-                            "koi8-r", "koi8-u", "cp866", "cp1251",
-                            "iso88595", "pt154", 0};
-       dialog_->packagesModule->encodingCO->insertStrList(items);
-
-       dialog_->packagesModule->lspacingCO->insertItem(
-               qt_("Single"), Spacing::Single);
-       dialog_->packagesModule->lspacingCO->insertItem(
-               qt_("OneHalf"), Spacing::Onehalf);
-       dialog_->packagesModule->lspacingCO->insertItem(
-               qt_("Double"), Spacing::Double);
-       dialog_->packagesModule->lspacingCO->insertItem(
-               qt_("Custom"), Spacing::Other);
-
        for (int n = 0; tex_graphics[n][0]; ++n) {
                QString enc = tex_graphics[n];
                dialog_->packagesModule->psdriverCO->insertItem(enc);
@@ -147,6 +138,15 @@ void QDocument::build_dialog()
        dialog_->layoutModule->pagestyleCO->insertItem(qt_("plain"));
        dialog_->layoutModule->pagestyleCO->insertItem(qt_("headings"));
        dialog_->layoutModule->pagestyleCO->insertItem(qt_("fancy"));
+       
+       dialog_->layoutModule->lspacingCO->insertItem(
+               qt_("Single"), Spacing::Single);
+       dialog_->layoutModule->lspacingCO->insertItem(
+               qt_("OneHalf"), Spacing::Onehalf);
+       dialog_->layoutModule->lspacingCO->insertItem(
+               qt_("Double"), Spacing::Double);
+       dialog_->layoutModule->lspacingCO->insertItem(
+               qt_("Custom"), Spacing::Other);
 
        // margins
        dialog_->setMargins(0);
@@ -179,6 +179,8 @@ void QDocument::apply()
        else
                params.quotes_times = InsetQuotes::DoubleQ;
 
+       params.inputenc =
+               fromqstr(dialog_->langModule->encodingCO->currentText());
 
        InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
        switch (dialog_->langModule->quoteStyleCO->currentItem()) {
@@ -219,39 +221,16 @@ void QDocument::apply()
        params.user_defined_bullets[3] = dialog_->bulletsModule->getBullet(3);
 
        // packages
-       switch (dialog_->packagesModule->lspacingCO->currentItem()) {
-       case 0:
-               params.spacing.set(Spacing::Single);
-               break;
-       case 1:
-               params.spacing.set(Spacing::Onehalf);
-               break;
-       case 2:
-               params.spacing.set(Spacing::Double);
-               break;
-       case 3:
-               params.spacing.set(Spacing::Other,
-                                  dialog_->packagesModule->
-                                  lspacingLE->text().toFloat()
-                                  );
-               break;
-       }
-
        params.graphicsDriver =
                fromqstr(dialog_->packagesModule->psdriverCO->currentText());
 
        params.use_amsmath =
                dialog_->packagesModule->amsCB->isChecked();
 
-       params.inputenc =
-               fromqstr(dialog_->packagesModule->encodingCO->currentText());
-
        // layout
        params.textclass =
                dialog_->layoutModule->classCO->currentItem();
-
-       //bool succes = controller().classApply();
-
+               
        params.fonts =
                fromqstr(dialog_->layoutModule->fontsCO->currentText());
 
@@ -260,6 +239,24 @@ void QDocument::apply()
 
        params.pagestyle =
                fromqstr(dialog_->layoutModule->pagestyleCO->currentText());
+               
+       switch (dialog_->layoutModule->lspacingCO->currentItem()) {
+       case 0:
+               params.spacing.set(Spacing::Single);
+               break;
+       case 1:
+               params.spacing.set(Spacing::Onehalf);
+               break;
+       case 2:
+               params.spacing.set(Spacing::Double);
+               break;
+       case 3:
+               params.spacing.set(Spacing::Other,
+                                  dialog_->layoutModule->
+                                  lspacingLE->text().toFloat()
+                                  );
+               break;
+       }
 
        if (dialog_->layoutModule->indentRB->isChecked())
                params.paragraph_separation = BufferParams::PARSEP_INDENT;
@@ -421,6 +418,15 @@ void QDocument::update_contents()
 
        dialog_->langModule->quoteStyleCO->setCurrentItem(
                params.quotes_language);
+               
+       char const * enc[] = {
+               "default" , "auto" , "latin1" , "latin2" , "latin3" ,
+               "latin4" , "latin5" , "latin9" , "koi8-r" , "koi8-u" ,
+               "cp866" , "cp1251" , "iso88595" , "pt154" };
+       for (size_t i = 0; i < sizeof(enc)/sizeof(char *); ++i) {
+               if (params.inputenc == enc[i])
+                       dialog_->langModule->encodingCO->setCurrentItem(i);
+       }
 
        // numbering
        dialog_->numberingModule->tocDepthSB->setValue(
@@ -435,15 +441,6 @@ void QDocument::update_contents()
        dialog_->bulletsModule->setBullet(3,params.user_defined_bullets[3]);
 
        // packages
-       char const * enc[] = {
-               "default" , "auto" , "latin1" , "latin2" , "latin3" ,
-               "latin4" , "latin5" , "latin9" , "koi8-r" , "koi8-u" ,
-               "cp866" , "cp1251" , "iso88595" , "pt154" };
-       for (size_t i = 0; i < sizeof(enc)/sizeof(char *); ++i) {
-               if (params.inputenc == enc[i])
-                       dialog_->packagesModule->encodingCO->setCurrentItem(i);
-       }
-
        QString text = toqstr(params.graphicsDriver);
        int nitem = dialog_->packagesModule->psdriverCO->count();
        for (int n = 0; n < nitem ; ++n) {
@@ -464,12 +461,6 @@ void QDocument::update_contents()
                case Spacing::Default: case Spacing::Single: nitem = 0; break;
        }
 
-       dialog_->packagesModule->lspacingCO->setCurrentItem(nitem);
-       if (params.spacing.getSpace() == Spacing::Other) {
-               dialog_->packagesModule->lspacingLE->setText(
-                       toqstr(tostr(params.spacing.getValue())));
-               dialog_->setLSpacing(3);
-       }
 
        // layout
        for (int n = 0; n<dialog_->layoutModule->classCO->count(); ++n) {
@@ -493,6 +484,13 @@ void QDocument::update_contents()
                }
        }
 
+       dialog_->layoutModule->lspacingCO->setCurrentItem(nitem);
+       if (params.spacing.getSpace() == Spacing::Other) {
+               dialog_->layoutModule->lspacingLE->setText(
+                       toqstr(tostr(params.spacing.getValue())));
+               dialog_->setLSpacing(3);
+       }
+
        if (params.paragraph_separation
            == BufferParams::PARSEP_INDENT) {
                dialog_->layoutModule->indentRB->setChecked(true);

diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C
index 47b3a4578e7614cba3f8b03a46e77e25097c3aa6..369b389e98b60a0e11528e6f3481708cd36f578f 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.C
+++ b/src/frontends/qt2/QDocumentDialog.C
@@ -64,13 +64,13 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
 
        moduleLB->clear();
        moduleLB->insertItem(qt_("Layout"), LAYOUT);
-       moduleLB->insertItem(qt_("Packages"), PACKAGES);
        moduleLB->insertItem(qt_("Paper"), PAPER);
        moduleLB->insertItem(qt_("Margins"), MARGINS);
        moduleLB->insertItem(qt_("Language"), LANGUAGE);
        moduleLB->insertItem(qt_("Bullets"), BULLETS);
        moduleLB->insertItem(qt_("Numbering"), NUMBERING);
        moduleLB->insertItem(qt_("Bibliography"), BIBLIOGRAPHY);
+       moduleLB->insertItem(qt_("Packages"), PACKAGES);
        moduleLB->insertItem(qt_("Preamble"), PREAMBLE);
        moduleLB->setCurrentItem(LAYOUT);
        moduleLB->setMinimumSize(moduleLB->sizeHint());
@@ -78,21 +78,21 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
        layoutModule = new ClassModuleBase(this);
        paperModule = new PaperModuleBase(this);
        marginsModule = new MarginsModuleBase(this);
-       packagesModule = new PackagesModuleBase(this);
        langModule = new LanguageModuleBase(this);
        bulletsModule = new BulletsModule(this);
        numberingModule = new NumberingModuleBase(this);
        biblioModule = new BiblioModuleBase(this);
+       packagesModule = new PackagesModuleBase(this);
        preambleModule = new PreambleModuleBase(this);
 
        moduleStack->addWidget(layoutModule, LAYOUT);
        moduleStack->addWidget(paperModule, PAPER);
        moduleStack->addWidget(marginsModule, MARGINS);
-       moduleStack->addWidget(packagesModule, PACKAGES);
        moduleStack->addWidget(langModule, LANGUAGE);
        moduleStack->addWidget(bulletsModule, BULLETS);
        moduleStack->addWidget(numberingModule, NUMBERING);
        moduleStack->addWidget(biblioModule, BIBLIOGRAPHY);
+       moduleStack->addWidget(packagesModule, PACKAGES);
        moduleStack->addWidget(preambleModule, PREAMBLE);
 
        moduleStack->raiseWidget(LAYOUT);
@@ -119,6 +119,8 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
                 this , SLOT(change_adaptor()));
        connect(langModule->languageCO, SIGNAL(activated(int)),
                 this , SLOT(change_adaptor()));
+       connect(langModule->encodingCO, SIGNAL(activated(int)),
+                this , SLOT(change_adaptor()));
        connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
                 this , SLOT(change_adaptor()));
        // numbering
@@ -129,15 +131,6 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
                 SIGNAL(valueChanged(int)),
                 this , SLOT(change_adaptor()));
        // packages
-       connect(packagesModule->lspacingCO, SIGNAL(activated(int)),
-                this , SLOT(change_adaptor()));
-       connect(packagesModule->lspacingCO, SIGNAL(activated(int)),
-                this , SLOT(setLSpacing(int)));
-       connect(packagesModule->lspacingLE,
-                SIGNAL(textChanged(const QString&)),
-                this , SLOT(change_adaptor()));
-       connect(packagesModule->encodingCO, SIGNAL(activated(int)),
-                this , SLOT(change_adaptor()));
        connect(packagesModule->amsCB, SIGNAL(toggled(bool)),
                 this , SLOT(change_adaptor()));
        connect(packagesModule->psdriverCO, SIGNAL(activated(int)),
@@ -154,6 +147,13 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
                 this , SLOT(change_adaptor()));
        connect(layoutModule->fontsizeCO, SIGNAL(activated(int)),
                 this , SLOT(change_adaptor()));
+       connect(layoutModule->lspacingCO, SIGNAL(activated(int)),
+                this , SLOT(change_adaptor()));
+       connect(layoutModule->lspacingCO, SIGNAL(activated(int)),
+                this , SLOT(setLSpacing(int)));
+       connect(layoutModule->lspacingLE,
+                SIGNAL(textChanged(const QString&)),
+                this , SLOT(change_adaptor()));
        connect(layoutModule->floatPlacementLE,
                 SIGNAL(textChanged(const QString&)),
                 this , SLOT(change_adaptor()));
@@ -257,9 +257,6 @@ void QDocumentDialog::setTitle(int item)
        case LAYOUT:
                titleL->setText(qt_("Document Style"));
                break;
-       case PACKAGES:
-               titleL->setText(qt_("LaTeX Packages"));
-               break;
        case PAPER:
                titleL->setText(qt_("Papersize and Orientation"));
                break;
@@ -278,6 +275,9 @@ void QDocumentDialog::setTitle(int item)
        case BIBLIOGRAPHY:
                titleL->setText(qt_("Bibliography Settings"));
                break;
+       case PACKAGES:
+               titleL->setText(qt_("LaTeX Packages and Options"));
+               break;
        case PREAMBLE:
                titleL->setText(qt_("LaTeX Preamble"));
                break;
@@ -312,7 +312,7 @@ void QDocumentDialog::closeEvent(QCloseEvent * e)
 
 void QDocumentDialog::setLSpacing(int item)
 {
-       packagesModule->lspacingLE->setEnabled(item == 3);
+       layoutModule->lspacingLE->setEnabled(item == 3);
 }
 
 

diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h
index 129426f32cab00c6d12c37265894811578b46941..3e93638951a63756cb9aaf790f92a2c9c5c143aa 100644 (file)
--- a/src/frontends/qt2/QDocumentDialog.h
+++ b/src/frontends/qt2/QDocumentDialog.h
@@ -65,24 +65,24 @@ protected:
 private:
        enum Module {
                LAYOUT,
-               PACKAGES,
                PAPER,
                MARGINS,
                LANGUAGE,
                BULLETS,
                NUMBERING,
                BIBLIOGRAPHY,
+               PACKAGES,
                PREAMBLE
        };
 
        ClassModuleBase * layoutModule;
-       PackagesModuleBase * packagesModule;
        PaperModuleBase * paperModule;
        MarginsModuleBase * marginsModule;
        LanguageModuleBase * langModule;
        BulletsModule * bulletsModule;
        NumberingModuleBase * numberingModule;
        BiblioModuleBase * biblioModule;
+       PackagesModuleBase * packagesModule;
        PreambleModuleBase * preambleModule;
 
        QDocument * form_;

diff --git a/src/frontends/qt2/ui/ClassModuleBase.ui b/src/frontends/qt2/ui/ClassModuleBase.ui
index c9c6f8e5fd1081328567bc4f33c8ad415eae62da..e7f8eb5520d34666594f35bd2aa079ed7f5c9391 100644 (file)
--- a/src/frontends/qt2/ui/ClassModuleBase.ui
+++ b/src/frontends/qt2/ui/ClassModuleBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>317</width>
+            <width>313</width>
             <height>287</height>
         </rect>
     </property>
@@ -110,20 +110,6 @@
                 <cstring>pagestyleCO</cstring>
             </property>
         </widget>
-        <widget row="3"  column="1" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>fontsCO</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>3</hsizetype>
-                    <vsizetype>0</vsizetype>
-                </sizepolicy>
-            </property>
-        </widget>
         <widget row="3"  column="2" >
             <class>QComboBox</class>
             <property stdset="1">
@@ -131,48 +117,7 @@
                 <cstring>fontsizeCO</cstring>
             </property>
         </widget>
-        <widget row="3"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>fontsL</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;Font &amp;&amp; size :</string>
-            </property>
-            <property>
-                <name>buddy</name>
-                <cstring>fontsCO</cstring>
-            </property>
-        </widget>
-        <widget row="4"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>floatPlacementL</cstring>
-            </property>
-            <property stdset="1">
-                <name>enabled</name>
-                <bool>true</bool>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Float &amp;placement:</string>
-            </property>
-            <property>
-                <name>buddy</name>
-                <cstring>floatPlacementLE</cstring>
-            </property>
-        </widget>
-        <widget row="4"  column="1" >
-            <class>QLineEdit</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>floatPlacementLE</cstring>
-            </property>
-        </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="3" >
+        <widget row="6"  column="0"  rowspan="1"  colspan="3" >
             <class>QButtonGroup</class>
             <property stdset="1">
                 <name>name</name>
@@ -255,6 +200,112 @@
                 </widget>
             </grid>
         </widget>
+        <widget row="5"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>floatPlacementL</cstring>
+            </property>
+            <property stdset="1">
+                <name>enabled</name>
+                <bool>true</bool>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Float &amp;placement:</string>
+            </property>
+            <property>
+                <name>buddy</name>
+                <cstring>floatPlacementLE</cstring>
+            </property>
+        </widget>
+        <widget row="5"  column="1" >
+            <class>QLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>floatPlacementLE</cstring>
+            </property>
+        </widget>
+        <widget row="4"  column="2" >
+            <class>QLineEdit</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>lspacingLE</cstring>
+            </property>
+            <property stdset="1">
+                <name>enabled</name>
+                <bool>false</bool>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>1</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+        </widget>
+        <widget row="3"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>fontsL</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>&amp;Font &amp;&amp; size :</string>
+            </property>
+            <property>
+                <name>buddy</name>
+                <cstring>fontsCO</cstring>
+            </property>
+        </widget>
+        <widget row="4"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>lspacingL</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>&amp;Line spacing :</string>
+            </property>
+            <property>
+                <name>buddy</name>
+                <cstring>lspacingCO</cstring>
+            </property>
+        </widget>
+        <widget row="3"  column="1" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>fontsCO</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+        </widget>
+        <widget row="4"  column="1" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>lspacingCO</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>duplicatesEnabled</name>
+                <bool>false</bool>
+            </property>
+        </widget>
     </grid>
 </widget>
 <customwidgets>

diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt2/ui/LanguageModuleBase.ui
index 3f97e65d3f9271896ed35e9b78fe22a8fd79697b..85b830a4a5e1a021edf9364de25ad3b0e2a81173 100644 (file)
--- a/src/frontends/qt2/ui/LanguageModuleBase.ui
+++ b/src/frontends/qt2/ui/LanguageModuleBase.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>286</width>
-            <height>170</height>
+            <width>282</width>
+            <height>190</height>
         </rect>
     </property>
     <property stdset="1">
@@ -30,36 +30,7 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="0"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>languageL</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&amp;Language:</string>
-            </property>
-            <property>
-                <name>buddy</name>
-                <cstring>languageCO</cstring>
-            </property>
-        </widget>
-        <widget row="0"  column="1" >
-            <class>QComboBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>languageCO</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                </sizepolicy>
-            </property>
-        </widget>
-        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+        <widget row="2"  column="0"  rowspan="1"  colspan="2" >
             <class>QButtonGroup</class>
             <property stdset="1">
                 <name>name</name>
@@ -156,6 +127,68 @@
                 </spacer>
             </grid>
         </widget>
+        <widget row="0"  column="1" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>languageCO</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+        </widget>
+        <widget row="0"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>languageL</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>&amp;Language:</string>
+            </property>
+            <property>
+                <name>buddy</name>
+                <cstring>languageCO</cstring>
+            </property>
+        </widget>
+        <widget row="1"  column="0" >
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>encodingL</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>&amp;Encoding:</string>
+            </property>
+            <property>
+                <name>buddy</name>
+                <cstring>encodingCO</cstring>
+            </property>
+        </widget>
+        <widget row="1"  column="1" >
+            <class>QComboBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>encodingCO</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>7</hsizetype>
+                    <vsizetype>0</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>duplicatesEnabled</name>
+                <bool>false</bool>
+            </property>
+        </widget>
     </grid>
 </widget>
 </UI>

diff --git a/src/frontends/qt2/ui/PackagesModuleBase.ui b/src/frontends/qt2/ui/PackagesModuleBase.ui
index 2bee6ffc4022e39db3521f8b04532b7c2777ae63..2c92a38b8193dcf47eea98e4258d90ad2d9d304a 100644 (file)
--- a/src/frontends/qt2/ui/PackagesModuleBase.ui
+++ b/src/frontends/qt2/ui/PackagesModuleBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>361</width>
+            <width>357</width>
             <height>231</height>
         </rect>
     </property>
@@ -49,24 +49,6 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget row="0"  column="2" >
-                    <class>QLineEdit</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>lspacingLE</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>enabled</name>
-                        <bool>false</bool>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>1</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                </widget>
                 <widget row="2"  column="0" >
                     <class>QCheckBox</class>
                     <property stdset="1">
@@ -78,64 +60,6 @@
                         <string>Use AMS &amp;math</string>
                     </property>
                 </widget>
-                <widget row="1"  column="1" >
-                    <class>QComboBox</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>encodingCO</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>duplicatesEnabled</name>
-                        <bool>false</bool>
-                    </property>
-                </widget>
-                <widget row="0"  column="1" >
-                    <class>QComboBox</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>lspacingCO</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>duplicatesEnabled</name>
-                        <bool>false</bool>
-                    </property>
-                </widget>
-                <widget row="0"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>lspacingL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Line spacing :</string>
-                    </property>
-                </widget>
-                <widget row="1"  column="0" >
-                    <class>QLabel</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>encodingL</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Encoding:</string>
-                    </property>
-                </widget>
             </grid>
         </widget>
         <widget>
@@ -195,9 +119,6 @@
     </vbox>
 </widget>
 <tabstops>
-    <tabstop>lspacingCO</tabstop>
-    <tabstop>lspacingLE</tabstop>
-    <tabstop>encodingCO</tabstop>
     <tabstop>amsCB</tabstop>
     <tabstop>psdriverCO</tabstop>
 </tabstops>

diff --git a/src/frontends/qt2/ui/QDocumentDialogBase.ui b/src/frontends/qt2/ui/QDocumentDialogBase.ui
index e6457f92d0f9e3c2992977ef7bc1fec9834bd192..c3a8ca0621a50ca9f04529b49f6dd0fa4261a33e 100644 (file)
--- a/src/frontends/qt2/ui/QDocumentDialogBase.ui
+++ b/src/frontends/qt2/ui/QDocumentDialogBase.ui
@@ -13,10 +13,17 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>465</width>
-            <height>363</height>
+            <width>410</width>
+            <height>230</height>
         </rect>
     </property>
+    <property stdset="1">
+        <name>sizePolicy</name>
+        <sizepolicy>
+            <hsizetype>1</hsizetype>
+            <vsizetype>1</vsizetype>
+        </sizepolicy>
+    </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
@@ -34,71 +41,6 @@
             <name>spacing</name>
             <number>6</number>
         </property>
-        <widget row="1"  column="1" >
-            <class>QLayoutWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>Layout2</cstring>
-            </property>
-            <property stdset="1">
-                <name>caption</name>
-                <string></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>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>defaultPB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Use Class Defaults</string>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Reset default params of the current class</string>
-                    </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>savePB</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>3</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Save as Document Defaults</string>
-                    </property>
-                    <property>
-                        <name>toolTip</name>
-                        <string>Save settings as LyX's default template</string>
-                    </property>
-                </widget>
-            </hbox>
-        </widget>
         <widget row="2"  column="0"  rowspan="1"  colspan="2" >
             <class>QLayoutWidget</class>
             <property stdset="1">
@@ -181,27 +123,13 @@
                 </widget>
             </hbox>
         </widget>
-        <widget row="0"  column="0"  rowspan="2"  colspan="1" >
-            <class>QListBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>moduleLB</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>7</vsizetype>
-                </sizepolicy>
-            </property>
-        </widget>
         <widget row="0"  column="1" >
             <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>
@@ -210,7 +138,21 @@
                     <name>spacing</name>
                     <number>6</number>
                 </property>
-                <widget>
+                <widget row="2"  column="0" >
+                    <class>QWidgetStack</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>moduleStack</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>5</hsizetype>
+                            <vsizetype>7</vsizetype>
+                        </sizepolicy>
+                    </property>
+                </widget>
+                <widget row="0"  column="0" >
                     <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
@@ -219,7 +161,7 @@
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
-                            <hsizetype>7</hsizetype>
+                            <hsizetype>5</hsizetype>
                             <vsizetype>0</vsizetype>
                         </sizepolicy>
                     </property>
@@ -228,7 +170,7 @@
                         <string>title here</string>
                     </property>
                 </widget>
-                <widget>
+                <widget row="1"  column="0" >
                     <class>Line</class>
                     <property stdset="1">
                         <name>name</name>
@@ -246,21 +188,111 @@
                         <enum>Horizontal</enum>
                     </property>
                 </widget>
+            </grid>
+        </widget>
+        <widget row="0"  column="0" >
+            <class>QListBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>moduleLB</cstring>
+            </property>
+            <property stdset="1">
+                <name>sizePolicy</name>
+                <sizepolicy>
+                    <hsizetype>5</hsizetype>
+                    <vsizetype>7</vsizetype>
+                </sizepolicy>
+            </property>
+            <property stdset="1">
+                <name>vScrollBarMode</name>
+                <enum>AlwaysOff</enum>
+            </property>
+            <property stdset="1">
+                <name>variableWidth</name>
+                <bool>false</bool>
+            </property>
+        </widget>
+        <widget row="1"  column="0"  rowspan="1"  colspan="2" >
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout4</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <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>QWidgetStack</class>
+                    <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>moduleStack</cstring>
+                        <cstring>defaultPB</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>7</vsizetype>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
                         </sizepolicy>
                     </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Use Class Defaults</string>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Reset default params of the current class</string>
+                    </property>
                 </widget>
-            </vbox>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>savePB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>3</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Save as Document Defaults</string>
+                    </property>
+                    <property>
+                        <name>toolTip</name>
+                        <string>Save settings as LyX's default template</string>
+                    </property>
+                </widget>
+            </hbox>
         </widget>
     </grid>
 </widget>
@@ -269,7 +301,7 @@
         <class>QWidgetStack</class>
         <header location="global">qwidgetstack.h</header>
         <sizehint>
-            <width>-1</width>
+            <width>0</width>
             <height>-1</height>
         </sizehint>
         <container>0</container>