Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 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, 5 insertions, 4 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
index b2c0d68..ce73b11 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/dbdialog.h
@@ -47,12 +47,11 @@ class GUI_API_EXPORT DbDialog : public QDialog
     private:
         void init();
         void updateOptions();
-        void addOption(const DbPluginOption& option, int row);
+        void addOption(const DbPluginOption& option, int& row);
         QWidget* getEditor(const DbPluginOption& opt, QWidget *&editorHelper);
         QVariant getValueFrom(DbPluginOption::Type type, QWidget* editor);
         void setValueFor(DbPluginOption::Type type, QWidget* editor, const QVariant& value);
         void updateType();
-        Db* getDb();
         bool testDatabase();
         bool validate();
         void updateState();
@@ -61,14 +60,16 @@ class GUI_API_EXPORT DbDialog : public QDialog
         Mode mode;
         QStringList existingDatabaseNames;
         Db* db = nullptr;
-        QList<DbPlugin*> dbPlugins;
+        QHash<QString,DbPlugin*> dbPlugins;
         QList<QWidget*> optionWidgets;
         QHash<QString,QWidget*> optionKeyToWidget;
         QHash<QString,DbPluginOption::Type> optionKeyToType;
         QHash<QWidget*,QString> helperToKey;
         QWidget* lastWidgetInTabOrder = nullptr;
+        DbPluginOption::CustomBrowseHandler customBrowseHandler = nullptr;
+        bool disableTypeAutodetection = false;
 
-        static const constexpr int ADDITIONAL_ROWS_BEGIN_INDEX = 4;
+        static const constexpr int ADDITIONAL_ROWS_BEGIN_INDEX = 1;
 
     private slots:
         void typeChanged(int index);