anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 18:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 3109: http://bugzilla.lyx.org/show_bug.cgi?id=3109. Added comments regarding longer-term issues with this code.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17645 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2007-03-30 04:24:54 +00:00
parent 45372f6cf0
commit 938698335b
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontends/qt4/QPrefsDialog.C
View File

@ -485,7 +485,9 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent)
{ {
setupUi(this); 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) { for (int i = 0; i < LColor::ignore; ++i) {
LColor::color lc = static_cast<LColor::color>(i); LColor::color lc = static_cast<LColor::color>(i);
if (lc == LColor::none if (lc == LColor::none
@ -502,14 +504,15 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent)
lcolors_.push_back(lc); lcolors_.push_back(lc);
QColor color = QColor(guiApp->colorCache().get(lc)); QColor color = QColor(guiApp->colorCache().get(lc));
prefcolors_.push_back(color.name()); curcolors_.push_back(color.name());
QPixmap coloritem(32, 32); QPixmap coloritem(32, 32);
coloritem.fill(color); coloritem.fill(color);
// This is not a memory leak: // This is not a memory leak:
/*QListWidgetItem * newItem =*/ new QListWidgetItem(QIcon(coloritem), /*QListWidgetItem * newItem =*/ new QListWidgetItem(QIcon(coloritem),
toqstr(lcolor.getGUIName(lc)), lyxObjectsLW); toqstr(lcolor.getGUIName(lc)), lyxObjectsLW);
} }
newcolors_ = prefcolors_; newcolors_ = curcolors_;
// End initialization
connect(colorChangePB, SIGNAL(clicked()), connect(colorChangePB, SIGNAL(clicked()),
this, SLOT(change_color())); this, SLOT(change_color()));
@ -521,12 +524,21 @@ PrefColors::PrefColors(QPrefs * form, QWidget * parent)
void PrefColors::apply(LyXRC & /*rc*/) const void PrefColors::apply(LyXRC & /*rc*/) const
{ {
for (unsigned int i = 0; i < lcolors_.size(); ++i) { 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])); 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*/) void PrefColors::update(LyXRC const & /*rc*/)
{ {
} }

5
src/frontends/qt4/QPrefsDialog.h
View File

@ -165,7 +165,10 @@ private Q_SLOTS:
private: private:
std::vector<LColor_color> lcolors_; 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_; std::vector<QString> newcolors_;
}; };