diff --git a/src/imagedialog.cpp b/src/imagedialog.cpp index 786e414..009fa9f 100644 --- a/src/imagedialog.cpp +++ b/src/imagedialog.cpp @@ -43,7 +43,7 @@ ImageDialog::ImageDialog( string path; if (!file.empty()) { - path = strreplace(file, "skin:", gmenu2x->getExePath()+"skins/"+gmenu2x->confStr["skin"]+"/"); + path = strreplace(file, "skin:", gmenu2x->sc.getSkinPath(gmenu2x->confStr["skin"])); string::size_type pos = path.rfind("/"); if (pos != string::npos) setPath(path.substr(0, pos)); diff --git a/src/link.cpp b/src/link.cpp index 9fa0980..b331fa4 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -84,7 +84,7 @@ const string &Link::getIcon() { } void Link::setIcon(const string &icon) { - string skinpath = gmenu2x->getExePath()+"skins/"+gmenu2x->confStr["skin"]; + string skinpath = gmenu2x->sc.getSkinPath(gmenu2x->confStr["skin"]); if (icon.substr(0,skinpath.length()) == skinpath) { string tempIcon = icon.substr(skinpath.length(), icon.length()); @@ -99,7 +99,7 @@ void Link::setIcon(const string &icon) { iconPath = strreplace(this->icon,"skin:",skinpath+"/"); if (iconPath.empty() || !fileExists(iconPath)) { - iconPath = strreplace(this->icon,"skin:",gmenu2x->getExePath()+"skins/Default/"); + iconPath = strreplace(this->icon,"skin:",gmenu2x->sc.getSkinPath("Default")); if (!fileExists(iconPath)) searchIcon(); } diff --git a/src/menusettingimage.cpp b/src/menusettingimage.cpp index 0d72ecb..9b81c06 100644 --- a/src/menusettingimage.cpp +++ b/src/menusettingimage.cpp @@ -40,10 +40,10 @@ void MenuSettingImage::edit() { } void MenuSettingImage::setValue(const string &value) { - string skinpath(gmenu2x->getExePath() + "skins/" + gmenu2x->confStr["skin"]); + string skinpath(gmenu2x->sc.getSkinPath(gmenu2x->confStr["skin"])); bool inSkinDir = value.substr(0, skinpath.length()) == skinpath; if (!inSkinDir && gmenu2x->confStr["skin"] != "Default") { - skinpath = gmenu2x->getExePath() + "skins/Default"; + skinpath = gmenu2x->sc.getSkinPath("Default"); inSkinDir = value.substr(0, skinpath.length()) == skinpath; } if (inSkinDir) {