jurgen's improvements to the doc dialog in qt

[features.git] / src / frontends / qt2 / QDocument.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);