aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/theme/libkvitheme.cpp
diff options
context:
space:
mode:
authorGravatar Noldor2011-03-16 21:58:18 +0000
committerGravatar Noldor2011-03-16 21:58:18 +0000
commitb9d79d0d368cccd31e0c00062b3fb3a26da3b1b8 (patch)
tree7ec35a1438f8441ec6076e475992a4fa79651701 /src/modules/theme/libkvitheme.cpp
parentupd8 spanish translation (diff)
downloadKVIrc-b9d79d0d368cccd31e0c00062b3fb3a26da3b1b8.tar.gz
KVIrc-b9d79d0d368cccd31e0c00062b3fb3a26da3b1b8.tar.bz2
KVIrc-b9d79d0d368cccd31e0c00062b3fb3a26da3b1b8.zip
Code improvements in the theme manager(wip)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5610 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/theme/libkvitheme.cpp')
-rw-r--r--src/modules/theme/libkvitheme.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 86425b9a7..3422291cc 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -101,14 +101,15 @@ static bool theme_kvs_cmd_apply(KviKvsModuleCommandCall * c)
szDir += KVI_PATH_SEPARATOR_CHAR;
szDir += szThemePackFile;
KviThemeInfo * themeInfo = new KviThemeInfo();
- if(themeInfo->loadFromDirectory(szDir))
+ if(themeInfo->load(szDir))
{
themeInfo->setSubdirectory(szThemePackFile);
if(KviMessageBox::yesNo(__tr2qs_ctx("Apply theme - KVIrc","theme"),
__tr2qs_ctx("Do you wish to apply theme \"%Q\" (version %Q)?","theme"),
&(themeInfo->name()),&(themeInfo->version())))
{
- QString szPath = themeInfo->absoluteDirectory();
+ QString szPath;
+ themeInfo->getCompleteDirPath(szPath);
if(szPath.isEmpty())return true;
KviThemeInfo out;
@@ -151,7 +152,7 @@ static bool theme_kvs_fnc_info(KviKvsModuleFunctionCall * c)
szDir += KVI_PATH_SEPARATOR_CHAR;
szDir += szThemePackFile;
KviThemeInfo * themeInfo = new KviThemeInfo();
- if(themeInfo->loadFromDirectory(szDir))
+ if(themeInfo->load(szDir))
{
KviKvsHash *pHash=new KviKvsHash();
KviKvsVariant *name=new KviKvsVariant(themeInfo->name());