X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=3aeb1227edcc1fb00247767002ee3087bb78494a;hp=90ac324bab1ed7bbffde9fe7c8a8d1d5cd7243d0;hb=4d5d5d6aeb7d936fb6b939f6c6531b3f054dac1f;hpb=f2edb55712e1f295935582558f694077da8d81e6

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 90ac324b..3aeb1227 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -34,9 +34,9 @@
 #include <QWidget>
 
 #include "mainwindow.h"
-#include "samplingbar.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
+#include "toolbars/samplingbar.h"
 #include "view/view.h"
 
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@ -118,6 +118,7 @@ void MainWindow::setup_ui()
 		"MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
 	_action_quit->setIcon(QIcon::fromTheme("application-exit",
 		QIcon(":/icons/application-exit.png")));
+	_action_quit->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
 	_action_quit->setObjectName(QString::fromUtf8("actionQuit"));
 	_menu_file->addAction(_action_quit);
 
@@ -181,7 +182,7 @@ void MainWindow::setup_ui()
 	_toolbar->addAction(_action_view_zoom_out);
 	addToolBar(_toolbar);
 
-	_sampling_bar = new SamplingBar(this);
+	_sampling_bar = new toolbars::SamplingBar(this);
 	scan_devices();
 	connect(_sampling_bar, SIGNAL(run_stop()), this,
 		SLOT(run_stop()));