Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 3095 → Rev 3096

/branches/Version13x/Scribus/scribus/about.cpp
46,7 → 46,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("25").arg("August").arg("2005 ");
QString bu = tr("%1 %2 %3 ").arg("26").arg("August").arg("2005 ");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/scpaths.h
38,6 → 38,11
/** @brief Return path to the Scribus share directory */
const QString& shareDir() const;
 
/** @brief Return paths to system font directories*/
static QStringList getSystemFontDirs(void);
/** @brief Return paths to system icc profiles directories*/
static QStringList getSystemProfilesDirs(void);
 
protected:
/** @brief Constructor. Use ScPaths::instance() instead. */
ScPaths();
44,6 → 49,9
/** @brief Destructor. Use ScPaths::destroy() instead. */
~ScPaths();
 
/** @brief Return path to a special directory, should be used only on Windows*/
static QString getSpecialDir(int folder);
 
/** @brief Pointer to existing instance of ScPaths, if any. */
static ScPaths* m_instance;
 
/branches/Version13x/Scribus/scribus/scpaths.cpp
1,9 → 1,9
#include "scpaths.h"
#include <qapplication.h>
#include <qdir.h>
 
#include "scconfig.h"
 
 
// On Qt/Mac we need CoreFoundation to discover the location
// of the app bundle.
#ifdef BUILD_MAC_BUNDLE
10,6 → 10,11
#include <CoreFoundation/CoreFoundation.h>
#endif
 
#ifdef _WIN32
#include <windows.h>
#include <shlobj.h>
#endif
 
// Init the singleton's "self" address to NULL
ScPaths* ScPaths::m_instance = NULL;
 
90,7 → 95,17
qDebug(QString("scpaths: plugin dir=%1").arg(m_pluginDir));
qDebug(QString("scpaths: qtplugins=%1").arg(QApplication::libraryPaths().join(":")));
*/
#endif // defined(BUILD_MAC_BUNDLE)
#elif defined(_WIN32)
QString appPath = qApp->applicationDirPath();
m_shareDir = strdup(QString("%1/share/").arg(appPath));
m_docDir = strdup(QString("%1/share/doc/").arg(appPath));
m_iconDir = strdup(QString("%1/share/icons/").arg(appPath));
m_sampleScriptDir = strdup(QString("%1/share/samples/").arg(appPath));
m_scriptDir = strdup(QString("%1/share/scripts/").arg(appPath));
m_templateDir = strdup(QString("%1/share/templates/").arg(appPath));
m_libDir = strdup(QString("%1/libs/").arg(appPath));
m_pluginDir = strdup(QString("%1/plugins/").arg(appPath));
#endif
}
 
ScPaths::~ScPaths() {};
134,3 → 149,67
{
return m_shareDir;
}
 
QStringList ScPaths::getSystemFontDirs(void)
{
QStringList fontDirs;
#ifdef BUILD_MAC_BUNDLE
fontDirs.append(QDir::homeDirPath() + "/Library/Fonts/");
fontDirs.append("/Library/Fonts/");
fontDirs.append("/Network/Library/Fonts/");
fontDirs.append("/System/Library/Fonts/");
#elif defined(_WIN32)
fontDirs.append( getSpecialDir(CSIDL_FONTS) );
#endif
return fontDirs;
}
 
QStringList ScPaths::getSystemProfilesDirs(void)
{
QStringList iccProfDirs;
#ifdef BUILD_MAC_BUNDLE
iccProfDirs.append(QDir::homeDirPath()+"/Library/ColorSync/Profiles/");
iccProfDirs.append("/System/Library/ColorSync/Profiles/");
iccProfDirs.append("/Library/ColorSync/Profiles/");
#elif defined(Q_WS_X11)
iccProfDirs.append(QDir::homeDirPath()+"/color/icc/");
iccProfDirs.append(QDir::homeDirPath()+"/.color/icc/");
iccProfDirs.append("/usr/share/color/icc/");
#elif defined(_WIN32)
// On Windows it's more complicated, profiles location depends on OS version
char sysDir[MAX_PATH + 1];
OSVERSIONINFO osVersion;
ZeroMemory( &osVersion, sizeof(OSVERSIONINFO));
osVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); // Necessary for GetVersionEx to succeed
GetVersionEx(&osVersion); // Get Windows version infos
GetSystemDirectory( sysDir, MAX_PATH ); // getSpecialDir(CSIDL_SYSTEM) fails on Win9x
QString winSysDir = QString(sysDir).replace('\\','/');
if( osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT ) // Windows NT/2k/XP
{
if( osVersion.dwMajorVersion >= 5 ) // for 2k and XP dwMajorVersion == 5
iccProfDirs.append( winSysDir + "/Spool/Drivers/Color/");
}
else if( osVersion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) // Windows 9x/Me
{
if( osVersion.dwMajorVersion >= 4 && osVersion.dwMinorVersion >= 10) // Win98 or WinMe
iccProfDirs.append( winSysDir + "/Color/");
}
#endif
return iccProfDirs;
}
 
QString ScPaths::getSpecialDir(int folder)
{
QString qstr;
#if defined(_WIN32)
char dir[256];
SHGetSpecialFolderPath(NULL, dir, folder , false);
qstr = dir;
if( !qstr.endsWith("\\") )
qstr += "\\";
qstr.replace( '\\', '/' );
#else
Q_ASSERT(false);
#endif
return qstr;
}