r15887 by fschmid - Fixed Bug #9492: "Save Colour Set" saves palette to the wrong directory

[scribus-commit]

Author: fschmid
Date: Tue Nov 16 22:23:16 2010
New Revision: 15887

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15887
Log:
Fixed Bug #9492: "Save Colour Set" saves palette to the wrong directory

Modified:
    branches/Version135/Scribus/scribus/colorm.cpp

Modified: branches/Version135/Scribus/scribus/colorm.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15887&path=/branches/Version135/Scribus/scribus/colorm.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/colorm.cpp (original)
+++ branches/Version135/Scribus/scribus/colorm.cpp Tue Nov 16 22:23:16 2010
@@ -154,7 +154,7 @@
 				QString Fname = docColSet;
 				Fname.replace(" ", "_");
 				Fname += ".xml";
-				pfadC2 = QDir::convertSeparators(ScPaths::getApplicationDataDir()+Fname);
+				pfadC2 = QDir::convertSeparators(ScPaths::getApplicationDataDir()+"swatches/"+Fname);
 			}
 			QFileInfo fi(pfadC2);
 			if (fi.absolutePath() == ScPaths::getApplicationDataDir()+"swatches/locked")
@@ -219,7 +219,7 @@
 
 void ColorManager::saveDefaults()
 {
-	QString Cpfad = QDir::convertSeparators(ScPaths::getApplicationDataDir());
+	QString Cpfad = QDir::convertSeparators(ScPaths::getApplicationDataDir())+"swatches/";
 	QString Name = LoadColSet->currentText();
 	Query* dia = new Query(this, "Name", 1, 0, tr("&Name:"), tr("Choose a Name"));
 	if ((Name == "Scribus Basic") || (Name == "Scribus Small") || (Name == "X11 RGB-Set") || (Name == "OpenOffice.org-Set")
@@ -304,7 +304,7 @@
 			QString Fname = txt;
 			Fname.replace(" ", "_");
 			Fname += ".xml";
-			pfadC2 = QDir::convertSeparators(ScPaths::getApplicationDataDir()+Fname);
+			pfadC2 = QDir::convertSeparators(ScPaths::getApplicationDataDir()+"swatches/"+Fname);
 		}
 	}
 	QFileInfo fi(pfadC2);