diff --git a/pglab/DatabaseWindow.cpp b/pglab/DatabaseWindow.cpp index 95c7512..849b47b 100644 --- a/pglab/DatabaseWindow.cpp +++ b/pglab/DatabaseWindow.cpp @@ -2,7 +2,7 @@ #include "ui_DatabaseWindow.h" #include "util.h" #include "crud/CrudTab.h" -#include "widgets/CatalogTablesPage.h" +#include "catalog/widgets/CatalogTablesPage.h" #include "OpenDatabase.h" #include "catalog/PgDatabaseCatalog.h" #include "ConnectionController.h" @@ -22,7 +22,7 @@ #include "EditTableWidget.h" #include "CodeGenerator.h" -#include "QueryTool.h" +#include "querytool/QueryTool.h" #include namespace pg = Pgsql; diff --git a/pglab/DatabaseWindow.h b/pglab/DatabaseWindow.h index fff4646..9a8a8f6 100644 --- a/pglab/DatabaseWindow.h +++ b/pglab/DatabaseWindow.h @@ -2,7 +2,7 @@ #define MAINWINDOW_H #include "ConnectionConfig.h" -#include "CatalogInspector.h" +#include "catalog/widgets/CatalogInspector.h" #include "OpenDatabase.h" #include "Pgsql_Connection.h" #include "IDatabaseWindow.h" diff --git a/pglab/EditTableWidget.cpp b/pglab/EditTableWidget.cpp index d0db138..a2318a2 100644 --- a/pglab/EditTableWidget.cpp +++ b/pglab/EditTableWidget.cpp @@ -1,6 +1,6 @@ #include "EditTableWidget.h" #include "EditColumnTableModel.h" -#include "PgLabItemDelegate.h" +#include "util/PgLabItemDelegate.h" #include #include #include "OpenDatabase.h" diff --git a/pglab/ParamTypeDelegate.h b/pglab/ParamTypeDelegate.h index 757803c..537ecf4 100644 --- a/pglab/ParamTypeDelegate.h +++ b/pglab/ParamTypeDelegate.h @@ -2,7 +2,7 @@ #define PARAMTYPEDELEGATE_H //#include -#include "PgLabItemDelegate.h" +#include "util/PgLabItemDelegate.h" class TypeSelectionItemModel; diff --git a/pglab/PropertiesPage.cpp b/pglab/PropertiesPage.cpp index ce5a38d..c6b0fea 100644 --- a/pglab/PropertiesPage.cpp +++ b/pglab/PropertiesPage.cpp @@ -1,9 +1,9 @@ #include "PropertiesPage.h" -#include "PgLabItemDelegate.h" +#include "util/PgLabItemDelegate.h" #include "PropertyProxyModel.h" #include "ResultTableModelUtil.h" #include "SqlCodePreview.h" -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" PropertiesPage::PropertiesPage(QWidget *parent) : QSplitter(parent) diff --git a/pglab/IconColumnDelegate.cpp b/pglab/catalog/delegates/IconColumnDelegate.cpp similarity index 95% rename from pglab/IconColumnDelegate.cpp rename to pglab/catalog/delegates/IconColumnDelegate.cpp index 982e97e..c001238 100644 --- a/pglab/IconColumnDelegate.cpp +++ b/pglab/catalog/delegates/IconColumnDelegate.cpp @@ -1,4 +1,4 @@ -#include "IconColumnDelegate.h" +#include "catalog/delegates/IconColumnDelegate.h" #include IconColumnDelegate::IconColumnDelegate(QWidget *parent) diff --git a/pglab/IconColumnDelegate.h b/pglab/catalog/delegates/IconColumnDelegate.h similarity index 100% rename from pglab/IconColumnDelegate.h rename to pglab/catalog/delegates/IconColumnDelegate.h diff --git a/pglab/BaseTableModel.cpp b/pglab/catalog/models/BaseTableModel.cpp similarity index 100% rename from pglab/BaseTableModel.cpp rename to pglab/catalog/models/BaseTableModel.cpp diff --git a/pglab/BaseTableModel.h b/pglab/catalog/models/BaseTableModel.h similarity index 100% rename from pglab/BaseTableModel.h rename to pglab/catalog/models/BaseTableModel.h diff --git a/pglab/ColumnTableModel.cpp b/pglab/catalog/models/ColumnTableModel.cpp similarity index 99% rename from pglab/ColumnTableModel.cpp rename to pglab/catalog/models/ColumnTableModel.cpp index 55f5270..0e9de61 100644 --- a/pglab/ColumnTableModel.cpp +++ b/pglab/catalog/models/ColumnTableModel.cpp @@ -1,4 +1,4 @@ -#include "ColumnTableModel.h" +#include "catalog/models/ColumnTableModel.h" #include "catalog/PgDatabaseCatalog.h" #include "catalog/PgAttribute.h" #include "catalog/PgAttributeContainer.h" diff --git a/pglab/ColumnTableModel.h b/pglab/catalog/models/ColumnTableModel.h similarity index 97% rename from pglab/ColumnTableModel.h rename to pglab/catalog/models/ColumnTableModel.h index 42d63ea..8a70b77 100644 --- a/pglab/ColumnTableModel.h +++ b/pglab/catalog/models/ColumnTableModel.h @@ -1,7 +1,7 @@ #ifndef COLUMNTABLEMODEL_H #define COLUMNTABLEMODEL_H -#include "BaseTableModel.h" +#include "catalog/models/BaseTableModel.h" #include "catalog/PgAttribute.h" #include "catalog/PgDatabaseCatalog.h" #include "catalog/PgClass.h" diff --git a/pglab/ConstraintModel.cpp b/pglab/catalog/models/ConstraintModel.cpp similarity index 100% rename from pglab/ConstraintModel.cpp rename to pglab/catalog/models/ConstraintModel.cpp diff --git a/pglab/ConstraintModel.h b/pglab/catalog/models/ConstraintModel.h similarity index 100% rename from pglab/ConstraintModel.h rename to pglab/catalog/models/ConstraintModel.h diff --git a/pglab/DatabasesTableModel.cpp b/pglab/catalog/models/DatabasesTableModel.cpp similarity index 100% rename from pglab/DatabasesTableModel.cpp rename to pglab/catalog/models/DatabasesTableModel.cpp diff --git a/pglab/DatabasesTableModel.h b/pglab/catalog/models/DatabasesTableModel.h similarity index 100% rename from pglab/DatabasesTableModel.h rename to pglab/catalog/models/DatabasesTableModel.h diff --git a/pglab/DependantsTableModel.cpp b/pglab/catalog/models/DependantsTableModel.cpp similarity index 100% rename from pglab/DependantsTableModel.cpp rename to pglab/catalog/models/DependantsTableModel.cpp diff --git a/pglab/DependantsTableModel.h b/pglab/catalog/models/DependantsTableModel.h similarity index 100% rename from pglab/DependantsTableModel.h rename to pglab/catalog/models/DependantsTableModel.h diff --git a/pglab/IndexModel.cpp b/pglab/catalog/models/IndexModel.cpp similarity index 100% rename from pglab/IndexModel.cpp rename to pglab/catalog/models/IndexModel.cpp diff --git a/pglab/IndexModel.h b/pglab/catalog/models/IndexModel.h similarity index 100% rename from pglab/IndexModel.h rename to pglab/catalog/models/IndexModel.h diff --git a/pglab/ProcTableModel.cpp b/pglab/catalog/models/ProcTableModel.cpp similarity index 100% rename from pglab/ProcTableModel.cpp rename to pglab/catalog/models/ProcTableModel.cpp diff --git a/pglab/ProcTableModel.h b/pglab/catalog/models/ProcTableModel.h similarity index 100% rename from pglab/ProcTableModel.h rename to pglab/catalog/models/ProcTableModel.h diff --git a/pglab/RolesTableModel.cpp b/pglab/catalog/models/RolesTableModel.cpp similarity index 100% rename from pglab/RolesTableModel.cpp rename to pglab/catalog/models/RolesTableModel.cpp diff --git a/pglab/RolesTableModel.h b/pglab/catalog/models/RolesTableModel.h similarity index 100% rename from pglab/RolesTableModel.h rename to pglab/catalog/models/RolesTableModel.h diff --git a/pglab/SequenceModel.cpp b/pglab/catalog/models/SequenceModel.cpp similarity index 100% rename from pglab/SequenceModel.cpp rename to pglab/catalog/models/SequenceModel.cpp diff --git a/pglab/SequenceModel.h b/pglab/catalog/models/SequenceModel.h similarity index 100% rename from pglab/SequenceModel.h rename to pglab/catalog/models/SequenceModel.h diff --git a/pglab/TablesTableModel.cpp b/pglab/catalog/models/TablesTableModel.cpp similarity index 100% rename from pglab/TablesTableModel.cpp rename to pglab/catalog/models/TablesTableModel.cpp diff --git a/pglab/TablesTableModel.h b/pglab/catalog/models/TablesTableModel.h similarity index 100% rename from pglab/TablesTableModel.h rename to pglab/catalog/models/TablesTableModel.h diff --git a/pglab/TriggerTableModel.cpp b/pglab/catalog/models/TriggerTableModel.cpp similarity index 100% rename from pglab/TriggerTableModel.cpp rename to pglab/catalog/models/TriggerTableModel.cpp diff --git a/pglab/TriggerTableModel.h b/pglab/catalog/models/TriggerTableModel.h similarity index 100% rename from pglab/TriggerTableModel.h rename to pglab/catalog/models/TriggerTableModel.h diff --git a/pglab/widgets/CatalogConstraintPage.cpp b/pglab/catalog/widgets/CatalogConstraintPage.cpp similarity index 88% rename from pglab/widgets/CatalogConstraintPage.cpp rename to pglab/catalog/widgets/CatalogConstraintPage.cpp index 1a83d78..fc367d0 100644 --- a/pglab/widgets/CatalogConstraintPage.cpp +++ b/pglab/catalog/widgets/CatalogConstraintPage.cpp @@ -1,8 +1,8 @@ -#include "CatalogConstraintPage.h" -#include "ConstraintModel.h" +#include "catalog/widgets/CatalogConstraintPage.h" +#include "catalog/models/ConstraintModel.h" #include "CustomFilterSortModel.h" -#include "IconColumnDelegate.h" -#include "PgLabTableView.h" +#include "catalog/delegates/IconColumnDelegate.h" +#include "util/PgLabTableView.h" #include "SqlCodePreview.h" #include #include diff --git a/pglab/widgets/CatalogConstraintPage.h b/pglab/catalog/widgets/CatalogConstraintPage.h similarity index 100% rename from pglab/widgets/CatalogConstraintPage.h rename to pglab/catalog/widgets/CatalogConstraintPage.h diff --git a/pglab/widgets/CatalogFunctionsPage.cpp b/pglab/catalog/widgets/CatalogFunctionsPage.cpp similarity index 96% rename from pglab/widgets/CatalogFunctionsPage.cpp rename to pglab/catalog/widgets/CatalogFunctionsPage.cpp index 6fbc4d9..e3e4fbd 100644 --- a/pglab/widgets/CatalogFunctionsPage.cpp +++ b/pglab/catalog/widgets/CatalogFunctionsPage.cpp @@ -2,11 +2,11 @@ #include "ResultTableModelUtil.h" #include "CustomFilterSortModel.h" #include "CustomDataRole.h" -#include "PgLabItemDelegate.h" -#include "ProcTableModel.h" +#include "util/PgLabItemDelegate.h" +#include "catalog/models/ProcTableModel.h" #include "SqlCodePreview.h" #include -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include #include #include diff --git a/pglab/widgets/CatalogFunctionsPage.h b/pglab/catalog/widgets/CatalogFunctionsPage.h similarity index 100% rename from pglab/widgets/CatalogFunctionsPage.h rename to pglab/catalog/widgets/CatalogFunctionsPage.h diff --git a/pglab/widgets/CatalogIndexPage.cpp b/pglab/catalog/widgets/CatalogIndexPage.cpp similarity index 88% rename from pglab/widgets/CatalogIndexPage.cpp rename to pglab/catalog/widgets/CatalogIndexPage.cpp index 3025805..89e390b 100644 --- a/pglab/widgets/CatalogIndexPage.cpp +++ b/pglab/catalog/widgets/CatalogIndexPage.cpp @@ -1,11 +1,11 @@ -#include "CatalogIndexPage.h" +#include "catalog/widgets/CatalogIndexPage.h" #include "CustomFilterSortModel.h" -#include "IndexModel.h" -#include "PgLabTableView.h" +#include "catalog/models/IndexModel.h" +#include "util/PgLabTableView.h" #include "SqlCodePreview.h" #include #include -#include "IconColumnDelegate.h" +#include "catalog/delegates/IconColumnDelegate.h" CatalogIndexPage::CatalogIndexPage(QWidget *parent) diff --git a/pglab/widgets/CatalogIndexPage.h b/pglab/catalog/widgets/CatalogIndexPage.h similarity index 100% rename from pglab/widgets/CatalogIndexPage.h rename to pglab/catalog/widgets/CatalogIndexPage.h diff --git a/pglab/CatalogInspector.cpp b/pglab/catalog/widgets/CatalogInspector.cpp similarity index 91% rename from pglab/CatalogInspector.cpp rename to pglab/catalog/widgets/CatalogInspector.cpp index ff49eac..cf61f4f 100644 --- a/pglab/CatalogInspector.cpp +++ b/pglab/catalog/widgets/CatalogInspector.cpp @@ -1,11 +1,11 @@ #include "CatalogInspector.h" #include "OpenDatabase.h" #include "UserConfiguration.h" -#include "widgets/CatalogFunctionsPage.h" -#include "widgets/CatalogNamespacePage.h" -#include "widgets/CatalogSequencesPage.h" -#include "widgets/CatalogTablesPage.h" -#include "widgets/CatalogTypesPage.h" +#include "catalog/widgets/CatalogFunctionsPage.h" +#include "catalog/widgets/CatalogNamespacePage.h" +#include "catalog/widgets/CatalogSequencesPage.h" +#include "catalog/widgets/CatalogTablesPage.h" +#include "catalog/widgets/CatalogTypesPage.h" #include #include diff --git a/pglab/CatalogInspector.h b/pglab/catalog/widgets/CatalogInspector.h similarity index 100% rename from pglab/CatalogInspector.h rename to pglab/catalog/widgets/CatalogInspector.h diff --git a/pglab/widgets/CatalogNamespacePage.cpp b/pglab/catalog/widgets/CatalogNamespacePage.cpp similarity index 100% rename from pglab/widgets/CatalogNamespacePage.cpp rename to pglab/catalog/widgets/CatalogNamespacePage.cpp diff --git a/pglab/widgets/CatalogNamespacePage.h b/pglab/catalog/widgets/CatalogNamespacePage.h similarity index 93% rename from pglab/widgets/CatalogNamespacePage.h rename to pglab/catalog/widgets/CatalogNamespacePage.h index 4d41aef..8a63152 100644 --- a/pglab/widgets/CatalogNamespacePage.h +++ b/pglab/catalog/widgets/CatalogNamespacePage.h @@ -1,7 +1,7 @@ #ifndef CATALOGNAMESPACEPAGE_H #define CATALOGNAMESPACEPAGE_H -#include "widgets/CatalogPageBase.h" +#include "catalog/widgets/CatalogPageBase.h" class QTreeView; class NamespaceItemModel; diff --git a/pglab/widgets/CatalogPageBase.cpp b/pglab/catalog/widgets/CatalogPageBase.cpp similarity index 91% rename from pglab/widgets/CatalogPageBase.cpp rename to pglab/catalog/widgets/CatalogPageBase.cpp index 3d57604..65f3a96 100644 --- a/pglab/widgets/CatalogPageBase.cpp +++ b/pglab/catalog/widgets/CatalogPageBase.cpp @@ -1,6 +1,6 @@ -#include "CatalogPageBase.h" +#include "catalog/widgets/CatalogPageBase.h" #include "CustomFilterSortModel.h" -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include "SqlCodePreview.h" CatalogPageBase::CatalogPageBase(QWidget *parent) diff --git a/pglab/widgets/CatalogPageBase.h b/pglab/catalog/widgets/CatalogPageBase.h similarity index 100% rename from pglab/widgets/CatalogPageBase.h rename to pglab/catalog/widgets/CatalogPageBase.h diff --git a/pglab/widgets/CatalogSequencesPage.cpp b/pglab/catalog/widgets/CatalogSequencesPage.cpp similarity index 93% rename from pglab/widgets/CatalogSequencesPage.cpp rename to pglab/catalog/widgets/CatalogSequencesPage.cpp index 21a3306..ea321b0 100644 --- a/pglab/widgets/CatalogSequencesPage.cpp +++ b/pglab/catalog/widgets/CatalogSequencesPage.cpp @@ -1,11 +1,11 @@ -#include "CatalogSequencesPage.h" +#include "catalog/widgets/CatalogSequencesPage.h" #include "ResultTableModelUtil.h" #include "CustomFilterSortModel.h" #include "CustomDataRole.h" -#include "PgLabItemDelegate.h" -#include "SequenceModel.h" +#include "util/PgLabItemDelegate.h" +#include "catalog/models/SequenceModel.h" #include "SqlCodePreview.h" -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include CatalogSequencesPage::CatalogSequencesPage(QWidget *parent) diff --git a/pglab/widgets/CatalogSequencesPage.h b/pglab/catalog/widgets/CatalogSequencesPage.h similarity index 100% rename from pglab/widgets/CatalogSequencesPage.h rename to pglab/catalog/widgets/CatalogSequencesPage.h diff --git a/pglab/widgets/CatalogTablesPage.cpp b/pglab/catalog/widgets/CatalogTablesPage.cpp similarity index 94% rename from pglab/widgets/CatalogTablesPage.cpp rename to pglab/catalog/widgets/CatalogTablesPage.cpp index 1ed83ac..be7ce2a 100644 --- a/pglab/widgets/CatalogTablesPage.cpp +++ b/pglab/catalog/widgets/CatalogTablesPage.cpp @@ -1,21 +1,21 @@ #include "CatalogTablesPage.h" -#include "ColumnPage.h" -#include "ColumnTableModel.h" -#include "ConstraintModel.h" -#include "DependantsPage.h" -#include "PgLabTableView.h" +#include "catalog/widgets/CatalogConstraintPage.h" +#include "catalog/widgets/CatalogIndexPage.h" +#include "catalog/widgets/ColumnPage.h" +#include "catalog/widgets/DependantsPage.h" #include "PropertiesPage.h" +#include "catalog/widgets/TriggerPage.h" +#include "catalog/models/ColumnTableModel.h" +#include "catalog/models/ConstraintModel.h" +#include "catalog/models/TablesTableModel.h" +#include "util/PgLabTableView.h" #include "ResultTableModelUtil.h" #include "SqlCodePreview.h" -#include "TablesTableModel.h" -#include "TriggerPage.h" #include "SqlFormattingUtils.h" #include "catalog/PgAttributeContainer.h" #include "catalog/PgIndexContainer.h" #include "catalog/PgTriggerContainer.h" -#include "widgets/CatalogConstraintPage.h" -#include "widgets/CatalogIndexPage.h" #include #include diff --git a/pglab/widgets/CatalogTablesPage.h b/pglab/catalog/widgets/CatalogTablesPage.h similarity index 95% rename from pglab/widgets/CatalogTablesPage.h rename to pglab/catalog/widgets/CatalogTablesPage.h index e34f56c..02f61a5 100644 --- a/pglab/widgets/CatalogTablesPage.h +++ b/pglab/catalog/widgets/CatalogTablesPage.h @@ -2,8 +2,8 @@ #define CATALOGTABLESPAGE_H #include "NamespaceFilter.h" -#include "TablesTableModel.h" -#include "PgLabTableViewHelper.h" +#include "catalog/models/TablesTableModel.h" +#include "util/PgLabTableViewHelper.h" #include #include #include diff --git a/pglab/widgets/CatalogTypesPage.cpp b/pglab/catalog/widgets/CatalogTypesPage.cpp similarity index 97% rename from pglab/widgets/CatalogTypesPage.cpp rename to pglab/catalog/widgets/CatalogTypesPage.cpp index 906103c..ab20468 100644 --- a/pglab/widgets/CatalogTypesPage.cpp +++ b/pglab/catalog/widgets/CatalogTypesPage.cpp @@ -2,11 +2,11 @@ #include "ResultTableModelUtil.h" #include "CustomFilterSortModel.h" #include "CustomDataRole.h" -#include "PgLabItemDelegate.h" +#include "util/PgLabItemDelegate.h" #include "catalog/PgType.h" #include "model/TypeSelectionItemModel.h" #include "SqlCodePreview.h" -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include #include diff --git a/pglab/widgets/CatalogTypesPage.h b/pglab/catalog/widgets/CatalogTypesPage.h similarity index 100% rename from pglab/widgets/CatalogTypesPage.h rename to pglab/catalog/widgets/CatalogTypesPage.h diff --git a/pglab/ColumnPage.cpp b/pglab/catalog/widgets/ColumnPage.cpp similarity index 97% rename from pglab/ColumnPage.cpp rename to pglab/catalog/widgets/ColumnPage.cpp index a596825..b68e7d8 100644 --- a/pglab/ColumnPage.cpp +++ b/pglab/catalog/widgets/ColumnPage.cpp @@ -1,9 +1,9 @@ -#include "ColumnPage.h" +#include "catalog/widgets/ColumnPage.h" -#include "ColumnTableModel.h" +#include "catalog/models/ColumnTableModel.h" #include "CustomFilterSortModel.h" #include "CustomDataRole.h" -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include "ResultTableModelUtil.h" #include "SqlCodePreview.h" #include "SqlFormattingUtils.h" diff --git a/pglab/ColumnPage.h b/pglab/catalog/widgets/ColumnPage.h similarity index 100% rename from pglab/ColumnPage.h rename to pglab/catalog/widgets/ColumnPage.h diff --git a/pglab/DependantsPage.cpp b/pglab/catalog/widgets/DependantsPage.cpp similarity index 89% rename from pglab/DependantsPage.cpp rename to pglab/catalog/widgets/DependantsPage.cpp index 103d9d4..eada849 100644 --- a/pglab/DependantsPage.cpp +++ b/pglab/catalog/widgets/DependantsPage.cpp @@ -1,14 +1,12 @@ -#include "DependantsPage.h" +#include "catalog/widgets/DependantsPage.h" #include "ResultTableModelUtil.h" #include "UserConfiguration.h" #include "catalog/PgClass.h" -//#include "SqlCodePreview.h" -#include "DependantsTableModel.h" +#include "catalog/models/DependantsTableModel.h" #include "CustomFilterSortModel.h" #include "CustomDataRole.h" -#include "PgLabTableView.h" -//#include "catalog/PgProcContainer.h" +#include "util/PgLabTableView.h" #include #include diff --git a/pglab/DependantsPage.h b/pglab/catalog/widgets/DependantsPage.h similarity index 92% rename from pglab/DependantsPage.h rename to pglab/catalog/widgets/DependantsPage.h index d2a2056..cd55720 100644 --- a/pglab/DependantsPage.h +++ b/pglab/catalog/widgets/DependantsPage.h @@ -1,7 +1,7 @@ #ifndef DEPENDENTSPAGE_H #define DEPENDENTSPAGE_H -#include "widgets/CatalogPageBase.h" +#include "catalog/widgets/CatalogPageBase.h" class PgClass; class DependantsTableModel; diff --git a/pglab/TriggerPage.cpp b/pglab/catalog/widgets/TriggerPage.cpp similarity index 94% rename from pglab/TriggerPage.cpp rename to pglab/catalog/widgets/TriggerPage.cpp index eab0ae1..aa20cde 100644 --- a/pglab/TriggerPage.cpp +++ b/pglab/catalog/widgets/TriggerPage.cpp @@ -3,10 +3,10 @@ #include "UserConfiguration.h" #include "catalog/PgClass.h" #include "SqlCodePreview.h" -#include "TriggerTableModel.h" +#include "catalog/models/TriggerTableModel.h" #include "CustomFilterSortModel.h" #include "CustomDataRole.h" -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include "catalog/PgProcContainer.h" #include #include diff --git a/pglab/TriggerPage.h b/pglab/catalog/widgets/TriggerPage.h similarity index 92% rename from pglab/TriggerPage.h rename to pglab/catalog/widgets/TriggerPage.h index b8f0f0f..b7b5941 100644 --- a/pglab/TriggerPage.h +++ b/pglab/catalog/widgets/TriggerPage.h @@ -1,7 +1,7 @@ #ifndef TRIGGERPAGE_H #define TRIGGERPAGE_H -#include "widgets/CatalogPageBase.h" +#include "catalog/widgets/CatalogPageBase.h" class PgClass; class TriggerTableModel; diff --git a/pglab/crud/CrudTab.cpp b/pglab/crud/CrudTab.cpp index 6329535..3467597 100644 --- a/pglab/crud/CrudTab.cpp +++ b/pglab/crud/CrudTab.cpp @@ -3,7 +3,7 @@ #include "CrudModel.h" #include "CustomDataRole.h" #include "ResultTableModelUtil.h" -#include "PgLabItemDelegate.h" +#include "util/PgLabItemDelegate.h" #include "IntegerRange.h" #include "OpenDatabase.h" #include "catalog/PgClassContainer.h" diff --git a/pglab/pglab.pro b/pglab/pglab.pro index 76c1517..33ddc9e 100644 --- a/pglab/pglab.pro +++ b/pglab/pglab.pro @@ -21,24 +21,52 @@ DEFINES += _WIN32_WINNT=0x0501 win32:RC_ICONS += pglab.ico SOURCES += main.cpp\ + catalog/delegates/IconColumnDelegate.cpp \ + catalog/models/BaseTableModel.cpp \ + catalog/models/ColumnTableModel.cpp \ + catalog/models/ConstraintModel.cpp \ + catalog/models/DatabasesTableModel.cpp \ + catalog/models/DependantsTableModel.cpp \ + catalog/models/IndexModel.cpp \ + catalog/models/ProcTableModel.cpp \ + catalog/models/RolesTableModel.cpp \ + catalog/models/SequenceModel.cpp \ + catalog/models/TablesTableModel.cpp \ + catalog/models/TriggerTableModel.cpp \ + catalog/widgets/CatalogConstraintPage.cpp \ + catalog/widgets/CatalogFunctionsPage.cpp \ + catalog/widgets/CatalogIndexPage.cpp \ + catalog/widgets/CatalogInspector.cpp \ + catalog/widgets/CatalogNamespacePage.cpp \ + catalog/widgets/CatalogPageBase.cpp \ + catalog/widgets/CatalogSequencesPage.cpp \ + catalog/widgets/CatalogTablesPage.cpp \ + catalog/widgets/CatalogTypesPage.cpp \ + catalog/widgets/ColumnPage.cpp \ + catalog/widgets/DependantsPage.cpp \ + catalog/widgets/TriggerPage.cpp \ + crud/CrudModel.cpp \ + crud/CrudTab.cpp \ + querytool/QueryExplainModel.cpp \ + querytool/QueryParamListController.cpp \ + querytool/QueryResultModel.cpp \ + querytool/QueryTool.cpp \ + serverinspector/DatabasesPage.cpp \ + serverinspector/RolesPage.cpp \ + serverinspector/ServerInspector.cpp \ + util/PgLabItemDelegate.cpp \ + util/PgLabTableView.cpp \ ConnectionConfigurationWidget.cpp \ ConnectionController.cpp \ - DependantsPage.cpp \ - DependantsTableModel.cpp \ ManagedPage.cpp \ NotificationListWidget.cpp \ NotificationModel.cpp \ NotificationService.cpp \ PgDumpOutputHighlighter.cpp \ - QueryResultModel.cpp \ - QueryExplainModel.cpp \ CreateDatabaseDialog.cpp \ ConnectionManagerWindow.cpp \ ConnectionListModel.cpp \ SslModeModel.cpp \ - serverinspector/DatabasesPage.cpp \ - serverinspector/RolesPage.cpp \ - serverinspector/ServerInspector.cpp \ stopwatch.cpp \ TuplesResultWidget.cpp \ BackupDialog.cpp \ @@ -46,73 +74,73 @@ SOURCES += main.cpp\ ParamTypeDelegate.cpp \ OpenDatabase.cpp \ SqlSyntaxHighlighter.cpp \ - DatabasesTableModel.cpp \ - RolesTableModel.cpp \ ProcessStdioWidget.cpp \ ResultTableModelUtil.cpp \ - BaseTableModel.cpp \ - QueryParamListController.cpp \ - TablesTableModel.cpp \ - ColumnTableModel.cpp \ NamespaceFilterWidget.cpp \ NamespaceItemModel.cpp \ - ConstraintModel.cpp \ - IconColumnDelegate.cpp \ - IndexModel.cpp \ - crud/CrudTab.cpp \ - crud/CrudModel.cpp \ - PgLabItemDelegate.cpp \ Module.cpp \ EditorGutter.cpp \ CodeEditor.cpp \ PropertyProxyModel.cpp \ CodeGenerator.cpp \ UserConfiguration.cpp \ - TriggerTableModel.cpp \ - TriggerPage.cpp \ SqlCodePreview.cpp \ CustomFilterSortModel.cpp \ PropertiesPage.cpp \ PasswordPromptDialog.cpp \ - ProcTableModel.cpp \ - ColumnPage.cpp \ EditTableWidget.cpp \ EditColumnTableModel.cpp \ - SequenceModel.cpp \ - DatabaseWindow.cpp \ - PgLabTableView.cpp \ - QueryTool.cpp \ - CatalogInspector.cpp \ - widgets/CatalogIndexPage.cpp \ - widgets/CatalogNamespacePage.cpp \ - widgets/CatalogPageBase.cpp \ - widgets/CatalogConstraintPage.cpp \ - widgets/CatalogTablesPage.cpp \ - widgets/CatalogFunctionsPage.cpp \ - widgets/CatalogSequencesPage.cpp \ - widgets/CatalogTypesPage.cpp + DatabaseWindow.cpp \ + widgets/SingleRecordWidget.cpp HEADERS += \ + catalog/delegates/IconColumnDelegate.h \ + catalog/models/BaseTableModel.h \ + catalog/models/ColumnTableModel.h \ + catalog/models/ConstraintModel.h \ + catalog/models/DatabasesTableModel.h \ + catalog/models/DependantsTableModel.h \ + catalog/models/IndexModel.h \ + catalog/models/ProcTableModel.h \ + catalog/models/RolesTableModel.h \ + catalog/models/SequenceModel.h \ + catalog/models/TablesTableModel.h \ + catalog/models/TriggerTableModel.h \ + catalog/widgets/CatalogConstraintPage.h \ + catalog/widgets/CatalogFunctionsPage.h \ + catalog/widgets/CatalogIndexPage.h \ + catalog/widgets/CatalogInspector.h \ + catalog/widgets/CatalogNamespacePage.h \ + catalog/widgets/CatalogPageBase.h \ + catalog/widgets/CatalogSequencesPage.h \ + catalog/widgets/CatalogTablesPage.h \ + catalog/widgets/CatalogTypesPage.h \ + catalog/widgets/ColumnPage.h \ + catalog/widgets/DependantsPage.h \ + catalog/widgets/TriggerPage.h \ + crud/CrudModel.h \ + crud/CrudTab.h \ + querytool/QueryExplainModel.h \ + querytool/QueryParamListController.h \ + querytool/QueryResultModel.h \ + querytool/QueryTool.h \ + serverinspector/DatabasesPage.h \ + serverinspector/RolesPage.h \ + serverinspector/ServerInspector.h \ + util/PgLabItemDelegate.h \ + util/PgLabTableView.h \ ConnectionConfigurationWidget.h \ ConnectionController.h \ - DependantsPage.h \ - DependantsTableModel.h \ IDatabaseWindow.h \ ManagedPage.h \ NotificationListWidget.h \ NotificationModel.h \ NotificationService.h \ PgDumpOutputHighlighter.h \ - PgLabTableViewHelper.h \ - QueryResultModel.h \ - QueryExplainModel.h \ CreateDatabaseDialog.h \ ConnectionManagerWindow.h \ ConnectionListModel.h \ SslModeModel.h \ - serverinspector/DatabasesPage.h \ - serverinspector/RolesPage.h \ - serverinspector/ServerInspector.h \ stopwatch.h \ TuplesResultWidget.h \ BackupDialog.h \ @@ -120,22 +148,10 @@ HEADERS += \ ParamTypeDelegate.h \ OpenDatabase.h \ SqlSyntaxHighlighter.h \ - DatabasesTableModel.h \ - RolesTableModel.h \ ProcessStdioWidget.h \ ResultTableModelUtil.h \ - BaseTableModel.h \ - QueryParamListController.h \ - TablesTableModel.h \ - ColumnTableModel.h \ NamespaceFilterWidget.h \ NamespaceItemModel.h \ - ConstraintModel.h \ - IconColumnDelegate.h \ - IndexModel.h \ - crud/CrudTab.h \ - crud/CrudModel.h \ - PgLabItemDelegate.h \ Module.h \ EditorGutter.h \ CodeEditor.h \ @@ -144,41 +160,28 @@ HEADERS += \ CustomDataRole.h \ CodeGenerator.h \ UserConfiguration.h \ - TriggerTableModel.h \ - TriggerPage.h \ SqlCodePreview.h \ CustomFilterSortModel.h \ PropertiesPage.h \ PasswordPromptDialog.h \ - ProcTableModel.h \ - ColumnPage.h \ EditTableWidget.h \ EditColumnTableModel.h \ - SequenceModel.h \ DatabaseWindow.h \ - PgLabTableView.h \ - QueryTool.h \ - CatalogInspector.h \ - widgets/CatalogIndexPage.h \ - widgets/CatalogNamespacePage.h \ - widgets/CatalogPageBase.h \ - widgets/CatalogConstraintPage.h \ - widgets/CatalogTablesPage.h \ - widgets/CatalogFunctionsPage.h \ - widgets/CatalogSequencesPage.h \ - NamespaceFilter.h \ - widgets/CatalogTypesPage.h + NamespaceFilter.h \ + util/PgLabTableViewHelper.h \ + widgets/SingleRecordWidget.h FORMS += \ ConnectionManagerWindow.ui \ CreateDatabaseDialog.ui \ DatabaseWindow.ui \ TuplesResultWidget.ui \ - QueryTab.ui \ + querytool/QueryTab.ui \ ProcessStdioWidget.ui \ NamespaceFilterWidget.ui \ crud/CrudTab.ui \ - CodeGenerator.ui + CodeGenerator.ui \ + widgets/SingleRecordWidget.ui RESOURCES += \ resources.qrc diff --git a/pglab/QueryExplainModel.cpp b/pglab/querytool/QueryExplainModel.cpp similarity index 100% rename from pglab/QueryExplainModel.cpp rename to pglab/querytool/QueryExplainModel.cpp diff --git a/pglab/QueryExplainModel.h b/pglab/querytool/QueryExplainModel.h similarity index 100% rename from pglab/QueryExplainModel.h rename to pglab/querytool/QueryExplainModel.h diff --git a/pglab/QueryParamListController.cpp b/pglab/querytool/QueryParamListController.cpp similarity index 100% rename from pglab/QueryParamListController.cpp rename to pglab/querytool/QueryParamListController.cpp diff --git a/pglab/QueryParamListController.h b/pglab/querytool/QueryParamListController.h similarity index 100% rename from pglab/QueryParamListController.h rename to pglab/querytool/QueryParamListController.h diff --git a/pglab/QueryResultModel.cpp b/pglab/querytool/QueryResultModel.cpp similarity index 100% rename from pglab/QueryResultModel.cpp rename to pglab/querytool/QueryResultModel.cpp diff --git a/pglab/QueryResultModel.h b/pglab/querytool/QueryResultModel.h similarity index 96% rename from pglab/QueryResultModel.h rename to pglab/querytool/QueryResultModel.h index 1238d26..7de2f70 100644 --- a/pglab/QueryResultModel.h +++ b/pglab/querytool/QueryResultModel.h @@ -2,7 +2,7 @@ #define QUERYRESULTMODEL_H #include -#include "BaseTableModel.h" +#include "catalog/models/BaseTableModel.h" #include "Pgsql_Connection.h" class PgDatabaseCatalog; diff --git a/pglab/QueryTab.ui b/pglab/querytool/QueryTab.ui similarity index 100% rename from pglab/QueryTab.ui rename to pglab/querytool/QueryTab.ui diff --git a/pglab/QueryTool.cpp b/pglab/querytool/QueryTool.cpp similarity index 100% rename from pglab/QueryTool.cpp rename to pglab/querytool/QueryTool.cpp diff --git a/pglab/QueryTool.h b/pglab/querytool/QueryTool.h similarity index 100% rename from pglab/QueryTool.h rename to pglab/querytool/QueryTool.h diff --git a/pglab/serverinspector/DatabasesPage.cpp b/pglab/serverinspector/DatabasesPage.cpp index 239f23f..f4f2dc5 100644 --- a/pglab/serverinspector/DatabasesPage.cpp +++ b/pglab/serverinspector/DatabasesPage.cpp @@ -1,10 +1,10 @@ #include "DatabasesPage.h" -#include "DatabasesTableModel.h" +#include "catalog/models/DatabasesTableModel.h" #include "SqlCodePreview.h" #include "SqlFormattingUtils.h" #include "catalog/PgDatabaseCatalog.h" -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include diff --git a/pglab/serverinspector/DatabasesPage.h b/pglab/serverinspector/DatabasesPage.h index e76671f..46f269e 100644 --- a/pglab/serverinspector/DatabasesPage.h +++ b/pglab/serverinspector/DatabasesPage.h @@ -3,8 +3,8 @@ #include #include -#include "PgLabTableViewHelper.h" -#include "DatabasesTableModel.h" +#include "util/PgLabTableViewHelper.h" +#include "catalog/models/DatabasesTableModel.h" class PgDatabase; class PgDatabaseCatalog; diff --git a/pglab/serverinspector/RolesPage.cpp b/pglab/serverinspector/RolesPage.cpp index da28a53..529350a 100644 --- a/pglab/serverinspector/RolesPage.cpp +++ b/pglab/serverinspector/RolesPage.cpp @@ -1,6 +1,6 @@ #include "RolesPage.h" #include "catalog/PgDatabaseCatalog.h" -#include "RolesTableModel.h" +#include "catalog/models/RolesTableModel.h" RolesPage::RolesPage(QWidget * parent) : QSplitter(Qt::Horizontal, parent) diff --git a/pglab/serverinspector/RolesPage.h b/pglab/serverinspector/RolesPage.h index a6fbaf4..4a63e6a 100644 --- a/pglab/serverinspector/RolesPage.h +++ b/pglab/serverinspector/RolesPage.h @@ -3,8 +3,8 @@ #include #include -#include "PgLabTableViewHelper.h" -#include "RolesTableModel.h" +#include "util/PgLabTableViewHelper.h" +#include "catalog/models/RolesTableModel.h" class PgDatabaseCatalog; class PgLabTableView; diff --git a/pglab/tuplesresultwidget.cpp b/pglab/tuplesresultwidget.cpp index b655832..1e2dd5b 100644 --- a/pglab/tuplesresultwidget.cpp +++ b/pglab/tuplesresultwidget.cpp @@ -5,7 +5,7 @@ #include #include -#include "PgLabItemDelegate.h" +#include "util/PgLabItemDelegate.h" TuplesResultWidget::TuplesResultWidget(QWidget *parent) : diff --git a/pglab/tuplesresultwidget.h b/pglab/tuplesresultwidget.h index b2605ba..89a55d9 100644 --- a/pglab/tuplesresultwidget.h +++ b/pglab/tuplesresultwidget.h @@ -1,7 +1,7 @@ #ifndef TUPLESRESULTWIDGET_H #define TUPLESRESULTWIDGET_H -#include "QueryResultModel.h" +#include "querytool/QueryResultModel.h" #include namespace Ui { diff --git a/pglab/PgLabItemDelegate.cpp b/pglab/util/PgLabItemDelegate.cpp similarity index 99% rename from pglab/PgLabItemDelegate.cpp rename to pglab/util/PgLabItemDelegate.cpp index a14b9d5..ae9e23c 100644 --- a/pglab/PgLabItemDelegate.cpp +++ b/pglab/util/PgLabItemDelegate.cpp @@ -1,4 +1,4 @@ -#include "PgLabItemDelegate.h" +#include "util/PgLabItemDelegate.h" #include #include "Pgsql_oids.h" diff --git a/pglab/PgLabItemDelegate.h b/pglab/util/PgLabItemDelegate.h similarity index 100% rename from pglab/PgLabItemDelegate.h rename to pglab/util/PgLabItemDelegate.h diff --git a/pglab/PgLabTableView.cpp b/pglab/util/PgLabTableView.cpp similarity index 89% rename from pglab/PgLabTableView.cpp rename to pglab/util/PgLabTableView.cpp index 4ea321d..836dbdd 100644 --- a/pglab/PgLabTableView.cpp +++ b/pglab/util/PgLabTableView.cpp @@ -1,5 +1,5 @@ -#include "PgLabTableView.h" -#include "PgLabItemDelegate.h" +#include "util/PgLabTableView.h" +#include "util/PgLabItemDelegate.h" #include #include diff --git a/pglab/PgLabTableView.h b/pglab/util/PgLabTableView.h similarity index 100% rename from pglab/PgLabTableView.h rename to pglab/util/PgLabTableView.h diff --git a/pglab/PgLabTableViewHelper.h b/pglab/util/PgLabTableViewHelper.h similarity index 98% rename from pglab/PgLabTableViewHelper.h rename to pglab/util/PgLabTableViewHelper.h index acf8a6c..67b5e55 100644 --- a/pglab/PgLabTableViewHelper.h +++ b/pglab/util/PgLabTableViewHelper.h @@ -2,7 +2,7 @@ #include #include -#include "PgLabTableView.h" +#include "util/PgLabTableView.h" #include class PgDatabaseCatalog; diff --git a/pglab/widgets/SingleRecordWidget.cpp b/pglab/widgets/SingleRecordWidget.cpp new file mode 100644 index 0000000..e617918 --- /dev/null +++ b/pglab/widgets/SingleRecordWidget.cpp @@ -0,0 +1,14 @@ +#include "SingleRecordWidget.h" +#include "ui_SingleRecordWidget.h" + +SingleRecordWidget::SingleRecordWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::SingleRecordWidget) +{ + ui->setupUi(this); +} + +SingleRecordWidget::~SingleRecordWidget() +{ + delete ui; +} diff --git a/pglab/widgets/SingleRecordWidget.h b/pglab/widgets/SingleRecordWidget.h new file mode 100644 index 0000000..29e4033 --- /dev/null +++ b/pglab/widgets/SingleRecordWidget.h @@ -0,0 +1,20 @@ +#pragma once + +#include + +namespace Ui { + class SingleRecordWidget; +} + +class SingleRecordWidget : public QWidget +{ + Q_OBJECT + +public: + explicit SingleRecordWidget(QWidget *parent = nullptr); + ~SingleRecordWidget(); + +private: + Ui::SingleRecordWidget *ui; +}; + diff --git a/pglab/widgets/SingleRecordWidget.ui b/pglab/widgets/SingleRecordWidget.ui new file mode 100644 index 0000000..6194638 --- /dev/null +++ b/pglab/widgets/SingleRecordWidget.ui @@ -0,0 +1,21 @@ + + + + + SingleRecordWidget + + + + 0 + 0 + 400 + 300 + + + + Form + + + + +