diff --git a/pglab/PropertiesPage.cpp b/pglab/PropertiesPage.cpp index c6b0fea..bb4f5a2 100644 --- a/pglab/PropertiesPage.cpp +++ b/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" diff --git a/pglab/catalog/widgets/CatalogConstraintPage.cpp b/pglab/catalog/widgets/CatalogConstraintPage.cpp index fc367d0..a910c57 100644 --- a/pglab/catalog/widgets/CatalogConstraintPage.cpp +++ b/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 #include diff --git a/pglab/catalog/widgets/CatalogFunctionsPage.cpp b/pglab/catalog/widgets/CatalogFunctionsPage.cpp index e3e4fbd..87eb8e7 100644 --- a/pglab/catalog/widgets/CatalogFunctionsPage.cpp +++ b/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 #include "util/PgLabTableView.h" #include diff --git a/pglab/catalog/widgets/CatalogIndexPage.cpp b/pglab/catalog/widgets/CatalogIndexPage.cpp index 89e390b..5b91d48 100644 --- a/pglab/catalog/widgets/CatalogIndexPage.cpp +++ b/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 #include #include "catalog/delegates/IconColumnDelegate.h" diff --git a/pglab/catalog/widgets/CatalogNamespacePage.cpp b/pglab/catalog/widgets/CatalogNamespacePage.cpp index afef3f3..60fd014 100644 --- a/pglab/catalog/widgets/CatalogNamespacePage.cpp +++ b/pglab/catalog/widgets/CatalogNamespacePage.cpp @@ -1,7 +1,7 @@ #include "CatalogNamespacePage.h" #include #include "NamespaceItemModel.h" -#include "SqlCodePreview.h" +#include "widgets/SqlCodePreview.h" #include "catalog/PgDatabaseCatalog.h" CatalogNamespacePage::CatalogNamespacePage(QWidget *parent) diff --git a/pglab/catalog/widgets/CatalogPageBase.cpp b/pglab/catalog/widgets/CatalogPageBase.cpp index 65f3a96..7880d12 100644 --- a/pglab/catalog/widgets/CatalogPageBase.cpp +++ b/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) diff --git a/pglab/catalog/widgets/CatalogSequencesPage.cpp b/pglab/catalog/widgets/CatalogSequencesPage.cpp index ea321b0..9508537 100644 --- a/pglab/catalog/widgets/CatalogSequencesPage.cpp +++ b/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 diff --git a/pglab/catalog/widgets/CatalogTablesPage.cpp b/pglab/catalog/widgets/CatalogTablesPage.cpp index be7ce2a..8782545 100644 --- a/pglab/catalog/widgets/CatalogTablesPage.cpp +++ b/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" diff --git a/pglab/catalog/widgets/CatalogTypesPage.cpp b/pglab/catalog/widgets/CatalogTypesPage.cpp index ab20468..c627187 100644 --- a/pglab/catalog/widgets/CatalogTypesPage.cpp +++ b/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 #include diff --git a/pglab/catalog/widgets/ColumnPage.cpp b/pglab/catalog/widgets/ColumnPage.cpp index b68e7d8..613ed93 100644 --- a/pglab/catalog/widgets/ColumnPage.cpp +++ b/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" diff --git a/pglab/catalog/widgets/TriggerPage.cpp b/pglab/catalog/widgets/TriggerPage.cpp index aa20cde..4b30a51 100644 --- a/pglab/catalog/widgets/TriggerPage.cpp +++ b/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" diff --git a/pglab/pglab.pro b/pglab/pglab.pro index 0b5944a..fa07353 100644 --- a/pglab/pglab.pro +++ b/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 \ - ConnectionManagerWindow.cpp \ - ConnectionListModel.cpp \ + CreateDatabaseDialog.cpp \ + ConnectionManagerWindow.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 \ - codeeditor/CodeEditor.cpp \ -PropertyProxyModel.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 \ - ConnectionManagerWindow.h \ - ConnectionListModel.h \ + CreateDatabaseDialog.h \ + ConnectionManagerWindow.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 diff --git a/pglab/querytool/QueryTool.cpp b/pglab/querytool/QueryTool.cpp index ebc1fbe..5e1868c 100644 --- a/pglab/querytool/QueryTool.cpp +++ b/pglab/querytool/QueryTool.cpp @@ -1,6 +1,6 @@ #include "QueryTool.h" #include "ui_QueryTab.h" -#include "SqlSyntaxHighlighter.h" +#include "util/SqlSyntaxHighlighter.h" #include #include #include diff --git a/pglab/serverinspector/DatabasesPage.cpp b/pglab/serverinspector/DatabasesPage.cpp index f4f2dc5..9c2f4d8 100644 --- a/pglab/serverinspector/DatabasesPage.cpp +++ b/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, 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); } diff --git a/pglab/SqlSyntaxHighlighter.cpp b/pglab/util/SqlSyntaxHighlighter.cpp similarity index 100% rename from pglab/SqlSyntaxHighlighter.cpp rename to pglab/util/SqlSyntaxHighlighter.cpp diff --git a/pglab/SqlSyntaxHighlighter.h b/pglab/util/SqlSyntaxHighlighter.h similarity index 100% rename from pglab/SqlSyntaxHighlighter.h rename to pglab/util/SqlSyntaxHighlighter.h diff --git a/pglab/SqlCodePreview.cpp b/pglab/widgets/SqlCodePreview.cpp similarity index 95% rename from pglab/SqlCodePreview.cpp rename to pglab/widgets/SqlCodePreview.cpp index c7eb62a..a553d53 100644 --- a/pglab/SqlCodePreview.cpp +++ b/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) diff --git a/pglab/SqlCodePreview.h b/pglab/widgets/SqlCodePreview.h similarity index 100% rename from pglab/SqlCodePreview.h rename to pglab/widgets/SqlCodePreview.h