diff options
-rw-r--r-- | rbutil/rbutilqt/base/rbsettings.cpp | 21 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 8 |
2 files changed, 16 insertions, 13 deletions
diff --git a/rbutil/rbutilqt/base/rbsettings.cpp b/rbutil/rbutilqt/base/rbsettings.cpp index 98d5b331b7..37f01c6c1c 100644 --- a/rbutil/rbutilqt/base/rbsettings.cpp +++ b/rbutil/rbutilqt/base/rbsettings.cpp | |||
@@ -165,16 +165,19 @@ void RbSettings::setSubValue(QString sub, enum UserSettings setting, QVariant va | |||
165 | 165 | ||
166 | QString RbSettings::constructSettingPath(QString path, QString substitute) | 166 | QString RbSettings::constructSettingPath(QString path, QString substitute) |
167 | { | 167 | { |
168 | QString platform = userSettings->value("platform").toString(); | 168 | // anything to substitute? |
169 | if(!substitute.isEmpty()) { | 169 | if(path.contains(':')) { |
170 | path.replace(":tts:", substitute); | 170 | QString platform = userSettings->value("platform").toString(); |
171 | path.replace(":encoder:", substitute); | 171 | if(!substitute.isEmpty()) { |
172 | } | 172 | path.replace(":tts:", substitute); |
173 | else { | 173 | path.replace(":encoder:", substitute); |
174 | path.replace(":tts:", userSettings->value("tts").toString()); | 174 | } |
175 | path.replace(":encoder:", SystemInfo::platformValue(platform,SystemInfo::CurEncoder).toString()); | 175 | else { |
176 | path.replace(":tts:", userSettings->value("tts").toString()); | ||
177 | path.replace(":encoder:", SystemInfo::platformValue(platform,SystemInfo::CurEncoder).toString()); | ||
178 | } | ||
179 | path.replace(":platform:", platform); | ||
176 | } | 180 | } |
177 | path.replace(":platform:", platform); | ||
178 | 181 | ||
179 | return path; | 182 | return path; |
180 | } | 183 | } |
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index c6b6d83450..3760901c15 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -81,12 +81,12 @@ QVariant SystemInfo::value(enum SystemInfos info) | |||
81 | int i = 0; | 81 | int i = 0; |
82 | while(SystemInfosList[i].info != info) | 82 | while(SystemInfosList[i].info != info) |
83 | i++; | 83 | i++; |
84 | 84 | QString platform = RbSettings::value(RbSettings::CurrentPlatform).toString(); | |
85 | QString s = SystemInfosList[i].name; | 85 | QString s = SystemInfosList[i].name; |
86 | s.replace(":platform:", RbSettings::value(RbSettings::CurrentPlatform).toString()); | 86 | s.replace(":platform:", platform); |
87 | QString d = SystemInfosList[i].def; | 87 | QString d = SystemInfosList[i].def; |
88 | d.replace(":platform:", RbSettings::value(RbSettings::CurrentPlatform).toString()); | 88 | d.replace(":platform:", platform); |
89 | qDebug() << "[SystemInfos] GET:" << s << systemInfos->value(s, d).toString(); | 89 | qDebug() << "[SystemInfo] GET:" << s << systemInfos->value(s, d).toString(); |
90 | return systemInfos->value(s, d); | 90 | return systemInfos->value(s, d); |
91 | } | 91 | } |
92 | 92 | ||