r16482 by craig - colorm: Avoid Qt FileInfo warning by not attempting to lock the small palette
scribus-commit
scribus-commit at lists.scribus.net
Wed Mar 23 22:26:07 CET 2011
Author: craig
Date: Wed Mar 23 21:26:07 2011
New Revision: 16482
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16482
Log:
colorm: Avoid Qt FileInfo warning by not attempting to lock the small palette
Modified:
branches/Version135/Scribus/scribus/colorm.cpp
Modified: branches/Version135/Scribus/scribus/colorm.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16482&path=/branches/Version135/Scribus/scribus/colorm.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/colorm.cpp (original)
+++ branches/Version135/Scribus/scribus/colorm.cpp Wed Mar 23 21:26:07 2011
@@ -307,13 +307,13 @@
pfadC2 = QDir::convertSeparators(ScPaths::getApplicationDataDir()+"swatches/"+Fname);
}
}
- QFileInfo fi(pfadC2);
- if (fi.absolutePath() == ScPaths::getApplicationDataDir()+"swatches/locked")
- paletteLocked = true;
- else
- paletteLocked = !fi.isWritable();
if (txt != "Scribus Small")
{
+ QFileInfo fi(pfadC2);
+ if (fi.absolutePath() == ScPaths::getApplicationDataDir()+"swatches/locked")
+ paletteLocked = true;
+ else
+ paletteLocked = !fi.isWritable();
if (importColorsFromFile(pfadC2, EditColors))
{
EditColors.ensureDefaultColors();
More information about the scribus-commit
mailing list