summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-16 22:39:26 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-16 22:43:33 +0300
commit4f5e0e5863d869a5752fc485ac5f4457bd58404b (patch)
treee38b003e62c4672807b1f0679a86042343d31b84 /src
parentb0a4559af43b45905d3689e94db87aaf3fa18fcd (diff)
downloadmv-4f5e0e5863d869a5752fc485ac5f4457bd58404b.tar.gz
mv-4f5e0e5863d869a5752fc485ac5f4457bd58404b.tar.bz2
mv-4f5e0e5863d869a5752fc485ac5f4457bd58404b.tar.xz
mv-4f5e0e5863d869a5752fc485ac5f4457bd58404b.zip
Move urls for client update into branding file.
New branding options: androidDownloadUrl - url for android update. androidDownloadText - text for android update link. otherDownloadUrl - url for other os update. otherDownloadText - text for other os update link. windowsDownloadUrl - url for windows update. windowsDownloadText - text for windows update link.
Diffstat (limited to 'src')
-rw-r--r--src/defaults.cpp9
-rw-r--r--src/gui/windows/updaterwindow.cpp23
2 files changed, 20 insertions, 12 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 35fa277eb..2db7acd41 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -453,6 +453,15 @@ DefaultsData* getBrandingDefaults()
AddDEF("wallpaperFile", "");
AddDEF("dataPath", "");
+
+ AddDEF("androidDownloadUrl", "https://play.google.com/store/apps/details"
+ "?id=org.evolonline.beta.manaplus");
+ AddDEF("androidDownloadText", "Google Play");
+ AddDEF("otherDownloadUrl", "http://manaplus.org/");
+ AddDEF("otherDownloadText", "http://manaplus.org/");
+ AddDEF("windowsDownloadUrl", "http://download.evolonline.org/"
+ "manaplus/download/manaplus-win32.exe");
+ AddDEF("windowsDownloadText", "download here");
return configData;
}
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index c70222677..4c1a94a13 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -445,23 +445,22 @@ void UpdaterWindow::loadPatch()
}
if (version > CHECK_VERSION)
{
-#if defined(ANDROID)
mBrowserBox->addRow("", true);
- mBrowserBox->addRow("##1You can download from [[@@"
- "https://play.google.com/store/apps/details?id=org.evolonline"
- ".beta.manaplus|Google Play@@]", true);
- mBrowserBox->addRow("##1ManaPlus updated.", true);
+#if defined(ANDROID)
+ const std::string url = "androidDownloadUrl";
+ const std::string text = "androidDownloadUrl";
#elif defined(WIN32)
- mBrowserBox->addRow("", true);
- mBrowserBox->addRow(" ##1[@@http://download.evolonline.org/"
- "manaplus/download/manaplus-win32.exe|download here@@]", true);
+ const std::string url = "windowsDownloadUrl";
+ const std::string text = "windowsDownloadUrl";
#else
- mBrowserBox->addRow("", true);
- mBrowserBox->addRow(" ##1@@http://manaplus.org/|"
- "http://manaplus.org/@@", true);
+ const std::string url = "otherDownloadUrl";
+ const std::string text = "otherDownloadUrl";
+#endif
+ mBrowserBox->addRow(std::string(" ##1[@@").append(
+ branding.getStringValue(url)).append("|").append(
+ branding.getStringValue(text)).append("@@]"), true);
mBrowserBox->addRow("##1You can download it from", true);
mBrowserBox->addRow("##1ManaPlus updated.", true);
-#endif
}
else
{