Cosmetic enhancements for Windows

Removing flat style QGroupBoxes

Author: Mick Elliot

.DS_Store

@@ -42,9 +42,6 @@ EMClusterMethodWidget::EMClusterMethodWidget(Data * data, DropletGraphWidget * g
     QGroupBox * initBox = new QGroupBox("Centroid Initialization", this);
     m_initBoxLayout = new QFormLayout;
     initBox->setLayout(m_initBoxLayout);
-#ifndef Q_OS_MACOS
-    initBox->setFlat(true);
-#endif
 
     m_centroidInit = new QComboBox(this);
     m_centroidInit->addItem("Current Colors",   CentroidInitialization::CurrentColors);

gui/emclustermethodwidget.cpp

@@ -72,9 +72,6 @@ ExperimentalDesignWizard::ExperimentalDesignWizard(Data * data, PaintingWidget *
     connect(m_ch1SpinBox, &QSpinBox::valueChanged, this, &ExperimentalDesignWizard::setCh1TargetCount);
     m_ch1Layout->addRow("Number of targets:", m_ch1SpinBox);
     ch1Group->setLayout(m_ch1Layout);
-#ifndef Q_OS_MACOS
-    ch1Group->setFlat(true);
-#endif
     page1Layout->addWidget(ch1Group);
     setCh1TargetCount(m_design->ch1TargetCount());
 
@@ -86,9 +83,6 @@ ExperimentalDesignWizard::ExperimentalDesignWizard(Data * data, PaintingWidget *
     connect(m_ch2SpinBox, &QSpinBox::valueChanged, this, &ExperimentalDesignWizard::setCh2TargetCount);
     m_ch2Layout->addRow("Number of targets:", m_ch2SpinBox);
     ch2Group->setLayout(m_ch2Layout);
-#ifndef Q_OS_MACOS
-    ch2Group->setFlat(true);
-#endif
     page1Layout->addWidget(ch2Group);
     setCh2TargetCount(m_design->ch2TargetCount());
 
@@ -112,9 +106,6 @@ ExperimentalDesignWizard::ExperimentalDesignWizard(Data * data, PaintingWidget *
     staggeredLayout->addRow("Staggered in Channel 1", staggeredCh1);
     staggeredLayout->addRow("Staggered in Channel 2", staggeredCh2);
     staggeredGroup->setLayout(staggeredLayout);
-#ifndef Q_OS_MACOS
-    staggeredGroup->setFlat(true);
-#endif
     page1Layout->addWidget(staggeredGroup);
 
     page1Layout->setSizeConstraint(QLayout::SetFixedSize);

gui/experimentaldesignwidget.cpp

@@ -15,9 +15,6 @@ GMMWidget::GMMWidget(Data * data, DropletGraphWidget * graph, QWidget * parent)
     auto form = (QFormLayout*)layout();
 
     QGroupBox * constraintsBox= new QGroupBox("Constraints");
-#ifndef Q_OS_MACOS
-    constraintsBox->setFlat(true);
-#endif
     constraintsLayout = new QFormLayout;
 
     m_clusterOutliersCheckbox = new QCheckBox(this);
@@ -36,9 +33,6 @@ GMMWidget::GMMWidget(Data * data, DropletGraphWidget * graph, QWidget * parent)
     form->addRow(constraintsBox);
 
     QGroupBox * fuzzyBox = new QGroupBox("Output");
-#ifndef Q_OS_MACOS
-    fuzzyBox->setFlat(true);
-#endif
     QRadioButton * fuzzy = new QRadioButton;
     fuzzy->setChecked(true);
     QRadioButton * randomDiscrete = new QRadioButton;

gui/gmmwidget.cpp

@@ -14,9 +14,6 @@ KMeansWidget::KMeansWidget(Data * data, DropletGraphWidget * graph, QWidget * pa
     fuzzyBox->setChecked(false);
     auto m_fuzzyBoxLayout = new QFormLayout;
     fuzzyBox->setLayout(m_fuzzyBoxLayout);
-#ifndef Q_OS_MACOS
-    fuzzyBox->setFlat(true);
-#endif
     connect(fuzzyBox, &QGroupBox::toggled, this, &KMeansWidget::useFuzzyClustering);
 
     m_fuzzinessSpinBox = new QDoubleSpinBox(this);

gui/kmeanswidget.cpp

@@ -87,9 +87,6 @@ PaintingWidget::PaintingWidget(Data * data, CommandStack * cmdStack, DropletGrap
     connect(brushStrengthSlider, &QSlider::valueChanged, this, &PaintingWidget::brushStrengthSliderValueChanged);
 
     QGroupBox * boxBlurBox = new QGroupBox("Circular Box Blur", this);
-#ifndef Q_OS_MACOS
-    boxBlurBox->setFlat(true);
-#endif
     QVBoxLayout * boxBlurLayout = new QVBoxLayout;
     m_boxBlurSlider = new QSlider(Qt::Horizontal);
     m_boxBlurSlider->setRange(20, 2000);
@@ -108,9 +105,6 @@ PaintingWidget::PaintingWidget(Data * data, CommandStack * cmdStack, DropletGrap
     connect(m_paletteButtonGroup, &QButtonGroup::idClicked, this, &PaintingWidget::paletteButtonClicked);
 
     QGroupBox * defuzzifyBox = new QGroupBox("Defuzzify", this);
-#ifndef Q_OS_MACOS
-    boxBlurBox->setFlat(true);
-#endif
     QHBoxLayout * defuzzifyBoxLayout = new QHBoxLayout;
     QPushButton * rbutton = new QPushButton("Probabilistic");
     QPushButton * dbutton = new QPushButton("Deterministic");