Get rid of ugly native dialogs on color chooser dialogs

This commit is contained in:
f4exb 2018-05-10 23:45:43 +02:00
parent 4bb749ce65
commit 3ea37e3dcc
3 changed files with 5 additions and 5 deletions

View File

@ -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();

View File

@ -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"
{

View File

@ -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"
{