Skip to content

Commit 2e587e8

Browse files
committed
refactor(QSqlCtrl): remove widget
1 parent 4c98007 commit 2e587e8

File tree

4 files changed

+33
-72
lines changed

4 files changed

+33
-72
lines changed

src/QBrowserApp.cpp

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,34 @@ QBrowserApp::QBrowserApp(QWidget* parent, Qt::WindowFlags flags) : QMainWindow(p
44
setCentralWidget(m_mainWidget);
55
setWindowTitle(QObject::tr("QSqlBrowser"));
66

7-
QSplitter* splitter = new QSplitter(Qt::Vertical, m_mainWidget);
8-
QSqlCtrl* sqlctrl = new QSqlCtrl(splitter);
9-
QSqlQueryPanel* querypanel = new QSqlQueryPanel(splitter);
7+
QSplitter* vSplitter = new QSplitter(Qt::Vertical, m_mainWidget);
8+
QSplitter* hSplitter = new QSplitter(vSplitter);
109

11-
splitter->setChildrenCollapsible(false);
12-
splitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
13-
splitter->addWidget(sqlctrl);
14-
splitter->addWidget(querypanel);
15-
splitter->setStretchFactor(0, 1);
16-
splitter->setStretchFactor(1, 0);
10+
hSplitter->setChildrenCollapsible(false);
11+
m_tree = new QConnectionCtrl(hSplitter);
12+
m_table = new QDbTableView(hSplitter);
13+
14+
hSplitter->addWidget(m_tree);
15+
hSplitter->addWidget(m_table);
16+
hSplitter->setStretchFactor(0, 0);
17+
hSplitter->setStretchFactor(1, 1);
18+
hSplitter->setSizes({ 250, 550 });
19+
hSplitter->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
20+
21+
QSqlQueryPanel* querypanel = new QSqlQueryPanel(vSplitter);
22+
23+
vSplitter->setChildrenCollapsible(false);
24+
vSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
25+
vSplitter->addWidget(hSplitter);
26+
vSplitter->addWidget(querypanel);
27+
vSplitter->setStretchFactor(0, 1);
28+
vSplitter->setStretchFactor(1, 0);
1729

1830
QVBoxLayout* mainLayout = new QVBoxLayout;
19-
mainLayout->addWidget(splitter);
31+
mainLayout->addWidget(vSplitter);
2032
m_mainWidget->setLayout(mainLayout);
2133
m_mainWidget->setMinimumSize(820, 625);
34+
35+
QObject::connect(m_tree, &QConnectionCtrl::tableModelChanged, m_table, &QDbTableView::setTableModel);
36+
QObject::connect(m_tree, &QConnectionCtrl::statusMessage, [&](const QString& text) { statusBar()->showMessage(text); });
2237
}

src/QBrowserApp.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,22 @@
44
#define BROWSER_H
55

66
#include <QMainWindow>
7+
#include <QStatusBar>
8+
#include <QSplitter>
9+
#include <QFrame>
710

8-
#include "QSqlCtrl.h"
11+
#include "QConnectionCtrl.h"
12+
#include "QDbTableView.h"
913
#include "QSqlQueryPanel.h"
1014

1115
class QBrowserApp : public QMainWindow
1216
{
1317
Q_OBJECT
1418
protected:
1519
QWidget* m_mainWidget;
20+
21+
QConnectionCtrl* m_tree;
22+
QDbTableView* m_table;
1623
public:
1724
explicit QBrowserApp(QWidget* parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
1825
};

src/QSqlCtrl.cpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/QSqlCtrl.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)