Merge branch 'test-updates'

apkstudio.pro

@@ -50,7 +50,6 @@ OTHER_FILES += \
     .travis.yml \
     appveyor.yml \
     res/highlight/default.theme \
-    res/highlight/java.def \
     res/highlight/numbers.def \
     res/highlight/smali.def \
     res/highlight/strings.def \

include/constants.h

@@ -64,10 +64,9 @@
 
 #define THREADS_MAX 1
 
-#define URL_CONTRIBUTE "https://github.com/vaibhavpandeyvpz/apkstudio"
-#define URL_DOWNLOADS "https://raw.githubusercontent.com/vaibhavpandeyvpz/apkstudio/%1/external/downloads.json"
-#define URL_DOCUMENTATION "http://www.vaibhavpandey.com/apkstudio"
-#define URL_ISSUES "https://github.com/vaibhavpandeyvpz/apkstudio/issues"
+#define URL_CONTRIBUTE "https://github.com/surendrajat/apkstudio"
+#define URL_DOCUMENTATION "http://surendrajat.github.io/ApkStudio"
+#define URL_ISSUES "https://github.com/surendrajat/apkstudio/issues"
 #define URL_THANKS "http://forum.xda-developers.com/showthread.php?t=2493107"
 
 /**

res/all.qrc

@@ -3,7 +3,6 @@
         <file>fonts/scp_bold.ttf</file>
         <file>fonts/scp_regular.ttf</file>
         <file>highlight/default.theme</file>
-        <file>highlight/java.def</file>
         <file>highlight/numbers.def</file>
         <file>highlight/smali.def</file>
         <file>highlight/strings.def</file>

res/html/about.html

@@ -1,3 +1,4 @@
-<p>APK Studio is a open-source and cross-platform IDE for reverse-engineering prebuilt Android applications. Written using <a href="http://www.qt.io/">Qt</a> framework, it is collaboratively developed by <a href="http://www.vaibhavpandey.com/">Vaibhav Pandey</a> along with other contributor(s).</p>
-<p>The main aim of this project is to provide ROM makers with the ease of GUI for customization of pre-packaged applications and Android system. The source code for this application is hosted at <a href="http://github.vaibhavpandey.com/apkstudio">Github</a>.</p>
-<p>Copyright (c) 2015 Vaibhav Pandey and contributor(s).</p>
+<p>APK Studio is an Open-Source Cross-platform IDE for reverse-engineering Android applications, written using <a href="http://www.qt.io/">Qt</a> framework. It is collaboratively developed by <a href="http://www.vaibhavpandey.com/">Vaibhav Pandey</a> along with other contributor(s) and currently maintained and developed by <a href="https://surendrajat.github.io/">Surendrajat</a> and contributor(s).</p>
+<p>The main aim of this project is to provide ROM makers with the ease of GUI for customization of pre-packaged applications and Android system. The source code for this application is hosted at <a href="http://surendrajat.github.io/ApkStudio">Github</a>.</p>
+<p>Copyright (c) 2015 Vaibhav Pandey and contributor(s)</p>
+<p>Copyright (c) 2018 Contributer(s)</p>

res/lang/en.ts

@@ -319,7 +319,7 @@
     </message>
     <message>
         <source>download_vendor</source>
-        <translation><![CDATA[You need to download some 3rd-party applications/files from <a href="%1">here</a> and place them in <strong>%2</strong> for APK Studio to work.]]></translation>
+        <translation><![CDATA[You need to download some 3rd-party applications/files and place them in proper directory for APK Studio to work. Please follow <a href="https://github.com/Surendrajat/ApkStudio#requirements">this link</a>]]></translation>
     </message>
     <message>
         <source>decode_failure</source>
@@ -359,7 +359,7 @@
     </message>
     <message>
         <source>app_version</source>
-        <translation><![CDATA[<strong>APK Studio</strong> <a href="https://github.com/vaibhavpandeyvpz/apkstudio/tree/%2">%1</a>]]></translation>
+        <translation><![CDATA[ <strong>APK Studio v4.0 </strong> ]]></translation>
     </message>
     <message>
         <source>no_apk</source>
@@ -445,11 +445,11 @@
     </message>
     <message>
         <source>ide</source>
-        <translation>APK Studio - http://git.io/vcZx0</translation>
+        <translation>APK Studio</translation>
     </message>
     <message>
         <source>ide_alt</source>
-        <translation>%1 - APK Studio - http://git.io/vcZx0</translation>
+        <translation>%1 - APK Studio</translation>
     </message>
     <message>
         <source>please_wait</source>

src/ide.cpp

@@ -169,7 +169,7 @@ void Ide::onInit()
     restoreState(p->docksState());
     if (!QFile::exists(PathUtils::combine(p->vendorPath(), "VERSION")))
     {
-        QMessageBox::warning(this, __("action_required", "titles"), __("download_vendor", "messages", URL_DOCUMENTATION, p->vendorPath()), QMessageBox::Close);
+        QMessageBox::warning(this, __("action_required", "titles"), __("download_vendor", "messages"), QMessageBox::Close);
     }
     QStringList f = p->sessionFiles();
     foreach (QString p, f)
@@ -286,7 +286,7 @@ void Ide::onMenuBarHelpAbout()
     QMessageBox box;
     box.setIconPixmap(Qrc::image("logo"));
     box.setInformativeText(FileUtils::read(QString(QRC_HTML).arg("about")));
-    box.setText(__("app_version", "messages", APP_REV_SHORT, APP_REV_LONG));
+    box.setText(__("app_version", "messages"));
     box.setWindowIcon(Qrc::icon("dialog_about"));
     box.setWindowTitle(__("about", "titles"));
     box.exec();