mirror of
https://github.com/Sani7/remote-ui.git
synced 2026-10-27 06:01:14 +01:00
sim base clean
UI now uses bg_color as led_color Move add_UI_item to push_ui_item
This commit is contained in:
+2
-20
@@ -1,7 +1,7 @@
|
||||
#include "UI_led.hpp"
|
||||
|
||||
UI_led::UI_led(std::string text, Color fg_color, Color bg_color, Color led_color, QObject *parent)
|
||||
: UI_item(UI_LED_TYPE, text, 12, fg_color, bg_color, parent), m_led_color(led_color)
|
||||
UI_led::UI_led(std::string text, Color fg_color, Color bg_color, QObject *parent)
|
||||
: UI_item(UI_LED_TYPE, text, 12, fg_color, bg_color, parent)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -10,31 +10,13 @@ UI_led::UI_led(const json &j, QObject *parent) : UI_item(UI_LED_TYPE, parent)
|
||||
from_json(j);
|
||||
}
|
||||
|
||||
Color UI_led::led_color() const
|
||||
{
|
||||
return m_led_color;
|
||||
}
|
||||
|
||||
void UI_led::set_led_color(Color led_color)
|
||||
{
|
||||
if (m_led_color != led_color)
|
||||
{
|
||||
m_led_color = led_color;
|
||||
emit value_changed();
|
||||
}
|
||||
}
|
||||
|
||||
void UI_led::from_json(const json &j)
|
||||
{
|
||||
UI_item::from_json(j);
|
||||
std::string color;
|
||||
j.at("led_color").get_to(color);
|
||||
m_led_color = Color(color);
|
||||
}
|
||||
|
||||
json UI_led::to_json(size_t id) const
|
||||
{
|
||||
json j = UI_item::to_json(id);
|
||||
j["led_color"] = m_led_color.to_hex();
|
||||
return j;
|
||||
}
|
||||
|
||||
+1
-4
@@ -8,7 +8,7 @@ class UI_led : public UI_item
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
UI_led(std::string text, Color fg_color, Color bg_color, Color led_color, QObject *parent = nullptr);
|
||||
UI_led(std::string text, Color fg_color, Color bg_color, QObject *parent = nullptr);
|
||||
UI_led(const json &j, QObject *parent = nullptr);
|
||||
|
||||
Color led_color() const;
|
||||
@@ -16,7 +16,4 @@ class UI_led : public UI_item
|
||||
|
||||
void from_json(const json &j) override;
|
||||
json to_json(size_t id) const override;
|
||||
|
||||
private:
|
||||
Color m_led_color;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user