RE: r30624 - lyx-devel/trunk/src/frontends/qt4

[Vincent van Ravesteijn - TNW]

>Author: vfr
>Date: Thu Jul 16 10:39:22 2009
>New Revision: 30624
>URL: http://www.lyx.org/trac/changeset/30624
>
>Log:
>Fix the enabling of the custom page size field in GuiDocument.
>
>Modified:
>   lyx-devel/trunk/src/frontends/qt4/GuiDocument.cpp
>   lyx-devel/trunk/src/frontends/qt4/GuiDocument.h
>

Juergen 1.6.4 (very easy change)

-       setCustomPapersize(!extern_geometry && psize);
+       setCustomPapersize(!extern_geometry && psize == 1);

A regression occurred because the parameter of this function was
converted into a bool by adding !extern_geometry.

Vincent



Modified: lyx-devel/trunk/src/frontends/qt4/GuiDocument.cpp
========================================================================
======
--- lyx-devel/trunk/src/frontends/qt4/GuiDocument.cpp   Thu Jul 16
10:37:32 2009   (r30623)
+++ lyx-devel/trunk/src/frontends/qt4/GuiDocument.cpp   Thu Jul 16
10:39:22 2009   (r30624)
@@ -658,9 +658,9 @@
        pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
        // page layout
        connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
-               this, SLOT(setCustomPapersize(int)));
+               this, SLOT(papersizeChanged(int)));
        connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
-               this, SLOT(setCustomPapersize(int)));
+               this, SLOT(papersizeChanged(int)));
        connect(pageLayoutModule->portraitRB, SIGNAL(clicked()),
                this, SLOT(portraitChanged()));
        connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
@@ -1154,10 +1154,14 @@  }
 
 
-void GuiDocument::setCustomPapersize(int papersize)
+void GuiDocument::papersizeChanged(int paper_size)
 {
-       bool const custom = (papersize == 1);
+       setCustomPapersize(paper_size == 1);
+}
+
 
+void GuiDocument::setCustomPapersize(bool custom) {
        pageLayoutModule->paperwidthL->setEnabled(custom);
        pageLayoutModule->paperwidthLE->setEnabled(custom);
        pageLayoutModule->paperwidthUnitCO->setEnabled(custom);
@@ -2366,7 +2370,7 @@
                documentClass().provides("geometry");
        int const psize = bp_.papersize;
        pageLayoutModule->papersizeCO->setCurrentIndex(psize);
-       setCustomPapersize(!extern_geometry && psize);
+       setCustomPapersize(!extern_geometry && psize == 1);
        pageLayoutModule->papersizeCO->setEnabled(!extern_geometry);
 
        bool const landscape =

Modified: lyx-devel/trunk/src/frontends/qt4/GuiDocument.h
========================================================================
======
--- lyx-devel/trunk/src/frontends/qt4/GuiDocument.h     Thu Jul 16
10:37:32 2009   (r30623)
+++ lyx-devel/trunk/src/frontends/qt4/GuiDocument.h     Thu Jul 16
10:39:22 2009   (r30624)
@@ -87,7 +87,7 @@
        void useDefaultsClicked();
        void setLSpacing(int);
        void setMargins(bool);
-       void setCustomPapersize(int);
+       void papersizeChanged(int);
        void setColSep();
        void setCustomMargins(bool);
        void romanChanged(int);
@@ -214,6 +214,8 @@
        bool providesScale(std::string const & font) const;
        ///
        void executeBranchRenaming() const;
+       ///
+       void setCustomPapersize(bool custom);
 private:
        ///
        void loadModuleInfo();