X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=21b66b534f59119b492b6be69bb049c094389768;hp=a7dd773666fba9aec90f861dacc2f4935499859b;hb=1c4c23b87cde3778792caa1400030075b0504129;hpb=0f90452b8aff5c54096c23cadbbb549d25f1f88d

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index a7dd7736..21b66b53 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -52,6 +52,7 @@
 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif
+#include "widgets/hidingmenubar.hpp"
 
 #include <inttypes.h>
 #include <stdint.h>
@@ -211,8 +212,8 @@ void MainWindow::setup_ui()
 	vertical_layout_->addWidget(view_);
 
 	// Setup the menu bar
-	QMenuBar *const menu_bar = new QMenuBar(this);
-	menu_bar->setGeometry(QRect(0, 0, 400, 25));
+	pv::widgets::HidingMenuBar *const menu_bar =
+		new pv::widgets::HidingMenuBar(this);
 
 	// File Menu
 	QMenu *const menu_file = new QMenu;
@@ -276,7 +277,7 @@ void MainWindow::setup_ui()
 		QString::fromUtf8("actionViewZoomFit"));
 	menu_view->addAction(action_view_zoom_fit_);
 
-	action_view_zoom_one_to_one_->setText(tr("Zoom to &One-to-One"));
+	action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One"));
 	action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original",
 		QIcon(":/icons/zoom-original.png")));
 	action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O));
@@ -438,23 +439,7 @@ void MainWindow::session_error(
 
 void MainWindow::update_device_list()
 {
-	assert(main_bar_);
-
-	shared_ptr<Device> selected_device = session_.device();
-	list< shared_ptr<Device> > devices;
-
-	if (device_manager_.devices().size() == 0)
-		return;
-
-	std::copy(device_manager_.devices().begin(),
-		device_manager_.devices().end(), std::back_inserter(devices));
-
-	if (std::find(devices.begin(), devices.end(), selected_device) ==
-		devices.end())
-		devices.push_back(selected_device);
-	assert(selected_device);
-
-	main_bar_->set_device_list(devices, selected_device);
+	main_bar_->update_device_list();
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
@@ -463,6 +448,15 @@ void MainWindow::closeEvent(QCloseEvent *event)
 	event->accept();
 }
 
+void MainWindow::keyReleaseEvent(QKeyEvent *event)
+{
+	if (event->key() == Qt::Key_Alt) {
+		menuBar()->setHidden(!menuBar()->isHidden());
+		menuBar()->setFocus();
+	}
+	QMainWindow::keyReleaseEvent(event);
+}
+
 void MainWindow::load_file(QString file_name)
 {
 	const QString errorMessage(