diff options
| -rw-r--r-- | confui/ui_automation.cpp | 10 | ||||
| -rw-r--r-- | confui/ui_node.cpp | 9 |
2 files changed, 5 insertions, 14 deletions
diff --git a/confui/ui_automation.cpp b/confui/ui_automation.cpp index 8a3de42..a202c68 100644 --- a/confui/ui_automation.cpp +++ b/confui/ui_automation.cpp @@ -41,11 +41,7 @@ void CDAutomationWidget::update() { dropdown_button->clear(); dropdown_light->clear(); for (pair<cd_uid_t, cd_s_node *> node : nodes) { - QString label = ""; - label.append(QString::fromLocal8Bit(node.second->name, node.second->name_len)); - label.append(" ("); - label.append(QString::fromStdString(CDMeshConnector::cd_mac_to_string(node.second->address))); - label.append(")"); + QString label = QString::fromStdString(CDMeshConnector::cd_uuid_to_string(node.second->uuid)); dropdown_button->addItem(label, node.second->id); dropdown_light->addItem(label, node.second->id); @@ -53,8 +49,8 @@ void CDAutomationWidget::update() { dropdown_action->clear(); dropdown_action->addItem("Toggles", CD_AUTOMATION_TYPE_TOGGLE); - dropdown_action->addItem("Switches on", CD_AUTOMATION_TYPE_TURN_ON); - dropdown_action->addItem("Switches off", CD_AUTOMATION_TYPE_TURN_OFF); + // dropdown_action->addItem("Switches on", CD_AUTOMATION_TYPE_TURN_ON); + // dropdown_action->addItem("Switches off", CD_AUTOMATION_TYPE_TURN_OFF); if (_automation == nullptr) return; diff --git a/confui/ui_node.cpp b/confui/ui_node.cpp index 2898c42..fa451de 100644 --- a/confui/ui_node.cpp +++ b/confui/ui_node.cpp @@ -30,13 +30,8 @@ void CDNodeWidget::set_node(cd_uid_t id) { void CDNodeWidget::update() { if (_node == nullptr) return; - QString node_name = QString::fromLocal8Bit(_node->name, _node->name_len); - label_node_name->setText(node_name); - - QString node_address = QString::fromStdString(CDMeshConnector::cd_mac_to_string(_node->address)); - node_address.prepend("("); - node_address.append(")"); - label_node_address->setText(node_address); + QString node_label = QString::fromStdString(CDMeshConnector::cd_uuid_to_string(_node->uuid)); + label_node_address->setText(node_label); switch_on_off->setText("on"); switch_on_off->setVisible(_node->provisioned); |