Bring the cursors into view when they are shown

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 90ac324bab1ed7bbffde9fe7c8a8d1d5cd7243d0..3326b9b1af47967d0de0603a4bef3cdb4d4684f1 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef ENABLE_SIGROKDECODE
 #include <sigrokdecode.h>
+#endif
 
 #include <boost/bind.hpp>
 
@@ -34,9 +36,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 +120,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 +184,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()));
@@ -284,7 +287,12 @@ void MainWindow::on_actionViewZoomOut_triggered()
 void MainWindow::on_actionViewShowCursors_triggered()
 {
        assert(_view);
-       _view->show_cursors(_action_view_show_cursors->isChecked());
+
+       const bool show = !_view->cursors_shown();
+       if(show)
+               _view->centre_cursors();
+
+       _view->show_cursors(show);
 }
 
 void MainWindow::on_actionAbout_triggered()