Project reorganization

pglab/PropertiesPage.cpp

@@ -2,7 +2,7 @@
 #include "util/PgLabItemDelegate.h"
 #include "PropertyProxyModel.h"
 #include "ResultTableModelUtil.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "util/PgLabTableView.h"
 
 

pglab/catalog/widgets/CatalogConstraintPage.cpp

@@ -3,7 +3,7 @@
 #include "CustomFilterSortModel.h"
 #include "catalog/delegates/IconColumnDelegate.h"
 #include "util/PgLabTableView.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include <QHeaderView>
 #include <QStringBuilder>
 

pglab/catalog/widgets/CatalogFunctionsPage.cpp

@@ -4,7 +4,7 @@
 #include "CustomDataRole.h"
 #include "util/PgLabItemDelegate.h"
 #include "catalog/models/ProcTableModel.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include <QApplication>
 #include "util/PgLabTableView.h"
 #include <QHeaderView>

pglab/catalog/widgets/CatalogIndexPage.cpp

@@ -2,7 +2,7 @@
 #include "CustomFilterSortModel.h"
 #include "catalog/models/IndexModel.h"
 #include "util/PgLabTableView.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include <QHeaderView>
 #include <QStringBuilder>
 #include "catalog/delegates/IconColumnDelegate.h"

pglab/catalog/widgets/CatalogNamespacePage.cpp

@@ -1,7 +1,7 @@
 #include "CatalogNamespacePage.h"
 #include <QTreeView>
 #include "NamespaceItemModel.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "catalog/PgDatabaseCatalog.h"
 
 CatalogNamespacePage::CatalogNamespacePage(QWidget *parent)

pglab/catalog/widgets/CatalogPageBase.cpp

@@ -1,7 +1,7 @@
 #include "catalog/widgets/CatalogPageBase.h"
 #include "CustomFilterSortModel.h"
 #include "util/PgLabTableView.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 
 CatalogPageBase::CatalogPageBase(QWidget *parent)
 	: QSplitter(Qt::Vertical, parent)

pglab/catalog/widgets/CatalogSequencesPage.cpp

@@ -4,7 +4,7 @@
 #include "CustomDataRole.h"
 #include "util/PgLabItemDelegate.h"
 #include "catalog/models/SequenceModel.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "util/PgLabTableView.h"
 #include <QHeaderView>
 

pglab/catalog/widgets/CatalogTablesPage.cpp

@@ -11,7 +11,7 @@
 #include "catalog/models/TablesTableModel.h"
 #include "util/PgLabTableView.h"
 #include "ResultTableModelUtil.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "SqlFormattingUtils.h"
 #include "catalog/PgAttributeContainer.h"
 #include "catalog/PgIndexContainer.h"

pglab/catalog/widgets/CatalogTypesPage.cpp

@@ -5,7 +5,7 @@
 #include "util/PgLabItemDelegate.h"
 #include "catalog/PgType.h"
 #include "model/TypeSelectionItemModel.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "util/PgLabTableView.h"
 #include <optional>
 #include <QHeaderView>

pglab/catalog/widgets/ColumnPage.cpp

@@ -5,7 +5,7 @@
 #include "CustomDataRole.h"
 #include "util/PgLabTableView.h"
 #include "ResultTableModelUtil.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "SqlFormattingUtils.h"
 #include "UserConfiguration.h"
 #include "catalog/PgClass.h"

pglab/catalog/widgets/TriggerPage.cpp

@@ -2,7 +2,7 @@
 #include "ResultTableModelUtil.h"
 #include "UserConfiguration.h"
 #include "catalog/PgClass.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "catalog/models/TriggerTableModel.h"
 #include "CustomFilterSortModel.h"
 #include "CustomDataRole.h"

pglab/pglab.pro

@@ -45,6 +45,8 @@ SOURCES += main.cpp\
     catalog/widgets/ColumnPage.cpp \
     catalog/widgets/DependantsPage.cpp \
     catalog/widgets/TriggerPage.cpp \
+    codeeditor/CodeEditor.cpp \
+    codeeditor/EditorGutter.cpp \
     codeeditor/GutterPainter.cpp \
     crud/CrudModel.cpp \
     crud/CrudTab.cpp \
@@ -57,6 +59,7 @@ SOURCES += main.cpp\
     serverinspector/ServerInspector.cpp \
     util/PgLabItemDelegate.cpp \
     util/PgLabTableView.cpp \
+    util/SqlSyntaxHighlighter.cpp \
     ConnectionConfigurationWidget.cpp \
     ConnectionController.cpp \
     ManagedPage.cpp \
@@ -64,9 +67,9 @@ SOURCES += main.cpp\
     NotificationModel.cpp \
     NotificationService.cpp \
     PgDumpOutputHighlighter.cpp \
-	CreateDatabaseDialog.cpp \
+    CreateDatabaseDialog.cpp \
-	ConnectionManagerWindow.cpp \
+    ConnectionManagerWindow.cpp \
-	ConnectionListModel.cpp \
+    ConnectionListModel.cpp \
     SslModeModel.cpp \
     stopwatch.cpp \
     TuplesResultWidget.cpp \
