diff --git a/apps/include/mainwindow.h b/apps/include/mainwindow.h index 71de4f3..139a5f0 100644 --- a/apps/include/mainwindow.h +++ b/apps/include/mainwindow.h @@ -18,7 +18,7 @@ public: ~MainWindow(); private slots: - void on_actionExit_triggered(); + void on_actionQuit_triggered(); private: Ui::MainWindow *ui; diff --git a/apps/source/mainwindow.cpp b/apps/source/mainwindow.cpp index 15baf0c..2f7edbd 100644 --- a/apps/source/mainwindow.cpp +++ b/apps/source/mainwindow.cpp @@ -17,7 +17,7 @@ MainWindow::~MainWindow() delete ui; } -void MainWindow::on_actionExit_triggered() +void MainWindow::on_actionQuit_triggered() { close(); } diff --git a/apps/ui/mainwindow.ui b/apps/ui/mainwindow.ui index 8d748fe..4dcfa9d 100644 --- a/apps/ui/mainwindow.ui +++ b/apps/ui/mainwindow.ui @@ -48,9 +48,16 @@ - + + + + + Device + + + @@ -65,25 +72,25 @@ - + - &About - - - Ctrl+I + About - + - E&xit + &Quit + + + Quit Ctrl+Q @@ -92,6 +99,17 @@ QAction::MenuRole::QuitRole + + + List&All + + + List all devices + + + Ctrl+A + +