X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=039f4aeb7b3c9871f66cd8ebddf78ca69cc0d5c8;hb=4764bc4d14069978282c9cf43aad03d7558aeb9f;hp=f9ae4d4e6eca7c07a2ab72e55215ab9d8d3c1bd8;hpb=b055b08350118b593ee6e3c30810f170f924d84d;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index f9ae4d4..039f4ae 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -52,12 +52,13 @@
 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif
+#include "widgets/hidingmenubar.hpp"
 
 #include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
 #include <glib.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::list;
 using std::map;
@@ -92,7 +93,8 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 	action_view_zoom_fit_(new QAction(this)),
 	action_view_zoom_one_to_one_(new QAction(this)),
 	action_view_show_cursors_(new QAction(this)),
-	action_about_(new QAction(this))
+	action_about_(new QAction(this)),
+	menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 {
 	setup_ui();
 	restore_ui_settings();
@@ -154,6 +156,11 @@ QAction* MainWindow::action_about() const
 	return action_about_;
 }
 
+QMenu* MainWindow::menu_decoder_add() const
+{
+	return menu_decoders_add_;
+}
+
 void MainWindow::run_stop()
 {
 	switch(session_.get_capture_state()) {
@@ -189,8 +196,7 @@ void MainWindow::setup_ui()
 
 	// Set the window icon
 	QIcon icon;
-	icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
-		QSize(), QIcon::Normal, QIcon::Off);
+	icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
 	setWindowIcon(icon);
 
 	// Setup the central widget
@@ -205,8 +211,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;
@@ -270,7 +276,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));
@@ -295,13 +301,11 @@ void MainWindow::setup_ui()
 	QMenu *const menu_decoders = new QMenu;
 	menu_decoders->setTitle(tr("&Decoders"));
 
-	pv::widgets::DecoderMenu *const menu_decoders_add =
-		new pv::widgets::DecoderMenu(menu_decoders, true);
-	menu_decoders_add->setTitle(tr("&Add"));
-	connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)),
+	menu_decoders_add_->setTitle(tr("&Add"));
+	connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
 		this, SLOT(add_decoder(srd_decoder*)));
 
-	menu_decoders->addMenu(menu_decoders_add);
+	menu_decoders->addMenu(menu_decoders_add_);
 #endif
 
 	// Help Menu
@@ -322,7 +326,7 @@ void MainWindow::setup_ui()
 	setMenuBar(menu_bar);
 	QMetaObject::connectSlotsByName(this);
 
-	// Setup the sampling bar
+	// Setup the toolbar
 	main_bar_ = new toolbars::MainBar(session_, *this);
 
 	// Populate the device list and select the initially selected device
@@ -434,23 +438,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)
@@ -459,6 +447,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(
@@ -466,7 +463,7 @@ void MainWindow::load_file(QString file_name)
 	const QString infoMessage;
 
 	try {
-		session_.set_file(file_name.toStdString());
+		session_.set_session_file(file_name.toStdString());
 	} catch(Error e) {
 		show_session_error(tr("Failed to load ") + file_name, e.what());
 		session_.set_default_device();
@@ -530,7 +527,9 @@ void MainWindow::on_actionSaveAs_triggered()
 	const QString abs_path = QFileInfo(file_name).absolutePath();
 	settings.setValue(SettingSaveDirectory, abs_path);
 
-	StoreProgress *dlg = new StoreProgress(file_name, session_, this);
+	StoreProgress *dlg = new StoreProgress(file_name,
+		device_manager_.context()->output_formats()["srzip"],
+		session_, this);
 	dlg->run();
 }