Bump the Boost requirement to >= 1.53.

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index dad9d680241ad4d59f4352c6dd80863d13b73cbd..3c5af937fda9546eaf67e84b08a04eb819e41861 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -110,6 +110,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        action_view_zoom_fit_(new QAction(this)),
        action_view_zoom_one_to_one_(new QAction(this)),
        action_view_sticky_scrolling_(new QAction(this)),
+       action_view_coloured_bg_(new QAction(this)),
        action_view_show_cursors_(new QAction(this)),
        action_about_(new QAction(this))
 #ifdef ENABLE_DECODE
@@ -195,12 +196,11 @@ QMenu* MainWindow::menu_decoder_add() const
 
 void MainWindow::run_stop()
 {
-       switch(session_.get_capture_state()) {
+       switch (session_.get_capture_state()) {
        case Session::Stopped:
                session_.start_capture([&](QString message) {
                        session_error("Capture failed", message); });
                break;
-
        case Session::AwaitingTrigger:
        case Session::Running:
                session_.stop_capture();
@@ -215,7 +215,7 @@ void MainWindow::select_device(shared_ptr<devices::Device> device)
                        session_.set_device(device);
                else
                        session_.set_default_device();
-       } catch(const QString &e) {
+       } catch (const QString &e) {
                QMessageBox msg(this);
                msg.setText(e);
                msg.setInformativeText(tr("Failed to Select Device"));
@@ -460,7 +460,7 @@ void MainWindow::setup_ui()
                QString::fromUtf8("actionViewZoomOneToOne"));
        menu_view->addAction(action_view_zoom_one_to_one_);
 
-       menu_file->addSeparator();
+       menu_view->addSeparator();
 
        action_view_sticky_scrolling_->setCheckable(true);
        action_view_sticky_scrolling_->setChecked(true);
@@ -474,6 +474,18 @@ void MainWindow::setup_ui()
 
        menu_view->addSeparator();
 
+       action_view_coloured_bg_->setCheckable(true);
+       action_view_coloured_bg_->setChecked(true);
+       action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
+       action_view_coloured_bg_->setObjectName(
+               QString::fromUtf8("actionViewColouredBg"));
+       action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+       menu_view->addAction(action_view_coloured_bg_);
+
+       view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+
+       menu_view->addSeparator();
+
        action_view_show_cursors_->setCheckable(true);
        action_view_show_cursors_->setChecked(view_->cursors_shown());
        action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
@@ -545,7 +557,8 @@ void MainWindow::setup_ui()
 
 }
 
-void MainWindow::select_init_device() {
+void MainWindow::select_init_device()
+{
        QSettings settings;
        map<string, string> dev_info;
        list<string> key_list;
@@ -577,7 +590,8 @@ void MainWindow::select_init_device() {
 }
 
 void MainWindow::load_init_file(const std::string &file_name,
-       const std::string &format) {
+       const std::string &format)
+{
        shared_ptr<InputFormat> input_format;
 
        if (!format.empty()) {
@@ -622,7 +636,6 @@ void MainWindow::save_ui_settings()
                        session_.device());
 
                for (string key : key_list) {
-
                        if (dev_info.count(key))
                                settings.setValue(QString::fromUtf8(key.c_str()),
                                                QString::fromUtf8(dev_info.at(key).c_str()));
@@ -681,7 +694,7 @@ void MainWindow::load_file(QString file_name,
                                new devices::SessionFile(
                                        device_manager_.context(),
                                        file_name.toStdString())));
-       } catch(Error e) {
+       } catch (Error e) {
                show_session_error(tr("Failed to load ") + file_name, e.what());
                session_.set_default_device();
                update_device_list();
@@ -794,6 +807,11 @@ void MainWindow::on_actionViewStickyScrolling_triggered()
        view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
 }
 
+void MainWindow::on_actionViewColouredBg_triggered()
+{
+       view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+}
+
 void MainWindow::on_actionViewShowCursors_triggered()
 {
        assert(view_);