fix bug 2148 (preferences saves wrong papersizes); also finally dispose dead PAPER_PA...

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 41742be6f076f59dfda95d25f0daa2ef91d9606c..e8edb55f5c91afebe91bf0efc4b2aa8d66620dfc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * lyxrc.C: set default_papersize to PAPER_DEFAULT;
+       handle PAPER_DEFAULT in LyXRC::read and LyXRC::write (bug 2148).
+       * paper.h: dispose dead PAPER_PACKAGES enum.
+
 2005-12-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * Makefile.am (OTHERLIBS): add SOCKET_LIBS in case we compile

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 350eecdb508404b22d80a925b996f94e4501fd5e..796fb85b103c103df953eb6104977ae850c57a2d 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * ControlPrefs.[Ch]: new helper functions toPaperSize and
+       fromPaperSize that prevent off-by-x errors in the papersize
+       combos (bug 2148).
+
 2005-11-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * ControlErrorList.C (goTo): give a better error message when pid

diff --git a/src/frontends/controllers/ControlPrefs.C b/src/frontends/controllers/ControlPrefs.C
index 7d3f2c7fd592ce6705359e3361c9e229fc955809..f65e29fad871e2de568054cf331a9ee4c594022b 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.C
+++ b/src/frontends/controllers/ControlPrefs.C
@@ -18,6 +18,7 @@
 #include "bufferlist.h"
 #include "gettext.h"
 #include "funcrequest.h"
+#include "paper.h"
 #include "LColor.h"
 
 #include "support/filefilterlist.h"
@@ -160,5 +161,59 @@ string const ControlPrefs::browsedir(string const & path,
        return browseDir(path, title);
 }
 
+
+// We support less paper sizes than the document dialog
+// Therefore this adjustment is needed.
+PAPER_SIZE const ControlPrefs::toPaperSize(int i) const
+{
+       switch (i) {
+       case 0:
+               return PAPER_DEFAULT;
+       case 1:
+               return PAPER_USLETTER;
+       case 2:
+               return PAPER_USLEGAL;
+       case 3:
+               return PAPER_USEXECUTIVE;
+       case 4:
+               return PAPER_A3;
+       case 5:
+               return PAPER_A4;
+       case 6:
+               return PAPER_A5;
+       case 7:
+               return PAPER_B5;
+       default:
+               // should not happen
+               return PAPER_DEFAULT;
+       }
+}
+
+
+int const ControlPrefs::fromPaperSize(PAPER_SIZE papersize) const
+{
+       switch (papersize) {
+       case PAPER_DEFAULT:
+               return 0;
+       case PAPER_USLETTER:
+               return 1;
+       case PAPER_USLEGAL:
+               return 2;
+       case PAPER_USEXECUTIVE:
+               return 3;
+       case PAPER_A3:
+               return 4;
+       case PAPER_A4:
+               return 5;
+       case PAPER_A5:
+               return 6;
+       case PAPER_B5:
+               return 7;
+       default:
+               // should not happen
+               return 0;
+       }
+}
+
 } // namespace frontend
 } // namespace lyx

diff --git a/src/frontends/controllers/ControlPrefs.h b/src/frontends/controllers/ControlPrefs.h
index f06bbd6ebd1fbd7dd520bc117adc1fbac9da2579..0d5f158808ca2ff4498fce673649f849d252377f 100644 (file)
--- a/src/frontends/controllers/ControlPrefs.h
+++ b/src/frontends/controllers/ControlPrefs.h
@@ -73,6 +73,11 @@ public:
        /// update the screen fonts after change
        void updateScreenFonts();
 
