Mercurial > hg > svgui

diff widgets/PropertyBox.cpp @ 373:0895517bb2d1 1.2-stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents 2f83b6e3b8ca
children e1a9e478b7f2
line wrap: on
line diff
--- a/widgets/PropertyBox.cpp	Thu Nov 29 10:43:54 2007 +0000
+++ b/widgets/PropertyBox.cpp	Wed Feb 27 10:32:45 2008 +0000
@@ -642,8 +642,8 @@
     if (!newColour.isValid()) return;
 
     ColourNameDialog dialog(tr("Name New Colour"),
-                            tr("Enter name for the new colour:"),
-                            newColour, "", this);
+                            tr("Enter a name for the new colour:"),
+                            newColour, newColour.name(), this);
     dialog.showDarkBackgroundCheckbox(tr("Prefer black background for this colour"));
     if (dialog.exec() == QDialog::Accepted) {
         //!!! command