X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=985f698f8127f1e6efb2cf5f31ed067ec318c132;hb=143d322d0c92ea5c2cc51facc37b68787362c244;hp=33ebdd648e84e09fd6c6614eeb6a6511ce413047;hpb=9eae6de4dd0a3c628026eca6ca55cef8b70bfa86;p=pulseview.git diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 33ebdd6..985f698 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -39,9 +39,11 @@ #include "mainwindow.hpp" #include "devicemanager.hpp" +#include "globalsettings.hpp" #include "util.hpp" #include "devices/hardwaredevice.hpp" #include "dialogs/about.hpp" +#include "dialogs/settings.hpp" #include "toolbars/mainbar.hpp" #include "view/view.hpp" #include "views/trace/standardbar.hpp" @@ -65,6 +67,9 @@ class ViewItem; using toolbars::MainBar; +using std::bind; +using std::placeholders::_1; + const QString MainWindow::WindowTitle = tr("PulseView"); MainWindow::MainWindow(DeviceManager &device_manager, @@ -82,6 +87,9 @@ MainWindow::MainWindow(DeviceManager &device_manager, qRegisterMetaType("util::Timestamp"); qRegisterMetaType("uint64_t"); + GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG, + bind(&MainWindow::on_settingViewColouredBg_changed, this, _1)); + setup_ui(); restore_ui_settings(); @@ -150,6 +158,9 @@ shared_ptr MainWindow::get_active_view() const shared_ptr MainWindow::add_view(const QString &title, views::ViewType type, Session &session) { + GlobalSettings settings; + shared_ptr v; + QMainWindow *main_window = nullptr; for (auto entry : session_windows_) if (entry.first.get() == &session) @@ -157,72 +168,78 @@ shared_ptr MainWindow::add_view(const QString &title, assert(main_window); - if (type == views::ViewTypeTrace) { - QDockWidget* dock = new QDockWidget(title, main_window); - dock->setObjectName(title); - main_window->addDockWidget(Qt::TopDockWidgetArea, dock); + shared_ptr main_bar = session.main_bar(); - // Insert a QMainWindow into the dock widget to allow for a tool bar - QMainWindow *dock_main = new QMainWindow(dock); - dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag + QDockWidget* dock = new QDockWidget(title, main_window); + dock->setObjectName(title); + main_window->addDockWidget(Qt::TopDockWidgetArea, dock); - shared_ptr v = - make_shared(session, dock_main); - view_docks_[dock] = v; - session.register_view(v); + // Insert a QMainWindow into the dock widget to allow for a tool bar + QMainWindow *dock_main = new QMainWindow(dock); + dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag - dock_main->setCentralWidget(v.get()); - dock->setWidget(dock_main); + if (type == views::ViewTypeTrace) + // This view will be the main view if there's no main bar yet + v = make_shared(session, + (main_bar ? false : true), dock_main); - dock->setFeatures(QDockWidget::DockWidgetMovable | - QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); + if (!v) + return nullptr; - QAbstractButton *close_btn = - dock->findChildren - ("qt_dockwidget_closebutton").front(); + view_docks_[dock] = v; + session.register_view(v); - connect(close_btn, SIGNAL(clicked(bool)), - this, SLOT(on_view_close_clicked())); + dock_main->setCentralWidget(v.get()); + dock->setWidget(dock_main); - if (type == views::ViewTypeTrace) { - connect(&session, SIGNAL(trigger_event(util::Timestamp)), - qobject_cast(v.get()), - SLOT(trigger_event(util::Timestamp))); + dock->setFeatures(QDockWidget::DockWidgetMovable | + QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); - v->enable_sticky_scrolling(true); - v->enable_coloured_bg(true); + QAbstractButton *close_btn = + dock->findChildren + ("qt_dockwidget_closebutton").front(); - shared_ptr main_bar = session.main_bar(); - if (!main_bar) { - /* Initial view, create the main bar */ - main_bar = make_shared(session, this, v.get()); - dock_main->addToolBar(main_bar.get()); - session.set_main_bar(main_bar); + connect(close_btn, SIGNAL(clicked(bool)), + this, SLOT(on_view_close_clicked())); - connect(main_bar.get(), SIGNAL(new_view(Session*)), - this, SLOT(on_new_view(Session*))); - - main_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); - - /* For the main view we need to prevent the dock widget from - * closing itself when its close button is clicked. This is - * so we can confirm with the user first. Regular views don't - * need this */ - close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close())); - } else { - /* Additional view, create a standard bar */ - pv::views::trace::StandardBar *standard_bar = - new pv::views::trace::StandardBar(session, this, v.get()); - dock_main->addToolBar(standard_bar); + connect(&session, SIGNAL(trigger_event(util::Timestamp)), + qobject_cast(v.get()), + SLOT(trigger_event(util::Timestamp))); - standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); - } + if (type == views::ViewTypeTrace) { + views::TraceView::View *tv = + qobject_cast(v.get()); + + tv->enable_sticky_scrolling(true); + tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool()); + + if (!main_bar) { + /* Initial view, create the main bar */ + main_bar = make_shared(session, this, tv); + dock_main->addToolBar(main_bar.get()); + session.set_main_bar(main_bar); + + connect(main_bar.get(), SIGNAL(new_view(Session*)), + this, SLOT(on_new_view(Session*))); + + main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown()); + + /* For the main view we need to prevent the dock widget from + * closing itself when its close button is clicked. This is + * so we can confirm with the user first. Regular views don't + * need this */ + close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close())); + } else { + /* Additional view, create a standard bar */ + pv::views::trace::StandardBar *standard_bar = + new pv::views::trace::StandardBar(session, this, tv); + dock_main->addToolBar(standard_bar); + + standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown()); } - - return v; } - return nullptr; + return v; } void MainWindow::remove_view(shared_ptr view) @@ -392,6 +409,8 @@ void MainWindow::setup_ui() this, SLOT(on_run_stop_clicked())); connect(&session_state_mapper_, SIGNAL(mapped(QObject*)), this, SLOT(on_capture_state_changed(QObject*))); + connect(settings_button_, SIGNAL(clicked(bool)), + this, SLOT(on_settings_clicked())); connect(&session_selector_, SIGNAL(tabCloseRequested(int)), this, SLOT(on_tab_close_requested(int))); @@ -591,6 +610,12 @@ void MainWindow::on_run_stop_clicked() } } +void MainWindow::on_settings_clicked() +{ + dialogs::Settings dlg; + dlg.exec(); +} + void MainWindow::on_session_name_changed() { // Update the corresponding dock widget's name(s) @@ -714,11 +739,25 @@ void MainWindow::on_view_sticky_scrolling_shortcut() void MainWindow::on_view_coloured_bg_shortcut() { - shared_ptr viewbase = get_active_view(); - views::TraceView::View* view = - qobject_cast(viewbase.get()); - if (view) - view->toggle_coloured_bg(); + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); + settings.setValue(GlobalSettings::Key_View_ColouredBG, !state); +} + +void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value) +{ + bool state = new_value.toBool(); + + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::TraceView::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_coloured_bg(state); + } } void MainWindow::on_actionAbout_triggered()