Reorganization of pgLab project

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 <serverinspector/ServerInspector.h>
 
 namespace pg = Pgsql;

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"

pglab/EditTableWidget.cpp

@@ -1,6 +1,6 @@
 #include "EditTableWidget.h"
 #include "EditColumnTableModel.h"
-#include "PgLabItemDelegate.h"
+#include "util/PgLabItemDelegate.h"
 #include <QVBoxLayout>
 #include <QTableView>
 #include "OpenDatabase.h"

pglab/ParamTypeDelegate.h

@@ -2,7 +2,7 @@
 #define PARAMTYPEDELEGATE_H
 
 //#include <QStyledItemDelegate>
-#include "PgLabItemDelegate.h"
+#include "util/PgLabItemDelegate.h"
 
 class TypeSelectionItemModel;
 

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)

pglab/catalog/delegates/IconColumnDelegate.cpp

@@ -1,4 +1,4 @@
-#include "IconColumnDelegate.h"
+#include "catalog/delegates/IconColumnDelegate.h"
 #include <QPainter>
 
 IconColumnDelegate::IconColumnDelegate(QWidget *parent)

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"

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"

pglab/catalog/widgets/CatalogConstraintPage.cpp

@@ -1,8 +1,8 @@
-#include "CatalogConstraintPage.h"
+#include "catalog/widgets/CatalogConstraintPage.h"
-#include "ConstraintModel.h"
+#include "catalog/models/ConstraintModel.h"
 #include "CustomFilterSortModel.h"
-#include "IconColumnDelegate.h"
+#include "catalog/delegates/IconColumnDelegate.h"
-#include "PgLabTableView.h"
+#include "util/PgLabTableView.h"
 #include "SqlCodePreview.h"
 #include <QHeaderView>
 #include <QStringBuilder>

pglab/catalog/widgets/CatalogFunctionsPage.cpp

@@ -2,11 +2,11 @@
 #include "ResultTableModelUtil.h"
 #include "CustomFilterSortModel.h"
 #include "CustomDataRole.h"
-#include "PgLabItemDelegate.h"
+#include "util/PgLabItemDelegate.h"
-#include "ProcTableModel.h"
+#include "catalog/models/ProcTableModel.h"
 #include "SqlCodePreview.h"
 #include <QApplication>
-#include "PgLabTableView.h"
+#include "util/PgLabTableView.h"
 #include <QHeaderView>
 #include <QVBoxLayout>
 #include <QTabWidget>

pglab/catalog/widgets/CatalogIndexPage.cpp

@@ -1,11 +1,11 @@
-#include "CatalogIndexPage.h"
+#include "catalog/widgets/CatalogIndexPage.h"
 #include "CustomFilterSortModel.h"
-#include "IndexModel.h"
+#include "catalog/models/IndexModel.h"
-#include "PgLabTableView.h"
+#include "util/PgLabTableView.h"
 #include "SqlCodePreview.h"
 #include <QHeaderView>
 #include <QStringBuilder>
-#include "IconColumnDelegate.h"
+#include "catalog/delegates/IconColumnDelegate.h"
 
 
 CatalogIndexPage::CatalogIndexPage(QWidget *parent)

pglab/catalog/widgets/CatalogInspector.cpp

@@ -1,11 +1,11 @@
 #include "CatalogInspector.h"
 #include "OpenDatabase.h"
 #include "UserConfiguration.h"
-#include "widgets/CatalogFunctionsPage.h"
+#include "catalog/widgets/CatalogFunctionsPage.h"
-#include "widgets/CatalogNamespacePage.h"
+#include "catalog/widgets/CatalogNamespacePage.h"
-#include "widgets/CatalogSequencesPage.h"
+#include "catalog/widgets/CatalogSequencesPage.h"
-#include "widgets/CatalogTablesPage.h"
+#include "catalog/widgets/CatalogTablesPage.h"
-#include "widgets/CatalogTypesPage.h"
+#include "catalog/widgets/CatalogTypesPage.h"
 
 #include <QApplication>
 #include <QTabWidget>

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;

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)

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 "util/PgLabItemDelegate.h"
-#include "SequenceModel.h"
+#include "catalog/models/SequenceModel.h"
 #include "SqlCodePreview.h"
-#include "PgLabTableView.h"
+#include "util/PgLabTableView.h"
 #include <QHeaderView>
 
 CatalogSequencesPage::CatalogSequencesPage(QWidget *parent)

pglab/catalog/widgets/CatalogTablesPage.cpp

@@ -1,21 +1,21 @@
 #include "CatalogTablesPage.h"
 
-#include "ColumnPage.h"
+#include "catalog/widgets/CatalogConstraintPage.h"
-#include "ColumnTableModel.h"
+#include "catalog/widgets/CatalogIndexPage.h"
-#include "ConstraintModel.h"
+#include "catalog/widgets/ColumnPage.h"
-#include "DependantsPage.h"
+#include "catalog/widgets/DependantsPage.h"
-#include "PgLabTableView.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 <QApplication>
 #include <QHeaderView>