+       /// adjust the prefs paper sizes
+       PAPER_SIZE const toPaperSize(int i) const;
+       /// adjust the prefs paper sizes
+       int const fromPaperSize(PAPER_SIZE papersize) const;
+
 private:
        /// temporary lyxrc
        LyXRC rc_;

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 9fce32e306d2b4d5c2c1dde98f90ad05e19ec6c7..6a3176aba600c2ab5b15cee754f68d0e0a8239a4 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * QPrefs.C: fix off-by-x errors in paper size setting
+       by using new helper functions fromPaperSize/toPaperSize (bug 2148).
+
 2005-11-17  Michael Gerz  <michael.gerz@teststep.org>
 
        * ui/*.ui: remove dummy captions that pollute the po files

diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C
index 233d94e1abf9150e5be70896736d5141e5d95f30..84a7cebaf2a2dfef06ab901e6ce02f4b1748ecfd 100644 (file)
--- a/src/frontends/qt2/QPrefs.C
+++ b/src/frontends/qt2/QPrefs.C
@@ -212,7 +212,7 @@ void QPrefs::apply()
        rc.auto_reset_options = latexmod->latexAutoresetCB->isChecked();
        rc.view_dvi_paper_option = fromqstr(latexmod->latexDviPaperED->text());
        rc.default_papersize =
-               static_cast<PAPER_SIZE>(latexmod->latexPaperSizeCO->currentItem());
+               controller().toPaperSize(latexmod->latexPaperSizeCO->currentItem());
 
        QPrefDisplayModule * displaymod(dialog_->displayModule);
 
@@ -549,7 +549,8 @@ void QPrefs::update_contents()
        latexmod->latexIndexED->setText(toqstr(rc.index_command));
        latexmod->latexAutoresetCB->setChecked(rc.auto_reset_options);
        latexmod->latexDviPaperED->setText(toqstr(rc.view_dvi_paper_option));
-       latexmod->latexPaperSizeCO->setCurrentItem(rc.default_papersize);
+       latexmod->latexPaperSizeCO->setCurrentItem(
+               controller().fromPaperSize(rc.default_papersize));
 
 
        QPrefDisplayModule * displaymod(dialog_->displayModule);

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 5d7a7d6ded7001d970bc662f3d59efe980129b15..4ddd7a89abe10bf3a975951148c34f874b07444b 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-12  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * FormPreferences.C: fix off-by-x errors in paper size setting
+       by using new helper functions fromPaperSize/toPaperSize (bug 2148).
+
 2005-10-05  Angus Leeming  <leeming@lyx.org>
 
        * FormGraphics.C (build):

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 3b4f1f950e6d53f02b20f78d071f6ae3fd393c7f..eb4eb8b66d3bb371c7ddcdb2e05a78a6ff33aa97 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -2064,7 +2064,7 @@ void FormPreferences::OutputsMisc::apply(LyXRC & rc) const
 
        int const choice =
                fl_get_choice(dialog_->choice_default_papersize) - 1;
-       rc.default_papersize = static_cast<PAPER_SIZE>(choice);
+       rc.default_papersize = parent_.controller().toPaperSize(choice);
 
        rc.ascii_roff_command = getString(dialog_->input_ascii_roff);
        rc.chktex_command = getString(dialog_->input_checktex);
@@ -2158,7 +2158,7 @@ void FormPreferences::OutputsMisc::update(LyXRC const & rc)
        fl_set_input(dialog_->input_tex_encoding,
                     rc.fontenc.c_str());
        fl_set_choice(dialog_->choice_default_papersize,
-                     rc.default_papersize + 1);
+                     parent_.controller().fromPaperSize(rc.default_papersize) + 1);
        fl_set_input(dialog_->input_ascii_roff,
                     rc.ascii_roff_command.c_str());
        fl_set_input(dialog_->input_checktex,

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 100b22b5fe62a251a1fa20c923d1d31485490e58..a70fd8ae0150300de5302965599ca538f818fa98 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -211,7 +211,7 @@ void LyXRC::setDefaults() {
        document_path.erase();
        tempdir_path = "/tmp";
        view_dvi_paper_option.erase();
-       default_papersize = PAPER_USLETTER;
+       default_papersize = PAPER_DEFAULT;
        custom_export_format = "ps";
        chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
        bibtex_command = "bibtex";
@@ -586,6 +586,9 @@ int LyXRC::read(LyXLex & lexrc)
                                else if (size == "b5")
                                        default_papersize =
                                                PAPER_B5;
+                               else if (size == "default")
+                                       default_papersize =
+                                               PAPER_DEFAULT;
                        }
                        break;
 
@@ -1297,6 +1300,8 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                        os << "# The default papersize to use.\n"
                           << "\\default_papersize \"";
                        switch (default_papersize) {
+                       case PAPER_DEFAULT:
+                               os << "default"; break;
                        case PAPER_USLETTER:
                                os << "usletter"; break;
                        case PAPER_USLEGAL:
@@ -1311,8 +1316,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                                os << "a5"; break;
                        case PAPER_B5:
                                os << "b5"; break;
-                       case PAPER_DEFAULT: 
-                       case PAPER_CUSTOM: 
+                       case PAPER_CUSTOM:
                        case PAPER_B3:
                        case PAPER_B4: break;
                        }

diff --git a/src/paper.h b/src/paper.h
index 85b35e3195c24844074dcf58c1d36b9ed25ef4ba..bed07f9bbdd7ec44a8bf55d2179864ee33439f33 100644 (file)
--- a/src/paper.h
+++ b/src/paper.h
@@ -15,18 +15,6 @@
 #ifndef PAPER_H
 #define PAPER_H
 
-///
-enum PAPER_PACKAGES {
-       ///
-       PACKAGE_NONE,
-       ///
-       PACKAGE_A4,
-       ///
-       PACKAGE_A4WIDE,
-       ///
-       PACKAGE_WIDEMARGINSA4
-};
-
 ///
 enum PAPER_SIZE {
        ///