Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 36 insertions, 0 deletions

diff --git a/Plugins/DbSqliteWx/dbsqlitewx.cpp b/Plugins/DbSqliteWx/dbsqlitewx.cpp
new file mode 100644
index 0000000..42a8347
--- /dev/null
+++ b/Plugins/DbSqliteWx/dbsqlitewx.cpp
@@ -0,0 +1,36 @@
+#include "dbsqlitewx.h"

+#include "dbsqlitewxinstance.h"

+

+DbSqliteWx::DbSqliteWx()

+{

+}

+

+QString DbSqliteWx::getLabel() const

+{

+    return "WxSQLite3";

+}

+

+QList<DbPluginOption> DbSqliteWx::getOptionsList() const

+{

+    QList<DbPluginOption> opts;

+

+    DbPluginOption opt;

+    opt.type = DbPluginOption::PASSWORD;

+    opt.key = PASSWORD_OPT;

+    opt.label = tr("Password (key)");

+    opt.toolTip = tr("Leave empty to create or connect to decrypted database.");

+    opt.placeholderText = tr("Encryption password");

+    opts << opt;

+

+    return opts;

+}

+

+bool DbSqliteWx::checkIfDbServedByPlugin(Db *db) const

+{

+    return (db && dynamic_cast<DbSqliteWxInstance*>(db));

+}

+

+Db *DbSqliteWx::newInstance(const QString &name, const QString &path, const QHash<QString, QVariant> &options)

+{

+    return new DbSqliteWxInstance(name, path, options);

+}