/branches/Version13x/Scribus/scribus/Makefile.am |
---|
230,7 → 230,7 |
INTERFACES = |
TRANSLATIONS = |
SUBDIRS = $(renderer_subdirs) dicts doc icons keysets manpages plugins po profiles qm templates dtd loremipsum |
SUBDIRS = $(renderer_subdirs) dicts doc icons keysets manpages plugins po profiles qm swatches templates dtd loremipsum |
# NOTE: `EXTRA_DIST' is *NOT* required. The build system includes all |
# loose files by default. You only need to use `EXTRA_DIST' when using |
245,16 → 245,7 |
install-data-local: |
$(mkinstalldirs) $(libdir)/scribus/ |
$(INSTALL_DATA) $(srcdir)/rgbsvg.txt $(libdir)/scribus/rgbsvg.txt |
$(mkinstalldirs) $(libdir)/scribus/ |
$(INSTALL_DATA) $(srcdir)/rgbscribusgreys.txt $(libdir)/scribus/rgbscribusgreys.txt |
$(mkinstalldirs) $(libdir)/scribus/ |
$(INSTALL_DATA) $(srcdir)/rgbscribusgnome.txt $(libdir)/scribus/rgbscribusgnome.txt |
$(mkinstalldirs) $(libdir)/scribus/ |
$(INSTALL_DATA) $(srcdir)/rgbscribus.txt $(libdir)/scribus/rgbscribus.txt |
$(mkinstalldirs) $(prefix)/include/scribus/ |
$(INSTALL_DATA) $(srcdir)/rgbscribusopenoffice.txt $(libdir)/scribus/rgbscribusopenoffice.txt |
$(mkinstalldirs) $(prefix)/include/scribus/ |
$(INSTALL_DATA) $(srcdir)/about.h $(prefix)/include/scribus/about.h |
$(INSTALL_DATA) $(srcdir)/actionmanager.h $(prefix)/include/scribus/actionmanager.h |
$(INSTALL_DATA) $(srcdir)/aligndistribute.h $(prefix)/include/scribus/aligndistribute.h |
432,11 → 423,6 |
$(INSTALL_DATA) $(srcdir)/werktoolb.h $(prefix)/include/scribus/werktoolb.h |
uninstall-local: |
-rm -f $(libdir)/scribus/rgbscribus.txt |
-rm -f $(libdir)/scribus/rgbscribusgnome.txt |
-rm -f $(libdir)/scribus/rgbscribusgreys.txt |
-rm -f $(libdir)/scribus/rgbscribusopenoffice.txt |
-rm -f $(libdir)/scribus/rgbsvg.txt |
-rm -f $(prefix)/include/scribus/about.h |
-rm -f $(prefix)/include/scribus/actionmanager.h |
-rm -f $(prefix)/include/scribus/aligndistribute.h |
/branches/Version13x/Scribus/scribus/prefsmanager.cpp |
---|
129,7 → 129,7 |
/** Default colours **/ |
appPrefs.DColors.clear(); |
QString pfadC = ScPaths::instance().libDir(); |
QString pfadC = ScPaths::instance().libDir()+"swatches/"; |
QString pfadC2 = pfadC + "rgbscribus.txt"; |
QFile fiC(pfadC2); |
if (!fiC.exists()) |
/branches/Version13x/Scribus/scribus/scpaths.h |
---|
53,6 → 53,8 |
static QStringList getSystemFontDirs(void); |
/** @brief Return paths to system icc profiles directories*/ |
static QStringList getSystemProfilesDirs(void); |
/** @brief Return paths to system create project directories*/ |
static QStringList getSystemCreateDirs(); |
protected: |
/** @brief Constructor. Use ScPaths::instance() instead. */ |
/branches/Version13x/Scribus/scribus/cmykfw.cpp |
---|
550,7 → 550,7 |
bool cus = false; |
CurrSwatch.clear(); |
QString Cpfad = QDir::convertSeparators(QDir::homeDirPath()+"/.scribus/"+Swatches->currentText()); |
QString pfadC = ScPaths::instance().libDir(); |
QString pfadC = ScPaths::instance().libDir()+"swatches/"; |
QString pfadC2 = pfadC + "rgbscribus.txt"; |
switch (n) |
{ |
/branches/Version13x/Scribus/scribus/colorm.cpp |
---|
238,7 → 238,7 |
LoadColSet->setText(CSets->text(id)); |
EditColors.clear(); |
QString Cpfad = QDir::convertSeparators(QDir::homeDirPath()+"/.scribus/"+CSets->text(id)); |
QString pfadC = ScPaths::instance().libDir(); |
QString pfadC = ScPaths::instance().libDir()+"swatches/"; |
QString pfadC2 = pfadC + "rgbscribus.txt"; |
switch (c) |
{ |
/branches/Version13x/Scribus/scribus/scpaths.cpp |
---|
224,6 → 224,20 |
return iccProfDirs; |
} |
QStringList ScPaths::getSystemCreateDirs(void) |
{ |
QStringList createDirs; |
#ifdef Q_OS_MAC |
#elif defined(Q_WS_X11) |
createDirs.append(QDir::homeDirPath()+"/create/swatches/"); |
createDirs.append(QDir::homeDirPath()+"/.create/swatches/"); |
createDirs.append("/usr/share/create/swatches/"); |
createDirs.append("/usr/local/share/create/swatches/"); |
#elif defined(_WIN32) |
#endif |
return createDirs; |
} |
QString ScPaths::getSpecialDir(int folder) |
{ |
QString qstr; |