X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=2689060347c19bb186f728fa5b9b16fd66b0fdd9;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hp=7a7a1b12baddf2ee85acdf65ee2cd64b3db09e86;hpb=6fd0b63971f179a28c2c558055da760c2c44231a;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 7a7a1b1..2689060 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -23,7 +23,6 @@
 #endif
 
 #include <boost/bind.hpp>
-#include <boost/foreach.hpp>
 
 #include <algorithm>
 #include <iterator>
@@ -123,6 +122,7 @@ void MainWindow::setup_ui()
 		"MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
 	action_open->setIcon(QIcon::fromTheme("document-open",
 		QIcon(":/icons/document-open.png")));
+	action_open->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O));
 	action_open->setObjectName(QString::fromUtf8("actionOpen"));
 	menu_file->addAction(action_open);
 
@@ -131,6 +131,7 @@ void MainWindow::setup_ui()
 		"MainWindow", "&Save As...", 0, QApplication::UnicodeUTF8));
 	action_save_as->setIcon(QIcon::fromTheme("document-save-as",
 		QIcon(":/icons/document-save-as.png")));
+	action_save_as->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
 	action_save_as->setObjectName(QString::fromUtf8("actionSaveAs"));
 	menu_file->addAction(action_save_as);
 
@@ -253,10 +254,12 @@ void MainWindow::setup_ui()
 	// Setup the toolbar
 	QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
 	toolbar->addAction(action_open);
+	toolbar->addAction(action_save_as);
 	toolbar->addSeparator();
 	toolbar->addAction(action_view_zoom_in);
 	toolbar->addAction(action_view_zoom_out);
 	toolbar->addAction(action_view_zoom_fit);
+	toolbar->addAction(action_view_zoom_one_to_one);
 	addToolBar(toolbar);
 
 	// Setup the sampling bar
@@ -299,11 +302,9 @@ void MainWindow::update_device_list()
 	if (std::find(devices.begin(), devices.end(), selected_device) ==
 		devices.end())
 		devices.push_back(selected_device);
+	assert(selected_device);
 
-	_sampling_bar->set_device_list(devices);
-
-	if (selected_device)
-		_sampling_bar->set_selected_device(selected_device);
+	_sampling_bar->set_device_list(devices, selected_device);
 }
 
 void MainWindow::load_file(QString file_name)