devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

utils/regtools: slight rework of tab management in qeditor

Browse source 
Change-Id: Iaf41defb79bb76010f3ff5269c28e4bad991ebc3
This commit is contained in:
Amaury Pouly 2014-02-04 17:35:09 +01:00
parent c043ecf9e1
commit f982ea6398
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
utils/regtools/qeditor/mainwindow.cpp
View file

@ -22,7 +22,9 @@ MyTabWidget::MyTabWidget()
void MyTabWidget::OnCloseTab(int index) void MyTabWidget::OnCloseTab(int index)
{ {
QWidget *w = this->widget(index);
removeTab(index); removeTab(index);
delete w;
} }
MainWindow::MainWindow(Backend *backend) MainWindow::MainWindow(Backend *backend)
@ -106,5 +108,5 @@ void MainWindow::OnLoadDesc()
void MainWindow::OnNewRegTab() void MainWindow::OnNewRegTab()
{ {
new RegTab(m_backend, m_tab); m_tab->addTab(new RegTab(m_backend), "Register Tab");
} }

13
utils/regtools/qeditor/regtab.cpp
View file

@ -30,13 +30,12 @@ void RegTreeItem::SetPath(int dev_idx, int dev_addr_idx, int reg_idx, int reg_ad
m_reg_addr_idx = reg_addr_idx; m_reg_addr_idx = reg_addr_idx;
} }
RegTab::RegTab(Backend *backend, QTabWidget *parent) RegTab::RegTab(Backend *backend)
:m_backend(backend) :m_backend(backend)
{ {
m_splitter = new QSplitter();
QWidget *left = new QWidget; QWidget *left = new QWidget;
m_splitter->addWidget(left); this->addWidget(left);
m_splitter->setStretchFactor(0, 1); this->setStretchFactor(0, 1);
QVBoxLayout *left_layout = new QVBoxLayout; QVBoxLayout *left_layout = new QVBoxLayout;
left->setLayout(left_layout); left->setLayout(left_layout);
@ -93,13 +92,11 @@ RegTab::RegTab(Backend *backend, QTabWidget *parent)
m_right_panel->addWidget(m_right_content); m_right_panel->addWidget(m_right_content);
QWidget *w = new QWidget; QWidget *w = new QWidget;
w->setLayout(m_right_panel); w->setLayout(m_right_panel);
m_splitter->addWidget(w); this->addWidget(w);
m_splitter->setStretchFactor(1, 2); this->setStretchFactor(1, 2);
m_io_backend = m_backend->CreateDummyIoBackend(); m_io_backend = m_backend->CreateDummyIoBackend();
parent->addTab(m_splitter, "Register Tab");
connect(m_soc_selector, SIGNAL(currentIndexChanged(const QString&)), connect(m_soc_selector, SIGNAL(currentIndexChanged(const QString&)),
this, SLOT(OnSocChanged(const QString&))); this, SLOT(OnSocChanged(const QString&)));
connect(m_backend, SIGNAL(OnSocListChanged()), this, SLOT(OnSocListChanged())); connect(m_backend, SIGNAL(OnSocListChanged()), this, SLOT(OnSocListChanged()));

5
utils/regtools/qeditor/regtab.h
View file

@ -44,11 +44,11 @@ private:
int m_dev_idx, m_dev_addr_idx, m_reg_idx, m_reg_addr_idx; int m_dev_idx, m_dev_addr_idx, m_reg_idx, m_reg_addr_idx;
}; };
class RegTab : public QObject class RegTab : public QSplitter
{ {
Q_OBJECT Q_OBJECT
public: public:
RegTab(Backend *backend, QTabWidget *parent); RegTab(Backend *backend);
protected: protected:
void FillDevSubTree(RegTreeItem *item); void FillDevSubTree(RegTreeItem *item);
@ -68,7 +68,6 @@ protected:
soc_t m_cur_soc; soc_t m_cur_soc;
QVBoxLayout *m_right_panel; QVBoxLayout *m_right_panel;
QWidget *m_right_content; QWidget *m_right_content;
QSplitter *m_splitter;
QLineEdit *m_data_sel_edit; QLineEdit *m_data_sel_edit;
QLabel *m_data_soc_label; QLabel *m_data_soc_label;
QPushButton *m_data_sel_reload; QPushButton *m_data_sel_reload;