src/CutAndPaste.C
src/LColor.C
src/LaTeX.C
-src/LyXAction.C
src/MenuBackend.C
src/ParagraphParameters.C
src/buffer.C
src/frontends/qt2/QChanges.C
src/frontends/qt2/QCharacter.C
src/frontends/qt2/QCitation.C
-src/frontends/qt2/QCitationDialog.C
src/frontends/qt2/QCommandBuffer.C
src/frontends/qt2/QDelimiterDialog.C
src/frontends/qt2/QDocument.C
+2003-04-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
+
+ * QPrefs.C (apply): only set colors if they are different from
+ their original values
+
2003-04-30 John Levon <levon@movementarian.org>
* various: change dialog titles to match new menu layout
QListBoxItem * ib(colmod->lyxObjectsLB->item(i));
QColorItem * ci(static_cast<QColorItem*>(ib));
- ostringstream ostr;
-
- ostr << '#' << std::setbase(16) << setfill('0')
- << setw(2) << ci->color().red()
- << setw(2) << ci->color().green()
- << setw(2) << ci->color().blue();
-
- string newhex(STRCONV(ostr.str()));
-
- LColor::color col(dialog_->colors_[i]);
+ LColor::color const col(dialog_->colors_[i]);
+ QColor const qcol(toqstr(lcolor.getX11Name(col)));
// FIXME: dubious, but it's what xforms does
- if (lcolor.getX11Name(col) != newhex) {
+ if (qcol != ci->color()) {
+ ostringstream ostr;
+
+ ostr << '#' << std::setbase(16) << setfill('0')
+ << setw(2) << ci->color().red()
+ << setw(2) << ci->color().green()
+ << setw(2) << ci->color().blue();
+
+ string newhex(STRCONV(ostr.str()));
controller().setColor(col, newhex);
}
}