X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=86a015533f824cb8483e7ef7b456d080266d9ebc;hb=7e440ad534df7db8a7ca385db2b6ca1f9c2f8711;hp=d13c8e197e3bfc917cd0ec697fbdfe72c54a2947;hpb=8ad61f4071a69445a6917d214b6592878447ddb1;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index d13c8e19..86a01553 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -188,6 +188,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 	dock_main->setCentralWidget(v.get());
 	dock->setWidget(dock_main);
 
+	dock->setContextMenuPolicy(Qt::PreventContextMenu);
 	dock->setFeatures(QDockWidget::DockWidgetMovable |
 		QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
@@ -374,8 +375,8 @@ void MainWindow::setup_ui()
 	run_stop_shortcut_->setAutoRepeat(false);
 
 	settings_button_ = new QToolButton();
-	settings_button_->setIcon(QIcon::fromTheme("configure",
-		QIcon(":/icons/configure.png")));
+	settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+		QIcon(":/icons/preferences-system.png")));
 	settings_button_->setToolTip(tr("Settings"));
 	settings_button_->setAutoRaise(true);