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

* merge from trunk (1.2 ended up being tracked from trunk, but we may want
  this branch for fixes later)

 {
     QColor newColour = QColorDialog::getColor();
     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
         ColourDatabase *db = ColourDatabase::getInstance();
         int index = db->addColour(newColour, dialog.getColourName());