diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-06-15 19:15:57 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-06-15 19:15:57 +0000 |
| commit | 299214e2a3ede0f2f3b469a63d112ca8cf8bc304 (patch) | |
| tree | 7208a4dbe976698de6980ee5adfe2953b79cb6d2 /src/plugins/Ui/skinned | |
| parent | e6dc69227ad99ad127dd4be9eddca145d066a03d (diff) | |
| download | qmmp-299214e2a3ede0f2f3b469a63d112ca8cf8bc304.tar.gz qmmp-299214e2a3ede0f2f3b469a63d112ca8cf8bc304.tar.bz2 qmmp-299214e2a3ede0f2f3b469a63d112ca8cf8bc304.zip | |
fixed compressed skins support under windows
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2745 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui/skinned')
| -rw-r--r-- | src/plugins/Ui/skinned/skinnedsettings.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/skinreader.cpp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp index d9c172f0f..91f0b7c20 100644 --- a/src/plugins/Ui/skinned/skinnedsettings.cpp +++ b/src/plugins/Ui/skinned/skinnedsettings.cpp @@ -169,7 +169,7 @@ void SkinnedSettings::loadSkins() ui.listWidget->setCurrentItem(item); findSkins(QDir::homePath() +"/.qmmp/skins"); -#ifdef Q_OS_WIN32 +#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) findSkins(qApp->applicationDirPath()+"/skins"); #else findSkins(qApp->applicationDirPath()+"/../share/qmmp/skins"); diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp index 390ac4b8b..fbb062f18 100644 --- a/src/plugins/Ui/skinned/skinreader.cpp +++ b/src/plugins/Ui/skinned/skinreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008 by Ilya Kotov * + * Copyright (C) 2008-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -40,7 +40,6 @@ SkinReader::SkinReader(QObject *parent) dir.mkdir("skin"); } - SkinReader::~SkinReader() {} @@ -50,7 +49,11 @@ void SkinReader::generateThumbs() QDir dir(QDir::homePath() +"/.qmmp/skins"); dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks); QFileInfoList f = dir.entryInfoList(); +#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) + dir.setPath(qApp->applicationDirPath()+"/skins"); +#else dir.setPath(qApp->applicationDirPath()+"/../share/qmmp/skins"); +#endif dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); f << dir.entryInfoList(); QDir cache_dir(QDir::homePath() +"/.qmmp/cache/thumbs"); |