pglab/catalog/widgets/CatalogTablesPage.h

@@ -2,8 +2,8 @@
 #define CATALOGTABLESPAGE_H
 
 #include "NamespaceFilter.h"
-#include "TablesTableModel.h"
+#include "catalog/models/TablesTableModel.h"
-#include "PgLabTableViewHelper.h"
+#include "util/PgLabTableViewHelper.h"
 #include <QSplitter>
 #include <memory>
 #include <optional>

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 <optional>
 #include <QHeaderView>
 

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"

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 "catalog/models/DependantsTableModel.h"
-#include "DependantsTableModel.h"
 #include "CustomFilterSortModel.h"
 #include "CustomDataRole.h"
-#include "PgLabTableView.h"
+#include "util/PgLabTableView.h"
-//#include "catalog/PgProcContainer.h"
 #include <QStringBuilder>
 #include <unordered_set>
 

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;

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 <QHeaderView>
 #include <QStringBuilder>

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;

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"

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  \
-    DatabaseWindow.cpp \
+    widgets/SingleRecordWidget.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
 
 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 \
+    NamespaceFilter.h  \
-    QueryTool.h \
+    util/PgLabTableViewHelper.h \
-    CatalogInspector.h \
+    widgets/SingleRecordWidget.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
 
 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

pglab/querytool/QueryResultModel.h

@@ -2,7 +2,7 @@
 #define QUERYRESULTMODEL_H
 
 #include <QAbstractTableModel>
-#include "BaseTableModel.h"
+#include "catalog/models/BaseTableModel.h"
 #include "Pgsql_Connection.h"
 
 class PgDatabaseCatalog;

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 <QStringBuilder>
 
 

pglab/serverinspector/DatabasesPage.h

@@ -3,8 +3,8 @@
 #include <QSplitter>
 #include <QWidget>
 
-#include "PgLabTableViewHelper.h"
+#include "util/PgLabTableViewHelper.h"
-#include "DatabasesTableModel.h"
+#include "catalog/models/DatabasesTableModel.h"
 
 class PgDatabase;
 class PgDatabaseCatalog;

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)

pglab/serverinspector/RolesPage.h

@@ -3,8 +3,8 @@
 #include <QSplitter>
 #include <QWidget>
 
-#include "PgLabTableViewHelper.h"
+#include "util/PgLabTableViewHelper.h"
-#include "RolesTableModel.h"
+#include "catalog/models/RolesTableModel.h"
 
 class PgDatabaseCatalog;
 class PgLabTableView;

pglab/tuplesresultwidget.cpp

@@ -5,7 +5,7 @@
 
 #include <QFile>
 #include <QTextStream>
-#include "PgLabItemDelegate.h"
+#include "util/PgLabItemDelegate.h"
 
 
 TuplesResultWidget::TuplesResultWidget(QWidget *parent) :

pglab/tuplesresultwidget.h

@@ -1,7 +1,7 @@
 #ifndef TUPLESRESULTWIDGET_H
 #define TUPLESRESULTWIDGET_H
 
-#include "QueryResultModel.h"
+#include "querytool/QueryResultModel.h"
 #include <QWidget>
 
 namespace Ui {

pglab/util/PgLabItemDelegate.cpp

@@ -1,4 +1,4 @@
-#include "PgLabItemDelegate.h"
+#include "util/PgLabItemDelegate.h"
 #include <QApplication>
 
 #include "Pgsql_oids.h"

pglab/util/PgLabTableView.cpp

@@ -1,5 +1,5 @@
-#include "PgLabTableView.h"
+#include "util/PgLabTableView.h"
-#include "PgLabItemDelegate.h"
+#include "util/PgLabItemDelegate.h"
 #include <QHeaderView>
 #include <QSortFilterProxyModel>
 

pglab/util/PgLabTableViewHelper.h

@@ -2,7 +2,7 @@
 
 #include <QTableWidget>
 #include <QSortFilterProxyModel>
-#include "PgLabTableView.h"
+#include "util/PgLabTableView.h"
 #include <optional>
 
 class PgDatabaseCatalog;

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;
+}

pglab/widgets/SingleRecordWidget.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <QWidget>
+
+namespace Ui {
+    class SingleRecordWidget;
+}
+
+class SingleRecordWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit SingleRecordWidget(QWidget *parent = nullptr);
+    ~SingleRecordWidget();
+
+private:
+    Ui::SingleRecordWidget *ui;
+};
+

pglab/widgets/SingleRecordWidget.ui

@@ -0,0 +1,21 @@
+<ui version="4.0">
+ <author/>
+ <comment/>
+ <exportmacro/>
+ <class>SingleRecordWidget</class>
+ <widget name="SingleRecordWidget" class="QWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+ </widget>
+ <pixmapfunction/>
+ <connections/>
+</ui>