From: Joel Holdsworth <redacted>
Date: Sun, 30 Dec 2012 20:58:55 +0000 (+0000)
Subject: Tidied pv::MainWindow menu setup
X-Git-Tag: pulseview-0.1.0~172
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ab1d13eefe929b466699eac93d173f45d59e60fd;p=pulseview.git

Tidied pv::MainWindow menu setup
---

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 062f4bd7..3a59bea1 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -77,44 +77,67 @@ 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",
-		QIcon(":/icons/zoom-in.png")));
-	_action_view_zoom_in->setObjectName(QString::fromUtf8("actionViewZoomIn"));
-
-	_action_view_zoom_out = new QAction(this);
-	_action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
-		QIcon(":/icons/zoom-out.png")));
-	_action_view_zoom_out->setObjectName(QString::fromUtf8("actionViewZoomOut"));
+	// Setup the menu bar
+	_menu_bar = new QMenuBar(this);
+	_menu_bar->setGeometry(QRect(0, 0, 400, 25));
 
-	_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"));
+	// 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"));
 
-	// Setup the menu bar
-	_menu_bar = new QMenuBar(this);
-	_menu_bar->setGeometry(QRect(0, 0, 400, 25));
-
-	_menu_file = new QMenu(_menu_bar);
 	_menu_file->addAction(_action_open);
 
+	// 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());
@@ -140,16 +163,6 @@ void MainWindow::setup_ui()
 	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)));
diff --git a/pv/mainwindow.h b/pv/mainwindow.h
index 61a8456f..a68c37de 100644
--- a/pv/mainwindow.h
+++ b/pv/mainwindow.h
@@ -56,16 +56,17 @@ private:
 	SigSession _session;
 	pv::view::View *_view;
 
+	QMenuBar *_menu_bar;
+	QMenu *_menu_file;
 	QAction *_action_open;
+
+	QMenu *_menu_view;
 	QAction *_action_view_zoom_in;
 	QAction *_action_view_zoom_out;
 	QAction *_action_view_show_cursors;
-	QAction *_action_about;
 
-	QMenuBar *_menu_bar;
-	QMenu *_menu_file;
-	QMenu *_menu_view;
 	QMenu *_menu_help;
+	QAction *_action_about;
 
 	QWidget *_central_widget;
 	QVBoxLayout *_vertical_layout;