X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=4e6ab75d9502b190e85e3823d839261fa36134f5;hb=9b64f2dfe9179f665ef97c0d0ac992274864f4a4;hp=2e08d6a471476d9785702c794816b908a89983b3;hpb=13e475e412663ee904b94a6510b5628bdb8b84fa;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 2e08d6a..4e6ab75 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -17,14 +17,15 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cassert>
-
 #ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+#include <cassert>
 #include <algorithm>
 #include <iterator>
+#include <cstdint>
+#include <cstdarg>
 
 #include <QAction>
 #include <QApplication>
@@ -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 <stdint.h>
-#include <stdarg.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 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")
@@ -125,11 +122,6 @@ MainWindow::~MainWindow()
 		remove_session(sessions_.front());
 }
 
-QAction* MainWindow::action_about() const
-{
-	return action_about_;
-}
-
 shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 {
 	// If there's only one view, use it...
@@ -210,7 +202,6 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 		views::TraceView::View *tv =
 			qobject_cast<views::TraceView::View*>(v.get());
 
-		tv->enable_sticky_scrolling(true);
 		tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
 
 		if (!main_bar) {
@@ -355,9 +346,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",
@@ -612,7 +600,7 @@ void MainWindow::on_run_stop_clicked()
 
 void MainWindow::on_settings_clicked()
 {
-	dialogs::Settings dlg;
+	dialogs::Settings dlg(device_manager_);
 	dlg.exec();
 }
 
@@ -728,15 +716,6 @@ void MainWindow::on_tab_close_requested(int index)
 		remove_session(session);
 }
 
-void MainWindow::on_view_sticky_scrolling_shortcut()
-{
-	shared_ptr<views::ViewBase> viewbase = get_active_view();
-	views::TraceView::View* view =
-		qobject_cast<views::TraceView::View*>(viewbase.get());
-	if (view)
-		view->toggle_sticky_scrolling();
-}
-
 void MainWindow::on_view_coloured_bg_shortcut()
 {
 	GlobalSettings settings;
@@ -745,6 +724,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();
@@ -760,12 +747,6 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
 	}
 }
 
-void MainWindow::on_actionAbout_triggered()
-{
-	dialogs::About dlg(device_manager_.context(), this);
-	dlg.exec();
-}
-
 void MainWindow::on_close_current_tab()
 {
 	int tab = session_selector_.currentIndex();