diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-05-30 00:00:39 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-05-30 00:00:39 +0300 |
| commit | 82f54003e520947340823e8d86dcb8c57e182237 (patch) | |
| tree | 39dc448711387eb9ca2ebc57258337cd53ea172f | |
| parent | d1cd33938cc4218bd6a693af0d22620d0ac5dbf9 (diff) | |
| download | manaplus-82f54003e520947340823e8d86dcb8c57e182237.tar.gz manaplus-82f54003e520947340823e8d86dcb8c57e182237.tar.bz2 manaplus-82f54003e520947340823e8d86dcb8c57e182237.tar.xz manaplus-82f54003e520947340823e8d86dcb8c57e182237.zip | |
Add screenshots option in branding file.
Example: <option name="screenshots" value="EvolOnline"/>
| -rw-r--r-- | data/evol/evol.manaplus | 1 | ||||
| -rw-r--r-- | data/tmw/tmw.manaplus | 1 | ||||
| -rw-r--r-- | src/client.cpp | 2 | ||||
| -rw-r--r-- | src/defaults.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/desktop.cpp | 2 |
5 files changed, 5 insertions, 2 deletions
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus index 4a579c827..c9cff9017 100644 --- a/data/evol/evol.manaplus +++ b/data/evol/evol.manaplus @@ -3,6 +3,7 @@ <option name="appName" value="Evol Online"/> <option name="appShort" value="mana"/> <option name="appIcon" value="evol/icons/evol-client"/> + <option name="screenshots" value="EvolOnline"/> <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/> <option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/> <option name="onlineServerFile" value="evol.xml"/> diff --git a/data/tmw/tmw.manaplus b/data/tmw/tmw.manaplus index d93a1e8fe..db13b8f87 100644 --- a/data/tmw/tmw.manaplus +++ b/data/tmw/tmw.manaplus @@ -3,6 +3,7 @@ <option name="appName" value="The Mana World"/> <option name="appShort" value="mana"/> <option name="appIcon" value="tmw/icons/tmw.png"/> + <option name="screenshots" value="TheManaWorld"/> <option name="loginMusic" value="Magick - Real.ogg"/> <option name="onlineServerList" value="http://manaplus.evolonline.org/serverlist.xml"/> <option name="defaultServer" value="server.themanaworld.org"/> diff --git a/src/client.cpp b/src/client.cpp index 3803b08b5..ceff605ff 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -2261,7 +2261,7 @@ void Client::initScreenshotDir() if (config.getBoolValue("useScreenshotDirectorySuffix")) { const std::string configScreenshotSuffix = - branding.getValue("appShort", "mana"); + branding.getValue("screenshots", "ManaPlus"); if (!configScreenshotSuffix.empty()) { diff --git a/src/defaults.cpp b/src/defaults.cpp index 11ebec96b..9fb64e7a7 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -380,6 +380,7 @@ DefaultsData* getBrandingDefaults() "http://manaplus.org/serverlist.xml"); AddDEF("onlineServerFile", "serverlistplus.xml"); AddDEF("appShort", "mana"); + AddDEF("screenshots", "ManaPlus"); AddDEF("defaultUpdateHost", ""); AddDEF("helpPath", ""); AddDEF("theme", ""); diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 56450cd1f..7f3532381 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -45,7 +45,7 @@ Desktop::Desktop(const Widget2 *const widget) : Wallpaper::loadWallpapers(); - std::string appName = branding.getValue("appName", std::string("")); + std::string appName = branding.getValue("appName", std::string()); if (appName.empty()) { |