diff options
-rw-r--r-- | utils/regtools/qeditor/mainwindow.cpp | 11 | ||||
-rw-r--r-- | utils/regtools/qeditor/mainwindow.h | 1 | ||||
-rw-r--r-- | utils/regtools/qeditor/regtab.cpp | 5 | ||||
-rw-r--r-- | utils/regtools/qeditor/regtab.h | 1 |
4 files changed, 17 insertions, 1 deletions
diff --git a/utils/regtools/qeditor/mainwindow.cpp b/utils/regtools/qeditor/mainwindow.cpp index a57ecfb9c1..2ba781b042 100644 --- a/utils/regtools/qeditor/mainwindow.cpp +++ b/utils/regtools/qeditor/mainwindow.cpp | |||
@@ -34,11 +34,13 @@ MainWindow::MainWindow(Backend *backend) | |||
34 | QAction *load_desc_act = new QAction(QIcon::fromTheme("document-open"), tr("&Soc Description"), this); | 34 | QAction *load_desc_act = new QAction(QIcon::fromTheme("document-open"), tr("&Soc Description"), this); |
35 | QAction *quit_act = new QAction(QIcon::fromTheme("application-exit"), tr("&Quit"), this); | 35 | QAction *quit_act = new QAction(QIcon::fromTheme("application-exit"), tr("&Quit"), this); |
36 | QAction *about_act = new QAction(QIcon::fromTheme("help-about"), tr("&About"), this); | 36 | QAction *about_act = new QAction(QIcon::fromTheme("help-about"), tr("&About"), this); |
37 | QAction *about_qt_act = new QAction(QIcon::fromTheme("help-about"), tr("About &Qt"), this); | ||
37 | 38 | ||
38 | connect(new_regtab_act, SIGNAL(triggered()), this, SLOT(OnNewRegTab())); | 39 | connect(new_regtab_act, SIGNAL(triggered()), this, SLOT(OnNewRegTab())); |
39 | connect(load_desc_act, SIGNAL(triggered()), this, SLOT(OnLoadDesc())); | 40 | connect(load_desc_act, SIGNAL(triggered()), this, SLOT(OnLoadDesc())); |
40 | connect(quit_act, SIGNAL(triggered()), this, SLOT(OnQuit())); | 41 | connect(quit_act, SIGNAL(triggered()), this, SLOT(OnQuit())); |
41 | connect(about_act, SIGNAL(triggered()), this, SLOT(OnAbout())); | 42 | connect(about_act, SIGNAL(triggered()), this, SLOT(OnAbout())); |
43 | connect(about_qt_act, SIGNAL(triggered()), this, SLOT(OnAboutQt())); | ||
42 | 44 | ||
43 | QMenu *file_menu = menuBar()->addMenu(tr("&File")); | 45 | QMenu *file_menu = menuBar()->addMenu(tr("&File")); |
44 | QMenu *new_submenu = file_menu->addMenu(QIcon::fromTheme("document-new"), "&New"); | 46 | QMenu *new_submenu = file_menu->addMenu(QIcon::fromTheme("document-new"), "&New"); |
@@ -51,6 +53,7 @@ MainWindow::MainWindow(Backend *backend) | |||
51 | 53 | ||
52 | QMenu *about_menu = menuBar()->addMenu(tr("&About")); | 54 | QMenu *about_menu = menuBar()->addMenu(tr("&About")); |
53 | about_menu->addAction(about_act); | 55 | about_menu->addAction(about_act); |
56 | about_menu->addAction(about_qt_act); | ||
54 | 57 | ||
55 | m_tab = new MyTabWidget(); | 58 | m_tab = new MyTabWidget(); |
56 | 59 | ||
@@ -73,11 +76,17 @@ void MainWindow::WriteSettings() | |||
73 | 76 | ||
74 | void MainWindow::OnQuit() | 77 | void MainWindow::OnQuit() |
75 | { | 78 | { |
76 | WriteSettings(); | 79 | close(); |
77 | } | 80 | } |
78 | 81 | ||
79 | void MainWindow::OnAbout() | 82 | void MainWindow::OnAbout() |
80 | { | 83 | { |
84 | QMessageBox::about(this, "About", "Written by Amaury Pouly for Rockbox"); | ||
85 | } | ||
86 | |||
87 | void MainWindow::OnAboutQt() | ||
88 | { | ||
89 | QMessageBox::aboutQt(this); | ||
81 | } | 90 | } |
82 | 91 | ||
83 | void MainWindow::closeEvent(QCloseEvent *event) | 92 | void MainWindow::closeEvent(QCloseEvent *event) |
diff --git a/utils/regtools/qeditor/mainwindow.h b/utils/regtools/qeditor/mainwindow.h index 2897cde1ca..d7dab3717f 100644 --- a/utils/regtools/qeditor/mainwindow.h +++ b/utils/regtools/qeditor/mainwindow.h | |||
@@ -33,6 +33,7 @@ private: | |||
33 | private slots: | 33 | private slots: |
34 | void OnQuit(); | 34 | void OnQuit(); |
35 | void OnAbout(); | 35 | void OnAbout(); |
36 | void OnAboutQt(); | ||
36 | void OnLoadDesc(); | 37 | void OnLoadDesc(); |
37 | void OnNewRegTab(); | 38 | void OnNewRegTab(); |
38 | 39 | ||
diff --git a/utils/regtools/qeditor/regtab.cpp b/utils/regtools/qeditor/regtab.cpp index 1e9846ef33..8403a19ea1 100644 --- a/utils/regtools/qeditor/regtab.cpp +++ b/utils/regtools/qeditor/regtab.cpp | |||
@@ -204,6 +204,11 @@ RegTab::RegTab(Backend *backend) | |||
204 | OnDataSelChanged(DataSelNothing); | 204 | OnDataSelChanged(DataSelNothing); |
205 | } | 205 | } |
206 | 206 | ||
207 | RegTab::~RegTab() | ||
208 | { | ||
209 | delete m_io_backend; | ||
210 | } | ||
211 | |||
207 | void RegTab::SetDataSocName(const QString& socname) | 212 | void RegTab::SetDataSocName(const QString& socname) |
208 | { | 213 | { |
209 | if(socname.size() != 0) | 214 | if(socname.size() != 0) |
diff --git a/utils/regtools/qeditor/regtab.h b/utils/regtools/qeditor/regtab.h index 72f00a31a2..8afa21c346 100644 --- a/utils/regtools/qeditor/regtab.h +++ b/utils/regtools/qeditor/regtab.h | |||
@@ -76,6 +76,7 @@ class RegTab : public QSplitter | |||
76 | Q_OBJECT | 76 | Q_OBJECT |
77 | public: | 77 | public: |
78 | RegTab(Backend *backend); | 78 | RegTab(Backend *backend); |
79 | ~RegTab(); | ||
79 | 80 | ||
80 | protected: | 81 | protected: |
81 | void FillDevSubTree(DevTreeItem *item); | 82 | void FillDevSubTree(DevTreeItem *item); |