@@ -74,18 +77,15 @@ SOURCES += main.cpp\
     MasterController.cpp \
     ParamTypeDelegate.cpp \
     OpenDatabase.cpp \
-    SqlSyntaxHighlighter.cpp \
     ProcessStdioWidget.cpp \
     ResultTableModelUtil.cpp \
     NamespaceFilterWidget.cpp \
     NamespaceItemModel.cpp \
     Module.cpp \
-    codeeditor/EditorGutter.cpp \
+    PropertyProxyModel.cpp \
-    codeeditor/CodeEditor.cpp \
-PropertyProxyModel.cpp \
     CodeGenerator.cpp \
     UserConfiguration.cpp \
-    SqlCodePreview.cpp \
+    widgets/SqlCodePreview.cpp \
     CustomFilterSortModel.cpp \
     PropertiesPage.cpp \
     PasswordPromptDialog.cpp \
@@ -120,6 +120,8 @@ HEADERS  += \
     catalog/widgets/ColumnPage.h \
     catalog/widgets/DependantsPage.h \
     catalog/widgets/TriggerPage.h \
+    codeeditor/CodeEditor.h \
+    codeeditor/EditorGutter.h \
     codeeditor/GutterPainter.h \
     crud/CrudModel.h \
     crud/CrudTab.h \
@@ -132,6 +134,8 @@ HEADERS  += \
     serverinspector/ServerInspector.h \
     util/PgLabItemDelegate.h \
     util/PgLabTableView.h \
+    util/PgLabTableViewHelper.h \
+    util/SqlSyntaxHighlighter.h \
     ConnectionConfigurationWidget.h \
     ConnectionController.h \
     IDatabaseWindow.h \
@@ -140,9 +144,9 @@ HEADERS  += \
     NotificationModel.h \
     NotificationService.h \
     PgDumpOutputHighlighter.h \
-	CreateDatabaseDialog.h \
+    CreateDatabaseDialog.h \
-	ConnectionManagerWindow.h \
+    ConnectionManagerWindow.h \
-	ConnectionListModel.h \
+    ConnectionListModel.h \
     SslModeModel.h \
     stopwatch.h \
     TuplesResultWidget.h \
@@ -150,20 +154,17 @@ HEADERS  += \
     MasterController.h \
     ParamTypeDelegate.h \
     OpenDatabase.h \
-    SqlSyntaxHighlighter.h \
     ProcessStdioWidget.h \
     ResultTableModelUtil.h \
     NamespaceFilterWidget.h \
     NamespaceItemModel.h \
     Module.h \
-    codeeditor/EditorGutter.h \
-    codeeditor/CodeEditor.h \
     AbstractCommand.h \
     PropertyProxyModel.h \
-CustomDataRole.h \
+    CustomDataRole.h \
     CodeGenerator.h \
     UserConfiguration.h \
-    SqlCodePreview.h \
+    widgets/SqlCodePreview.h \
     CustomFilterSortModel.h \
     PropertiesPage.h \
     PasswordPromptDialog.h \
@@ -171,7 +172,6 @@ CustomDataRole.h \
     EditColumnTableModel.h \
     DatabaseWindow.h \
     NamespaceFilter.h  \
-    util/PgLabTableViewHelper.h \
     widgets/SingleRecordModel.h \
     widgets/SingleRecordWidget.h
 

pglab/querytool/QueryTool.cpp

@@ -1,6 +1,6 @@
 #include "QueryTool.h"
 #include "ui_QueryTab.h"
-#include "SqlSyntaxHighlighter.h"
+#include "util/SqlSyntaxHighlighter.h"
 #include <QStandardPaths>
 #include <QPushButton>
 #include <QAction>

pglab/serverinspector/DatabasesPage.cpp

@@ -1,7 +1,7 @@
 #include "DatabasesPage.h"
 
 #include "catalog/models/DatabasesTableModel.h"
-#include "SqlCodePreview.h"
+#include "widgets/SqlCodePreview.h"
 #include "SqlFormattingUtils.h"
 #include "catalog/PgDatabaseCatalog.h"
 #include "util/PgLabTableView.h"
@@ -15,16 +15,10 @@ DatabasesPage::DatabasesPage(std::shared_ptr<OpenDatabase> opendatabase, QWidget
     auto tv = m_databasesTableView.tableView();
     tv->setSelectionMode(QAbstractItemView::SingleSelection);
 
-//    m_detailsTabs = new QTabWidget(this);
-
     addWidget(tv);
-//    addWidget(m_detailsTabs);
-
     m_tableSql = new SqlCodePreview(this);
-//	m_detailsTabs->addTab(m_tableSql, "");
     addWidget(m_tableSql);
 
-
     connect(m_databasesTableView.tableView()->selectionModel(), &QItemSelectionModel::currentRowChanged,
             this, &DatabasesPage::databaseSelectionChanged);
 }

pglab/widgets/SqlCodePreview.cpp

@@ -1,6 +1,6 @@
 #include "SqlCodePreview.h"
 #include "UserConfiguration.h"
-#include "SqlSyntaxHighlighter.h"
+#include "util/SqlSyntaxHighlighter.h"
 
 SqlCodePreview::SqlCodePreview(QWidget *parent)
 	: QPlainTextEdit(parent)