Merge tag 'upstream/3.1.0'

Upstream version 3.1.0

# gpg: Signature made Mon 13 Jun 2016 06:42:54 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 7 insertions, 0 deletions

diff --git a/Plugins/DbAndroid/dbandroid.h b/Plugins/DbAndroid/dbandroid.h
index 68893d0..20e9a67 100644
--- a/Plugins/DbAndroid/dbandroid.h
+++ b/Plugins/DbAndroid/dbandroid.h
@@ -8,10 +8,12 @@
 
 class AdbManager;
 class DbAndroidConnectionFactory;
+class QAction;
 
 CFG_CATEGORIES(DbAndroidConfig,
     CFG_CATEGORY(DbAndroid,
         CFG_ENTRY(QString, AdbPath, QString())
+        CFG_ENTRY(bool,    JarDownloadNotified, false)
     )
 )
 
@@ -40,11 +42,14 @@ class DBANDROIDSHARED_EXPORT DbAndroid : public GenericPlugin, public DbPlugin
     private:
         void initAdb();
         QString askForAdbPath();
+        void showJarMessage();
 
         AdbManager* adbManager = nullptr;
         DbAndroidConnectionFactory* connectionFactory = nullptr;
         bool adbValid = false;
+        QAction* jarAction = nullptr;
 
+        static_char* PLUGIN_MANUAL_URL = "http://wiki.sqlitestudio.pl/index.php/DbAndroid";
         static_char* SELECT_ADB_URL = "select_adb://";
 
         CFG_LOCAL_PERSISTABLE(DbAndroidConfig, cfg)
@@ -54,6 +59,8 @@ class DBANDROIDSHARED_EXPORT DbAndroid : public GenericPlugin, public DbPlugin
         void handleInvalidAdb();
         void statusFieldLinkClicked(const QString& link);
         void deviceListChanged();
+        void getJar();
+        void createJarAction(const QString& pluginName);
 
     signals:
         void adbReady(bool showMessage);