From ac8a98049e936bba064713f4c315952647803676 Mon Sep 17 00:00:00 2001 From: Elliott Liggett Date: Sun, 21 Aug 2022 00:33:59 -0700 Subject: [PATCH] More connections from picker to UI. --- wfmain.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wfmain.cpp b/wfmain.cpp index 69c9967..6604836 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -6288,11 +6288,6 @@ QString wfmain::setColorFromString(QString colorstr, QLedLabel *led) return led->getColor().name(QColor::HexArgb); } -void wfmain::on_colorSetBtnGrid_clicked() -{ - getSetColor(ui->colorSwatchGrid, ui->colorEditGrid); -} - void wfmain::on_colorSetBtnPlotBackground_clicked() { getSetColor(ui->colorSwatchPlotBackground, ui->colorEditPlotBackground); @@ -6355,6 +6350,15 @@ void wfmain::on_colorSetBtnSpecFill_clicked() } +void wfmain::on_colorSetBtnGrid_clicked() +{ + int pos = ui->colorPresetCombo->currentIndex(); + getSetColor(ui->colorSwatchGrid, ui->colorEditGrid); + QColor c = ui->colorSwatchPlotBackground->getColor(); + colorPreset[pos].gridColor = c; + useColorPreset(&colorPreset[pos]); +} + void wfmain::on_colorEditPlotBackground_editingFinished() { int pos = ui->colorPresetCombo->currentIndex(); @@ -6376,4 +6380,5 @@ void wfmain::on_colorPopOutBtn_clicked() g->addWidget(t); t->addTab(settingsTab, "Settings"); settingsPop->show(); + //connect(settingsPop, SIGNAL(destroyed(QObject*)), this, foo()); }