steven-y-e
/
vial
1
0
Fork 0
Code Pull Requests Releases Activity

rgb_configurator: default to current color in dialog

main
Ilya Zhuravlev 2021-04-03 20:14:47 -04:00
parent 9f617e5ff7
commit ab39926ed4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/python/rgb_configurator.py
View File

@ -124,9 +124,11 @@ class RGBConfigurator(BasicEditor):
self.device.keyboard.set_qmk_rgblight_effect_speed(value) self.device.keyboard.set_qmk_rgblight_effect_speed(value)
def on_underglow_color(self): def on_underglow_color(self):
color = QColorDialog.getColor() color = QColorDialog.getColor(self.current_color())
self.underglow_color.setStyleSheet("QWidget { background-color: %s}" % color.name()) self.underglow_color.setStyleSheet("QWidget { background-color: %s}" % color.name())
h, s, v, a = color.getHsvF() h, s, v, a = color.getHsvF()
if h < 0:
h = 0
self.device.keyboard.set_qmk_rgblight_color(int(255 * h), int(255 * s), int(255 * v)) self.device.keyboard.set_qmk_rgblight_color(int(255 * h), int(255 * s), int(255 * v))
self.update_color_from_keyboard() self.update_color_from_keyboard()
@ -148,6 +150,11 @@ class RGBConfigurator(BasicEditor):
# self.underglow_effect_speed.blockSignals(False) # self.underglow_effect_speed.blockSignals(False)
self.underglow_color.blockSignals(False) self.underglow_color.blockSignals(False)
def current_color(self):
return QColor.fromHsvF(self.device.keyboard.underglow_color[0] / 255.0,
self.device.keyboard.underglow_color[1] / 255.0,
self.device.keyboard.underglow_brightness / 255.0)
def update_color_from_keyboard(self): def update_color_from_keyboard(self):
self.device.keyboard.reload_rgb() self.device.keyboard.reload_rgb()
@ -156,10 +163,7 @@ class RGBConfigurator(BasicEditor):
self.underglow_brightness.setValue(self.device.keyboard.underglow_brightness) self.underglow_brightness.setValue(self.device.keyboard.underglow_brightness)
self.underglow_effect.setCurrentIndex(self.device.keyboard.underglow_effect) self.underglow_effect.setCurrentIndex(self.device.keyboard.underglow_effect)
# self.underglow_effect_speed.setValue(self.device.keyboard.underglow_effect_speed) # self.underglow_effect_speed.setValue(self.device.keyboard.underglow_effect_speed)
color = QColor.fromHsvF(self.device.keyboard.underglow_color[0] / 255.0, self.underglow_color.setStyleSheet("QWidget { background-color: %s}" % self.current_color().name())
self.device.keyboard.underglow_color[1] / 255.0,
self.device.keyboard.underglow_brightness / 255.0)
self.underglow_color.setStyleSheet("QWidget { background-color: %s}" % color.name())
self.unblock_signals() self.unblock_signals()