Fix for bug 3109: http://bugzilla.lyx.org/show_bug.cgi?id=3109. Added comments regard...

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

diff --git a/src/frontends/qt4/QPrefsDialog.C b/src/frontends/qt4/QPrefsDialog.C
index b187823dfce9008c7fa565e80fd475e1718ba6a8..840222b8299fcfd25c07b0aa46fd953aa52a6b8e 100644 (file)
--- a/src/frontends/qt4/QPrefsDialog.C
+++ b/src/frontends/qt4/QPrefsDialog.C
@@ -485,7 +485,9 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent)
 {
        setupUi(this);
 
-       // FIXME: put in controller
+       // FIXME: all of this initialization should be put into the controller.
+       // See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg113301.html
+       // for some discussion of why that is not trivial.
        for (int i = 0; i < LColor::ignore; ++i) {
                LColor::color lc = static_cast<LColor::color>(i);
                if (lc == LColor::none
@@ -502,14 +504,15 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent)
 
                lcolors_.push_back(lc);
                QColor color = QColor(guiApp->colorCache().get(lc));
-               prefcolors_.push_back(color.name());
+               curcolors_.push_back(color.name());
                QPixmap coloritem(32, 32);
                coloritem.fill(color);
                // This is not a memory leak:
                /*QListWidgetItem * newItem =*/ new QListWidgetItem(QIcon(coloritem),
                        toqstr(lcolor.getGUIName(lc)), lyxObjectsLW);
        }
-       newcolors_ = prefcolors_;
+       newcolors_ = curcolors_;
+       // End initialization
 
        connect(colorChangePB, SIGNAL(clicked()),
                this, SLOT(change_color()));
@@ -521,12 +524,21 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent)
 void PrefColors::apply(LyXRC & /*rc*/) const
 {
        for (unsigned int i = 0; i < lcolors_.size(); ++i) {
-               if (prefcolors_[i]!=newcolors_[i])
+               if (curcolors_[i]!=newcolors_[i])
                        form_->controller().setColor(lcolors_[i], fromqstr(newcolors_[i]));
        }
+       // HACK The following line is needed because the values are not 
+       // re-initialized in ControlPrefs::initialiseParams but are only 
+       // initialized in the constructor. But the constructor is only called 
+       // once, when the dialog if first created, and is not called again when 
+       // Tools > Preferences is selected a second time: It's just called up 
+       // from memory. [See QDialogView::show(): if (!form) { build(); }.]
+       curcolors_ = newcolors_;
 }
 
 
+// FIXME The fact that this method is empty is also a symptom of the
+// problem here.
 void PrefColors::update(LyXRC const & /*rc*/)
 {
 }

diff --git a/src/frontends/qt4/QPrefsDialog.h b/src/frontends/qt4/QPrefsDialog.h
index 212055ba1349a417528c038222808fd6c3383606..6447d1e9bdbfc6c53a6407e67d351d9094795bc1 100644 (file)
--- a/src/frontends/qt4/QPrefsDialog.h
+++ b/src/frontends/qt4/QPrefsDialog.h
@@ -165,7 +165,10 @@ private Q_SLOTS:
 
 private:
        std::vector<LColor_color> lcolors_;
-       std::vector<QString> prefcolors_;
+       // FIXME the use of mutable here is required due to the
+       // fact that initialization is not done in the controller
+       // but in the constructor.
+       mutable std::vector<QString> curcolors_;
        std::vector<QString> newcolors_;
 
 };