Split annotation data set into rows, and improved painting.

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index ddaeeda977c5ba8ad42769179fd084fa78d889c0..e0ef3aa297e4f71e7f3678cc0bbd151ce27696ff 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -159,6 +159,8 @@ void MainWindow::setup_ui()
                "MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
        action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
                QIcon(":/icons/zoom-in.png")));
+       // simply using Qt::Key_Plus shows no + in the menu
+       action_view_zoom_in->setShortcut(QKeySequence::ZoomIn);
        action_view_zoom_in->setObjectName(
                QString::fromUtf8("actionViewZoomIn"));
        menu_view->addAction(action_view_zoom_in);
@@ -168,6 +170,7 @@ void MainWindow::setup_ui()
                "MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
        action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
                QIcon(":/icons/zoom-out.png")));
+       action_view_zoom_out->setShortcut(QKeySequence::ZoomOut);
        action_view_zoom_out->setObjectName(
                QString::fromUtf8("actionViewZoomOut"));
        menu_view->addAction(action_view_zoom_out);
@@ -326,13 +329,11 @@ void MainWindow::show_session_error(
 
 void MainWindow::on_actionOpen_triggered()
 {
-       // Enumerate the file formats
-       QString filters(tr("Sigrok Sessions (*.sr)"));
-       filters.append(tr(";;All Files (*.*)"));
-
        // Show the dialog
        const QString file_name = QFileDialog::getOpenFileName(
-               this, tr("Open File"), "", filters);
+               this, tr("Open File"), "", tr(
+                       "Sigrok Sessions (*.sr);;"
+                       "All Files (*.*)"));
        if (!file_name.isEmpty())
                load_file(file_name);
 }
@@ -426,8 +427,8 @@ void MainWindow::run_stop()
 {
        switch(_session.get_capture_state()) {
        case SigSession::Stopped:
-               _session.start_capture(_sampling_bar->get_record_length(),
-                       boost::bind(&MainWindow::session_error, this,
+               _session.start_capture(
+                               boost::bind(&MainWindow::session_error, this,
                                QString("Capture failed"), _1));
                break;