r17179 by craig - #10485 & 10486: Move swatches and profiles to share dir
scribus-commit
scribus-commit at lists.scribus.net
Tue Jan 3 21:47:01 UTC 2012
Author: craig
Date: Tue Jan 3 21:47:01 2012
New Revision: 17179
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17179
Log:
#10485 & 10486: Move swatches and profiles to share dir
Modified:
branches/Version14x/Scribus/resources/swatches/CMakeLists.txt
branches/Version14x/Scribus/scribus/colorsetmanager.cpp
branches/Version14x/Scribus/scribus/doc/en/color2.html
branches/Version14x/Scribus/scribus/doc/it/color2.html
branches/Version14x/Scribus/scribus/prefsmanager.cpp
branches/Version14x/Scribus/scribus/profiles/CMakeLists.txt
branches/Version14x/Scribus/scribus/scribuscore.cpp
Modified: branches/Version14x/Scribus/resources/swatches/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17179&path=/branches/Version14x/Scribus/resources/swatches/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/resources/swatches/CMakeLists.txt (original)
+++ branches/Version14x/Scribus/resources/swatches/CMakeLists.txt Tue Jan 3 21:47:01 2012
@@ -11,5 +11,5 @@
SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES}
- DESTINATION ${LIBDIR}swatches
+ DESTINATION ${SHAREDIR}swatches
)
Modified: branches/Version14x/Scribus/scribus/colorsetmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17179&path=/branches/Version14x/Scribus/scribus/colorsetmanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/colorsetmanager.cpp (original)
+++ branches/Version14x/Scribus/scribus/colorsetmanager.cpp Tue Jan 3 21:47:01 2012
@@ -29,7 +29,7 @@
void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs)
{
- QString pfadC = ScPaths::instance().libDir()+"swatches/";
+ QString pfadC = ScPaths::instance().shareDir()+"swatches/";
QString pfadC2 = pfadC + "Scribus_Basic.xml";
QFile fiC(pfadC2);
if (!fiC.exists())
@@ -113,7 +113,7 @@
{
paletteLocations.clear();
QStringList locations=ScPaths::instance().getSystemCreateSwatchesDirs();
- locations << ScPaths::instance().libDir()+"swatches/";
+ locations << ScPaths::instance().shareDir()+"swatches/";
locations << ScPaths::getApplicationDataDir() + "swatches/locked/";
locations << ScPaths::getApplicationDataDir() + "swatches/";
for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it )
Modified: branches/Version14x/Scribus/scribus/doc/en/color2.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17179&path=/branches/Version14x/Scribus/scribus/doc/en/color2.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/en/color2.html (original)
+++ branches/Version14x/Scribus/scribus/doc/en/color2.html Tue Jan 3 21:47:01 2012
@@ -22,7 +22,7 @@
<h4>Linux/UNIX</h4>
<p>If you have installed Scribus with a package management system like RPM, DEB or BSD Ports, the palette files need to be copied to either <code>/usr/lib/scribus/swatches</code> or <code>/usr/local/lib/scribus/swatches</code>. The respective location depends on the configuration of a distribution’s package manager.</p>
-<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/lib/scribus/swatches</code>.</p>
+<p>Those who compiled Scribus themselves need to copy the palette files to <code>installation_directory/share/scribus/swatches</code>.</p>
<p>If you don’t have root permissions, you can also copy the files to <code>/home/user_name/.scribus/swatches/locked</code>.</p>
<p>You have to create the folder <code>locked</code> if doesn’t exist.</p>
<h4>Mac OS X</h4>
Modified: branches/Version14x/Scribus/scribus/doc/it/color2.html
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17179&path=/branches/Version14x/Scribus/scribus/doc/it/color2.html
==============================================================================
--- branches/Version14x/Scribus/scribus/doc/it/color2.html (original)
+++ branches/Version14x/Scribus/scribus/doc/it/color2.html Tue Jan 3 21:47:01 2012
@@ -21,7 +21,7 @@
<h4>Linux/UNIX:</h4>
<p>Se avete installato Scribus per mezzo di un sistema di gestione dei pacchetti come RPM, DEB o BSD Ports, i file delle raccolte devono essere copiati in <code>/usr/lib/scribus/swatches</code> o <code>/usr/local/lib/scribus/swatches</code>. L'esatta posizione dipende dalla configurazione del gestore di pacchetti di ciascuna distribuzione.</p>
-<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/lib/scribus/swatches</code>.</p>
+<p>Se avete compilato Scribus personalmente dovete copiare i file delle raccolte in <code>installation_directory/share/scribus/swatches</code>.</p>
<p>Se non avete permessi di root, potete anche copiare i file in <code>/home/user_name/.scribus/swatches/locked</code>.</p>
<p>Se la cartella <code>locked</code> non esiste, dovrete crearla.</p>
<h4>Mac OS X</h4>
Modified: branches/Version14x/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17179&path=/branches/Version14x/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/prefsmanager.cpp (original)
+++ branches/Version14x/Scribus/scribus/prefsmanager.cpp Tue Jan 3 21:47:01 2012
@@ -142,7 +142,7 @@
csm.findPaletteLocations();
csm.findPalettes();
/*
- QString pfadC = ScPaths::instance().libDir()+"swatches/";
+ QString pfadC = ScPaths::instance().shareDir()+"swatches/";
QString pfadC2 = pfadC + "Scribus_X11.txt";
QFile fiC(pfadC2);
if (!fiC.exists())
Modified: branches/Version14x/Scribus/scribus/profiles/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17179&path=/branches/Version14x/Scribus/scribus/profiles/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/scribus/profiles/CMakeLists.txt (original)
+++ branches/Version14x/Scribus/scribus/profiles/CMakeLists.txt Tue Jan 3 21:47:01 2012
@@ -8,5 +8,5 @@
Readme
sRGB.icm
srgb.license
- DESTINATION ${LIBDIR}profiles
+ DESTINATION ${SHAREDIR}profiles
)
Modified: branches/Version14x/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17179&path=/branches/Version14x/Scribus/scribus/scribuscore.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribuscore.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribuscore.cpp Tue Jan 3 21:47:01 2012
@@ -332,7 +332,7 @@
PrinterProfiles.clear();
InputProfiles.clear();
InputProfilesCMYK.clear();
- QString pfad = ScPaths::instance().libDir();
+ QString pfad = ScPaths::instance().shareDir();
pfad += "profiles/";
profDirs = ScPaths::getSystemProfilesDirs();
profDirs.prepend( prefsManager->appPrefs.ProfileDir );
More information about the scribus-commit
mailing list