Ported pv::prop::binding::DeviceOptions to GVariants

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 03562b8f54e57d421aefa86fe764e6d6f376a819..3aeb1227edcc1fb00247767002ee3087bb78494a 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -20,10 +20,13 @@
 
 #include <sigrokdecode.h>
 
+#include <boost/bind.hpp>
+
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
 #include <QFileDialog>
+#include <QMessageBox>
 #include <QMenu>
 #include <QMenuBar>
 #include <QStatusBar>
@@ -31,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++). */
@@ -115,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);
 
@@ -178,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()));
@@ -210,9 +214,33 @@ void MainWindow::scan_devices()
        _sampling_bar->set_device_list(_devices);
 }
 
+void MainWindow::session_error(
+       const QString text, const QString info_text)
+{
+       QMetaObject::invokeMethod(this, "show_session_error",
+               Qt::QueuedConnection, Q_ARG(QString, text),
+               Q_ARG(QString, info_text));
+}
+
 void MainWindow::load_file(QString file_name)
 {
-       _session.load_file(file_name.toStdString());
+       const QString errorMessage(
+               QString("Failed to load file %1").arg(file_name));
+       const QString infoMessage;
+       _session.load_file(file_name.toStdString(),
+               boost::bind(&MainWindow::session_error, this,
+                       errorMessage, infoMessage));
+}
+
+void MainWindow::show_session_error(
+       const QString text, const QString info_text)
+{
+       QMessageBox msg(this);
+       msg.setText(text);
+       msg.setInformativeText(info_text);
+       msg.setStandardButtons(QMessageBox::Ok);
+       msg.setIcon(QMessageBox::Warning);
+       msg.exec();
 }
 
 void MainWindow::on_actionOpen_triggered()
@@ -226,7 +254,7 @@ void MainWindow::on_actionOpen_triggered()
 void MainWindow::on_actionConnect_triggered()
 {
        dialogs::Connect dlg(this);
-       if(!dlg.exec())
+       if (!dlg.exec())
                return;
 
        struct sr_dev_inst *const sdi = dlg.get_selected_device();
@@ -272,7 +300,9 @@ void MainWindow::run_stop()
        case SigSession::Stopped:
                _session.start_capture(
                        _sampling_bar->get_selected_device(),
-                       _sampling_bar->get_record_length());
+                       _sampling_bar->get_record_length(),
+                       boost::bind(&MainWindow::session_error, this,
+                               QString("Capture failed"), _1));
                break;
 
        case SigSession::Running: