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, 11 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
index 69f210b..d8738f1 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
@@ -21,6 +21,7 @@ class TableConstraintsModel;
 class QProgressBar;
 class WidgetCover;
 class SqliteSyntaxHighlighter;
+class CenteredIconItemDelegate;
 class ConstraintTabModel;
 
 namespace Ui {
@@ -159,6 +160,8 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         QString getCurrentTrigger() const;
         void applyInitialTab();
         void resizeStructureViewColumns();
+        int getDataTabIdx() const;
+        int getStructureTabIdx() const;
 
         int newTableWindowNum = 1;
 
@@ -178,6 +181,8 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         ChainExecutor* structureExecutor = nullptr;
         TableModifier* tableModifier = nullptr;
         bool modifyingThisTable = false;
+        CenteredIconItemDelegate* constraintColumnsDelegate = nullptr;
+        bool tabsMoving = false;
 
     private slots:
         void executionSuccessful();
@@ -215,12 +220,14 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         void updateTableConstraintsToolbarState();
         void updateDdlTab();
         void updateNewTableState();
-        void on_structureView_doubleClicked(const QModelIndex &index);
-        void on_tableConstraintsView_doubleClicked(const QModelIndex &index);
+        void structureViewDoubleClicked(const QModelIndex &index);
+        void constraintsViewDoubleClicked(const QModelIndex &index);
         void nameChanged();
         void withOutRowIdChanged();
         void addIndex();
-        void editIndex();
+        void editCurrentIndex();
+        void indexViewDoubleClicked(const QModelIndex& idx);
+        void triggerViewDoubleClicked(const QModelIndex& idx);
         void delIndex();
         void addTrigger();
         void editTrigger();
@@ -229,6 +236,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild
         void updateTriggersState();
         void nextTab();
         void prevTab();
+        void updateTabsOrder();
 
     public slots:
         void updateIndexes();