diff --git a/metadata/panel.xml b/metadata/panel.xml index 82d2eac46..997898714 100644 --- a/metadata/panel.xml +++ b/metadata/panel.xml @@ -507,6 +507,19 @@ 300 1 + + <_short>Monitor naming + <_long>Type of name to use for the brightness controls of monitors + model + + model + <_name>Model name + + + connector + <_name>Connector + + <_short>Scroll sensitivity 1 diff --git a/src/panel/widgets/brightness/brightness.hpp b/src/panel/widgets/brightness/brightness.hpp index 6e5d71b89..1bb7662b4 100644 --- a/src/panel/widgets/brightness/brightness.hpp +++ b/src/panel/widgets/brightness/brightness.hpp @@ -30,6 +30,7 @@ class WfLightControl : public Gtk::Box void update_parent_icon(); WfOption slider_length{"panel/brightness_slider_length"}; + WfOption label_pref{"panel/brightness_monitor_label"}; public: WfLightControl(WayfireBrightness *parent); diff --git a/src/panel/widgets/brightness/ddcutil.cpp b/src/panel/widgets/brightness/ddcutil.cpp index d04fc3390..d759ba203 100644 --- a/src/panel/widgets/brightness/ddcutil.cpp +++ b/src/panel/widgets/brightness/ddcutil.cpp @@ -57,7 +57,14 @@ class WfLightDdcaControl : public WfLightControl ddca_close_display(handle); scale.set_target_value(get_brightness()); update_parent_icon(); - label.set_text(get_name()); + + if (label_pref.value() == "connector") + { + label.set_text(connector); + } else // "model" + { + label.set_text(get_name()); + } // MCCS doesn’t have anything to track changes to feature codes, so we // read the current value and adjust the visual when mapped. New thread diff --git a/src/panel/widgets/brightness/sysfs.cpp b/src/panel/widgets/brightness/sysfs.cpp index 45db2c0d6..9bbd7a0df 100644 --- a/src/panel/widgets/brightness/sysfs.cpp +++ b/src/panel/widgets/brightness/sysfs.cpp @@ -50,7 +50,14 @@ class WfLightSysfsControl : public WfLightControl connector_name = connector_name.substr(0, connector_name.find("/")); scale.set_target_value(get_brightness()); - label.set_text(get_name()); + + if (label_pref.value() == "connector") + { + label.set_text(connector_name); + } else // "model" + { + label.set_text(get_name()); + } } std::string get_connector()