X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=9164c6e82ac0e330623ff8105db4a6c92a311d24;hb=87a97d8aa169936ec2dcd229df88b8c5b4a1411c;hp=2f9ab323008948395f3496e5e14bf39bb0a23736;hpb=ddaded8bccdb05d700b4242b7b3ef59a55b39ac0;p=pulseview.git
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 2f9ab32..9164c6e 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -17,14 +17,15 @@
* along with this program; if not, see .
*/
-#include
-
#ifdef ENABLE_DECODE
#include
#endif
+#include
#include
#include
+#include
+#include
#include
#include
@@ -42,14 +43,11 @@
#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"
-#include
-#include
#include
using std::dynamic_pointer_cast;
@@ -79,7 +77,6 @@ MainWindow::MainWindow(DeviceManager &device_manager,
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
- action_about_(new QAction(this)),
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
@@ -89,6 +86,8 @@ MainWindow::MainWindow(DeviceManager &device_manager,
GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
+ GlobalSettings::register_change_handler(GlobalSettings::Key_View_StickyScrolling,
+ bind(&MainWindow::on_settingViewStickyScrolling_changed, this, _1));
setup_ui();
restore_ui_settings();
@@ -125,11 +124,6 @@ MainWindow::~MainWindow()
remove_session(sessions_.front());
}
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
-
shared_ptr MainWindow::get_active_view() const
{
// If there's only one view, use it...
@@ -138,7 +132,7 @@ shared_ptr MainWindow::get_active_view() const
// ...otherwise find the dock widget the widget with focus is contained in
QObject *w = QApplication::focusWidget();
- QDockWidget *dock = 0;
+ QDockWidget *dock = nullptr;
while (w) {
dock = qobject_cast(w);
@@ -168,6 +162,8 @@ shared_ptr MainWindow::add_view(const QString &title,
assert(main_window);
+ shared_ptr main_bar = session.main_bar();
+
QDockWidget* dock = new QDockWidget(title, main_window);
dock->setObjectName(title);
main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
@@ -177,7 +173,9 @@ shared_ptr MainWindow::add_view(const QString &title,
dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
if (type == views::ViewTypeTrace)
- v = make_shared(session, dock_main);
+ // This view will be the main view if there's no main bar yet
+ v = make_shared(session,
+ (main_bar ? false : true), dock_main);
if (!v)
return nullptr;
@@ -209,7 +207,6 @@ shared_ptr MainWindow::add_view(const QString &title,
tv->enable_sticky_scrolling(true);
tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
- shared_ptr main_bar = session.main_bar();
if (!main_bar) {
/* Initial view, create the main bar */
main_bar = make_shared(session, this, tv);
@@ -255,7 +252,7 @@ void MainWindow::remove_view(shared_ptr view)
// call deleteLater() on it, which causes a double free
// since the shared_ptr in view_docks_ doesn't know
// that Qt keeps a pointer to the view around
- view->setParent(0);
+ view->setParent(nullptr);
// Delete the view's dock widget and all widgets inside it
entry.first->deleteLater();
@@ -352,9 +349,6 @@ void MainWindow::setup_ui()
view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
view_coloured_bg_shortcut_->setAutoRepeat(false);
- action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setToolTip(tr("&About..."));
-
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@ -609,7 +603,7 @@ void MainWindow::on_run_stop_clicked()
void MainWindow::on_settings_clicked()
{
- dialogs::Settings dlg;
+ dialogs::Settings dlg(device_manager_);
dlg.exec();
}
@@ -670,7 +664,7 @@ void MainWindow::on_view_close_clicked()
{
// Find the dock widget that contains the close button that was clicked
QObject *w = QObject::sender();
- QDockWidget *dock = 0;
+ QDockWidget *dock = nullptr;
while (w) {
dock = qobject_cast(w);
@@ -725,15 +719,6 @@ void MainWindow::on_tab_close_requested(int index)
remove_session(session);
}
-void MainWindow::on_view_sticky_scrolling_shortcut()
-{
- shared_ptr viewbase = get_active_view();
- views::TraceView::View* view =
- qobject_cast(viewbase.get());
- if (view)
- view->toggle_sticky_scrolling();
-}
-
void MainWindow::on_view_coloured_bg_shortcut()
{
GlobalSettings settings;
@@ -742,6 +727,14 @@ void MainWindow::on_view_coloured_bg_shortcut()
settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
}
+void MainWindow::on_view_sticky_scrolling_shortcut()
+{
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+ settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
+}
+
void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
{
bool state = new_value.toBool();
@@ -757,10 +750,19 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
}
}
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_settingViewStickyScrolling_changed(const QVariant new_value)
{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
+ 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_sticky_scrolling(state);
+ }
}
void MainWindow::on_close_current_tab()