diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-04 17:35:09 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-10 23:14:26 +0100 |
commit | f982ea63989694f47bf8508883ddaa685d71fdf4 (patch) | |
tree | 8ff7b3f7c6f1b0a0b210eb224de1a8a3b0b7edde /utils/regtools/qeditor | |
parent | c043ecf9e144b1bf24edf5a8a9bf3e2cad08b97c (diff) | |
download | rockbox-f982ea63989694f47bf8508883ddaa685d71fdf4.tar.gz rockbox-f982ea63989694f47bf8508883ddaa685d71fdf4.zip |
utils/regtools: slight rework of tab management in qeditor
Change-Id: Iaf41defb79bb76010f3ff5269c28e4bad991ebc3
Diffstat (limited to 'utils/regtools/qeditor')
-rw-r--r-- | utils/regtools/qeditor/mainwindow.cpp | 4 | ||||
-rw-r--r-- | utils/regtools/qeditor/regtab.cpp | 13 | ||||
-rw-r--r-- | utils/regtools/qeditor/regtab.h | 5 |
3 files changed, 10 insertions, 12 deletions
diff --git a/utils/regtools/qeditor/mainwindow.cpp b/utils/regtools/qeditor/mainwindow.cpp index 310153495c..a57ecfb9c1 100644 --- a/utils/regtools/qeditor/mainwindow.cpp +++ b/utils/regtools/qeditor/mainwindow.cpp | |||
@@ -22,7 +22,9 @@ MyTabWidget::MyTabWidget() | |||
22 | 22 | ||
23 | void MyTabWidget::OnCloseTab(int index) | 23 | void MyTabWidget::OnCloseTab(int index) |
24 | { | 24 | { |
25 | QWidget *w = this->widget(index); | ||
25 | removeTab(index); | 26 | removeTab(index); |
27 | delete w; | ||
26 | } | 28 | } |
27 | 29 | ||
28 | MainWindow::MainWindow(Backend *backend) | 30 | MainWindow::MainWindow(Backend *backend) |
@@ -106,5 +108,5 @@ void MainWindow::OnLoadDesc() | |||
106 | 108 | ||
107 | void MainWindow::OnNewRegTab() | 109 | void MainWindow::OnNewRegTab() |
108 | { | 110 | { |
109 | new RegTab(m_backend, m_tab); | 111 | m_tab->addTab(new RegTab(m_backend), "Register Tab"); |
110 | } | 112 | } |
diff --git a/utils/regtools/qeditor/regtab.cpp b/utils/regtools/qeditor/regtab.cpp index 8f64bbf48a..b97ceafdc8 100644 --- a/utils/regtools/qeditor/regtab.cpp +++ b/utils/regtools/qeditor/regtab.cpp | |||
@@ -30,13 +30,12 @@ void RegTreeItem::SetPath(int dev_idx, int dev_addr_idx, int reg_idx, int reg_ad | |||
30 | m_reg_addr_idx = reg_addr_idx; | 30 | m_reg_addr_idx = reg_addr_idx; |
31 | } | 31 | } |
32 | 32 | ||
33 | RegTab::RegTab(Backend *backend, QTabWidget *parent) | 33 | RegTab::RegTab(Backend *backend) |
34 | :m_backend(backend) | 34 | :m_backend(backend) |
35 | { | 35 | { |
36 | m_splitter = new QSplitter(); | ||
37 | QWidget *left = new QWidget; | 36 | QWidget *left = new QWidget; |
38 | m_splitter->addWidget(left); | 37 | this->addWidget(left); |
39 | m_splitter->setStretchFactor(0, 1); | 38 | this->setStretchFactor(0, 1); |
40 | QVBoxLayout *left_layout = new QVBoxLayout; | 39 | QVBoxLayout *left_layout = new QVBoxLayout; |
41 | left->setLayout(left_layout); | 40 | left->setLayout(left_layout); |
42 | 41 | ||
@@ -93,13 +92,11 @@ RegTab::RegTab(Backend *backend, QTabWidget *parent) | |||
93 | m_right_panel->addWidget(m_right_content); | 92 | m_right_panel->addWidget(m_right_content); |
94 | QWidget *w = new QWidget; | 93 | QWidget *w = new QWidget; |
95 | w->setLayout(m_right_panel); | 94 | w->setLayout(m_right_panel); |
96 | m_splitter->addWidget(w); | 95 | this->addWidget(w); |
97 | m_splitter->setStretchFactor(1, 2); | 96 | this->setStretchFactor(1, 2); |
98 | 97 | ||
99 | m_io_backend = m_backend->CreateDummyIoBackend(); | 98 | m_io_backend = m_backend->CreateDummyIoBackend(); |
100 | 99 | ||
101 | parent->addTab(m_splitter, "Register Tab"); | ||
102 | |||
103 | connect(m_soc_selector, SIGNAL(currentIndexChanged(const QString&)), | 100 | connect(m_soc_selector, SIGNAL(currentIndexChanged(const QString&)), |
104 | this, SLOT(OnSocChanged(const QString&))); | 101 | this, SLOT(OnSocChanged(const QString&))); |
105 | connect(m_backend, SIGNAL(OnSocListChanged()), this, SLOT(OnSocListChanged())); | 102 | connect(m_backend, SIGNAL(OnSocListChanged()), this, SLOT(OnSocListChanged())); |
diff --git a/utils/regtools/qeditor/regtab.h b/utils/regtools/qeditor/regtab.h index d570eb6f90..460894b143 100644 --- a/utils/regtools/qeditor/regtab.h +++ b/utils/regtools/qeditor/regtab.h | |||
@@ -44,11 +44,11 @@ private: | |||
44 | int m_dev_idx, m_dev_addr_idx, m_reg_idx, m_reg_addr_idx; | 44 | int m_dev_idx, m_dev_addr_idx, m_reg_idx, m_reg_addr_idx; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | class RegTab : public QObject | 47 | class RegTab : public QSplitter |
48 | { | 48 | { |
49 | Q_OBJECT | 49 | Q_OBJECT |
50 | public: | 50 | public: |
51 | RegTab(Backend *backend, QTabWidget *parent); | 51 | RegTab(Backend *backend); |
52 | 52 | ||
53 | protected: | 53 | protected: |
54 | void FillDevSubTree(RegTreeItem *item); | 54 | void FillDevSubTree(RegTreeItem *item); |
@@ -68,7 +68,6 @@ protected: | |||
68 | soc_t m_cur_soc; | 68 | soc_t m_cur_soc; |
69 | QVBoxLayout *m_right_panel; | 69 | QVBoxLayout *m_right_panel; |
70 | QWidget *m_right_content; | 70 | QWidget *m_right_content; |
71 | QSplitter *m_splitter; | ||
72 | QLineEdit *m_data_sel_edit; | 71 | QLineEdit *m_data_sel_edit; |
73 | QLabel *m_data_soc_label; | 72 | QLabel *m_data_soc_label; |
74 | QPushButton *m_data_sel_reload; | 73 | QPushButton *m_data_sel_reload; |