X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=35b0da57b3c9d87c14396d50bff73c495976162f;hp=3f338a12a09e1124cec927350878656c15828a8f;hb=2a032dcb6151bd8b019c88f6ef1db1a8c1e5b61e;hpb=6ac96c2e0ef986da9c9ebea50906cb717aa382ba

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 3f338a12..35b0da57 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -32,10 +32,10 @@ extern "C" {
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "about.h"
 #include "mainwindow.h"
 #include "samplingbar.h"
-#include "pv/view/view.h"
+#include "dialogs/about.h"
+#include "view/view.h"
 
 extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@ -77,41 +77,76 @@ void MainWindow::setup_ui()
 	_view = new pv::view::View(_session, this);
 	_vertical_layout->addWidget(_view);
 
-	// Setup the UI actions
-	_action_about = new QAction(this);
-	_action_about->setObjectName(QString::fromUtf8("actionAbout"));
-
-	_action_view_zoom_in = new QAction(this);
-	_action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in"));
-	_action_view_zoom_in->setObjectName(QString::fromUtf8("actionViewZoomIn"));
-
-	_action_view_zoom_out = new QAction(this);
-	_action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out"));
-	_action_view_zoom_out->setObjectName(QString::fromUtf8("actionViewZoomOut"));
-
-	_action_view_show_cursors = new QAction(this);
-	_action_view_show_cursors->setCheckable(true);
-	_action_view_show_cursors->setChecked(_view->cursors_shown());
-	_action_view_show_cursors->setObjectName(QString::fromUtf8("actionViewShowCursors"));
-
-	_action_open = new QAction(this);
-	_action_open->setIcon(QIcon::fromTheme("document-open"));
-	_action_open->setObjectName(QString::fromUtf8("actionOpen"));
-
 	// Setup the menu bar
 	_menu_bar = new QMenuBar(this);
 	_menu_bar->setGeometry(QRect(0, 0, 400, 25));
 
+	// File Menu
 	_menu_file = new QMenu(_menu_bar);
+	_menu_file->setTitle(QApplication::translate(
+		"MainWindow", "&File", 0, QApplication::UnicodeUTF8));
+
+	_action_open = new QAction(this);
+	_action_open->setText(QApplication::translate(
+		"MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
+	_action_open->setIcon(QIcon::fromTheme("document-open",
+		QIcon(":/icons/document-open.png")));
+	_action_open->setObjectName(QString::fromUtf8("actionOpen"));
 	_menu_file->addAction(_action_open);
 
+	_menu_file->addSeparator();
+
+	_action_quit = new QAction(this);
+	_action_quit->setText(QApplication::translate(
+		"MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
+	_action_quit->setIcon(QIcon::fromTheme("application-exit",
+		QIcon(":/icons/application-exit.png")));
+	_action_quit->setObjectName(QString::fromUtf8("actionQuit"));
+	_menu_file->addAction(_action_quit);
+
+	// View Menu
 	_menu_view = new QMenu(_menu_bar);
+	_menu_view->setTitle(QApplication::translate(
+		"MainWindow", "&View", 0, QApplication::UnicodeUTF8));
+
+	_action_view_zoom_in = new QAction(this);
+	_action_view_zoom_in->setText(QApplication::translate(
+		"MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
+	_action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
+		QIcon(":/icons/zoom-in.png")));
+	_action_view_zoom_in->setObjectName(
+		QString::fromUtf8("actionViewZoomIn"));
 	_menu_view->addAction(_action_view_zoom_in);
+
+	_action_view_zoom_out = new QAction(this);
+	_action_view_zoom_out->setText(QApplication::translate(
+		"MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
+	_action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
+		QIcon(":/icons/zoom-out.png")));
+	_action_view_zoom_out->setObjectName(
+		QString::fromUtf8("actionViewZoomOut"));
 	_menu_view->addAction(_action_view_zoom_out);
+
 	_menu_view->addSeparator();
+
+	_action_view_show_cursors = new QAction(this);
+	_action_view_show_cursors->setCheckable(true);
+	_action_view_show_cursors->setChecked(_view->cursors_shown());
+	_action_view_show_cursors->setObjectName(
+		QString::fromUtf8("actionViewShowCursors"));
+	_action_view_show_cursors->setText(QApplication::translate(
+		"MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8));
 	_menu_view->addAction(_action_view_show_cursors);
 
+	// Help Menu
 	_menu_help = new QMenu(_menu_bar);
+	_menu_help->setTitle(QApplication::translate(
+		"MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
+
+	_action_about = new QAction(this);
+	_action_about->setObjectName(QString::fromUtf8("actionAbout"));
+	_action_about->setText(QApplication::translate(
+		"MainWindow", "&About...", 0, QApplication::UnicodeUTF8));
 	_menu_help->addAction(_action_about);
 
 	_menu_bar->addAction(_menu_file->menuAction());
@@ -134,23 +169,9 @@ void MainWindow::setup_ui()
 		SLOT(run_stop()));
 	addToolBar(_sampling_bar);
 
-	// Setup the status bar
-	_status_bar = new QStatusBar(this);
-	setStatusBar(_status_bar);
-
 	setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
 		QApplication::UnicodeUTF8));
 
-	_action_open->setText(QApplication::translate("MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
-	_action_view_zoom_in->setText(QApplication::translate("MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
-	_action_view_zoom_out->setText(QApplication::translate("MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
-	_action_view_show_cursors->setText(QApplication::translate("MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8));
-	_action_about->setText(QApplication::translate("MainWindow", "&About...", 0, QApplication::UnicodeUTF8));
-
-	_menu_file->setTitle(QApplication::translate("MainWindow", "&File", 0, QApplication::UnicodeUTF8));
-	_menu_view->setTitle(QApplication::translate("MainWindow", "&View", 0, QApplication::UnicodeUTF8));
-	_menu_help->setTitle(QApplication::translate("MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
-
 	// Setup _session events
 	connect(&_session, SIGNAL(capture_state_changed(int)), this,
 		SLOT(capture_state_changed(int)));
@@ -165,6 +186,11 @@ void MainWindow::on_actionOpen_triggered()
 	_session.load_file(file_name.toStdString());
 }
 
+void MainWindow::on_actionQuit_triggered()
+{
+	close();
+}
+
 void MainWindow::on_actionViewZoomIn_triggered()
 {
 	_view->zoom(1);
@@ -183,7 +209,7 @@ void MainWindow::on_actionViewShowCursors_triggered()
 
 void MainWindow::on_actionAbout_triggered()
 {
-	About dlg(this);
+	dialogs::About dlg(this);
 	dlg.exec();
 }