r15663 by fschmid - Changed a string in the paintmanager to clarify the use of the palette selector when a doc is open.

[scribus-commit]

Author: fschmid
Date: Wed Oct 27 20:05:07 2010
New Revision: 15663

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15663
Log:
Changed a string in the paintmanager to clarify the use of the palette selector when a doc is open.

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/paintmanager.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15663&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Oct 27 20:05:07 2010
@@ -9980,9 +9980,9 @@
 			prefsManager->setColorSet(dia->m_colorList);
 			propertiesPalette->Cpal->SetColors(prefsManager->colorSet());
 			prefsManager->appPrefs.defaultGradients = dia->dialogGradients;
-		}
-		prefsManager->setColorSetName(dia->getColorSetName());
-		prefsManager->appPrefs.colorPrefs.CustomColorSets = dia->customColSet;
+			prefsManager->setColorSetName(dia->getColorSetName());
+			prefsManager->appPrefs.colorPrefs.CustomColorSets = dia->customColSet;
+		}
 	}
 	delete dia;
 	undoManager->setUndoEnabled(true);

Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15663&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Wed Oct 27 20:05:07 2010
@@ -106,8 +106,10 @@
 	userSwatches->setExpanded(true);
 	LoadColSet->setCurrentComboItem(docColSet);
 	if (m_doc != 0)
+	{
+		label->setText( tr("Merge Color Set"));
 		m_doc->getUsedColors(inDocUsedColors);
-
+	}
 	importButton->setEnabled(false);
 	newButton->setEnabled(false);
 	editButton->setEnabled(false);