From 3ea37e3dccf5555a5e0937ebbad9883c2a255728 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 10 May 2018 23:45:43 +0200 Subject: [PATCH] Get rid of ugly native dialogs on color chooser dialogs --- sdrgui/gui/basicchannelsettingsdialog.cpp | 2 +- sdrgui/gui/glscopemultigui.cpp | 4 ++-- sdrgui/gui/glscopenggui.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdrgui/gui/basicchannelsettingsdialog.cpp b/sdrgui/gui/basicchannelsettingsdialog.cpp index 313cf3dc2..76b21c982 100644 --- a/sdrgui/gui/basicchannelsettingsdialog.cpp +++ b/sdrgui/gui/basicchannelsettingsdialog.cpp @@ -37,7 +37,7 @@ void BasicChannelSettingsDialog::paintColor() void BasicChannelSettingsDialog::on_colorBtn_clicked() { QColor c = m_color; - c = QColorDialog::getColor(c, this, tr("Select Color for Channel")); + c = QColorDialog::getColor(c, this, tr("Select Color for Channel"), QColorDialog::DontUseNativeDialog); if(c.isValid()) { m_color = c; paintColor(); diff --git a/sdrgui/gui/glscopemultigui.cpp b/sdrgui/gui/glscopemultigui.cpp index b83cf231c..e525e7cd5 100644 --- a/sdrgui/gui/glscopemultigui.cpp +++ b/sdrgui/gui/glscopemultigui.cpp @@ -721,7 +721,7 @@ void GLScopeMultiGUI::on_traceView_toggled(bool checked __attribute__((unused))) void GLScopeMultiGUI::on_traceColor_clicked() { - QColor newColor = QColorDialog::getColor(m_focusedTraceColor); + QColor newColor = QColorDialog::getColor(m_focusedTraceColor, this, tr("Select Color for trace"), QColorDialog::DontUseNativeDialog); if (newColor.isValid()) // user clicked OK and selected a color { @@ -822,7 +822,7 @@ void GLScopeMultiGUI::on_trigPre_valueChanged(int value __attribute__((unused))) void GLScopeMultiGUI::on_trigColor_clicked() { - QColor newColor = QColorDialog::getColor(m_focusedTriggerColor); + QColor newColor = QColorDialog::getColor(m_focusedTriggerColor, this, tr("Select Color for trigger line"), QColorDialog::DontUseNativeDialog); if (newColor.isValid()) // user clicked "OK" { diff --git a/sdrgui/gui/glscopenggui.cpp b/sdrgui/gui/glscopenggui.cpp index 12f043b35..737d3ff85 100644 --- a/sdrgui/gui/glscopenggui.cpp +++ b/sdrgui/gui/glscopenggui.cpp @@ -711,7 +711,7 @@ void GLScopeNGGUI::on_traceView_toggled(bool checked __attribute__((unused))) void GLScopeNGGUI::on_traceColor_clicked() { - QColor newColor = QColorDialog::getColor(m_focusedTraceColor); + QColor newColor = QColorDialog::getColor(m_focusedTraceColor, this, tr("Select Color for trace"), QColorDialog::DontUseNativeDialog); if (newColor.isValid()) // user clicked OK and selected a color { @@ -810,7 +810,7 @@ void GLScopeNGGUI::on_trigPre_valueChanged(int value __attribute__((unused))) void GLScopeNGGUI::on_trigColor_clicked() { - QColor newColor = QColorDialog::getColor(m_focusedTriggerColor); + QColor newColor = QColorDialog::getColor(m_focusedTriggerColor, this, tr("Select Color for trigger line"), QColorDialog::DontUseNativeDialog); if (newColor.isValid()) // user clicked "OK" {