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, 28 insertions, 2 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
index 62e1218..65c3260 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
@@ -13,12 +13,12 @@ namespace Ui {
 }
 
 class SqliteSyntaxHighlighter;
-class SqlQueryModel;
 class WidgetCover;
 class QPushButton;
 class QProgressBar;
 class ChainExecutor;
 class ViewModifier;
+class SqlViewModel;
 
 CFG_KEY_LIST(ViewWindow, QObject::tr("A view window"),
      CFG_KEY_ENTRY(REFRESH_TRIGGERS, Qt::Key_F5,                QObject::tr("Refresh view trigger list"))
@@ -41,6 +41,12 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
             REFRESH_QUERY,
             COMMIT_QUERY,
             ROLLBACK_QUERY,
+            ADD_COLUMN,
+            EDIT_COLUMN,
+            DEL_COLUMN,
+            MOVE_COLUMN_UP,
+            MOVE_COLUMN_DOWN,
+            GENERATE_OUTPUT_COLUMNS,
             // Triggers tab
             REFRESH_TRIGGERS,
             ADD_TRIGGER,
@@ -103,6 +109,12 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
         QString getCurrentTrigger() const;
         void applyInitialTab();
         QString getCurrentDdl() const;
+        QStringList indexedColumnsToNamesOnly(const QList<SqliteIndexedColumn*>& columns) const;
+        QStringList collectColumnNames() const;
+        void columnsFromViewToList();
+        int getDataTabIdx() const;
+        int getQueryTabIdx() const;
+        int getDdlTabIdx() const;
 
         Db* db = nullptr;
         QString database;
@@ -113,13 +125,16 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
         bool modified = false;
         SqliteCreateViewPtr originalCreateView;
         SqliteCreateViewPtr createView;
-        SqlQueryModel* dataModel = nullptr;
+        SqlViewModel* dataModel = nullptr;
         QString originalQuery;
         WidgetCover* widgetCover = nullptr;
         ChainExecutor* structureExecutor = nullptr;
         ViewModifier* viewModifier = nullptr;
         Ui::ViewWindow *ui = nullptr;
         bool modifyingThisView = false;
+        QAction* outputColumnsCheck = nullptr;
+        QAction* outputColumnsSeparator = nullptr;
+        bool tabsMoving = false;
 
     private slots:
         void refreshView();
@@ -139,6 +154,17 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
         void prevTab();
         void dbClosedFinalCleanup();
         void checkIfViewDeleted(const QString& database, const QString& object, DbObjectType type);
+        void updateOutputColumnsVisibility();
+        void addColumn();
+        void editColumn();
+        void delColumn();
+        void moveColumnUp();
+        void moveColumnDown();
+        void updateColumnButtons();
+        void generateOutputColumns();
+        void updateDbRelatedUiElements();
+        void updateTabsOrder();
+        void triggerViewDoubleClicked(const QModelIndex& idx);
 
     public slots:
         void refreshTriggers();