Merge pull request #363 from zomfg/feature/led-wizard-tweaks

led wizard tweaks

Author: psieg

Software/res/LightpackResources.qrc

@@ -15,12 +15,13 @@
         <file>translations/uk_UA.qm</file>
         <file>icons/res_dark.png</file>
         <file>icons/res_light.png</file>
-        <file>buttons/arrow_right_dark_24px.png</file>
-        <file>buttons/arrow_right_dark_24px_hover.png</file>
-        <file>buttons/arrow_right_dark_24px_pressed.png</file>
-        <file>buttons/arrow_right_light_24px.png</file>
-        <file>buttons/arrow_right_light_24px_hover.png</file>
-        <file>buttons/arrow_right_light_24px_pressed.png</file>
+        <file>buttons/settings_24px.png</file>
+        <file>buttons/settings_dark_24px.png</file>
+        <file>buttons/settings_dark_24px_hover.png</file>
+        <file>buttons/settings_dark_24px_pressed.png</file>
+        <file>buttons/settings_light_24px.png</file>
+        <file>buttons/settings_light_24px_hover.png</file>
+        <file>buttons/settings_light_24px_pressed.png</file>
         <file>icons/uac-shield.png</file>
         <file>icons/arrow_up.png</file>
         <file>icons/arrow_down.png</file>

Software/res/buttons/settings_24px.png

@@ -29,7 +29,7 @@
 #include <QtGui>
 #include "colorspace_types.h"
 #include "types.h"
-
+#include "SettingsDefaults.hpp"
 /*!
 	Abstract class representing any LED device.
 	\a LedDeviceManager
@@ -101,14 +101,14 @@ public slots:
 
 protected:
 	QString m_colorSequence;
-	double m_gamma;
-	int m_brightness;
-	int m_brightnessCap;
-	int m_ledMilliAmps{0};
-	double m_powerSupplyAmps{0.0};
-	int m_luminosityThreshold;
-	bool m_isMinimumLuminosityEnabled;
-	bool m_isDitheringEnabled;
+	double m_gamma{ SettingsScope::Profile::Device::GammaDefault };
+	int m_brightness{ SettingsScope::Profile::Device::BrightnessDefault };
+	int m_brightnessCap{ SettingsScope::Profile::Device::BrightnessCapDefault };
+	int m_ledMilliAmps{ SettingsScope::Main::Device::LedMilliAmpsDefault };
+	double m_powerSupplyAmps{ SettingsScope::Main::Device::PowerSupplyAmpsDefault };
+	int m_luminosityThreshold{ SettingsScope::Profile::Grab::LuminosityThresholdDefault };
+	bool m_isMinimumLuminosityEnabled{ SettingsScope::Profile::Grab::IsMinimumLuminosityEnabledDefault };
+	bool m_isDitheringEnabled{ SettingsScope::Profile::Device::IsDitheringEnabledDefault };
 
 	QList<WBAdjustment> m_wbAdjustments;
 

Software/res/buttons/settings_dark_24px.png

@@ -59,8 +59,17 @@ GrabConfigWidget::~GrabConfigWidget()
 	delete ui;
 }
 
-void GrabConfigWidget::showConfigFor(QRect widgetGeometry, int buttonCenter)
+void GrabConfigWidget::showConfigFor(QRect widgetGeometry, int buttonCenter, const bool showEnable = true, const bool showCoefs = true)
 {
+	ui->checkBox_IsAreaEnabled->setVisible(showEnable);
+	ui->label_Red->setVisible(showCoefs);
+	ui->label_Green->setVisible(showCoefs);
+	ui->label_Blue->setVisible(showCoefs);
+	ui->spinBox_Red->setVisible(showCoefs);
+	ui->spinBox_Green->setVisible(showCoefs);
+	ui->spinBox_Blue->setVisible(showCoefs);
+	adjustSize();
+
 	#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
 	QRect screen = QGuiApplication::screenAt(widgetGeometry.center())->geometry();
 	#else