Update all Menus to new Print function

2023-01-04 10:35:49 +01:00
parent 04109d82e6
commit 1147cb4eb6
7 changed files with 22 additions and 69 deletions
@@ -31,26 +31,18 @@ bool Menu::isInSubmenu() {
 }

 void Menu::printMenu() {
-    if (this->lcd) {
-        lcd->clear();
-        lcd->setCursor(0, 0);
-        lcd->print("-> ");
-        lcd->print((**this->selectedEntry).getName());
-        lcd->setCursor(0, 1);
-        std::list<MenuAction*>::iterator iter = this->selectedEntry;
-        iter++;
-        if (iter != this->entrys.end()) {
-            lcd->print((**iter).getName());
-        } else
-            lcd->print((*this->entrys.begin())->getName());
-    } 
-    std::cout << std::endl;
-    for (std::list<MenuAction*>::iterator iter = this->entrys.begin(); iter != this->entrys.end(); iter++) {
-        if (this->selectedEntry == iter)
-            std::cout << "  " << (**iter).getName() << std::endl;
-        else
-            std::cout << (**iter).getName() << std::endl;
-    }
+    std::list<MenuAction*>::iterator iter = this->selectedEntry;
+
+    String lineOne = "-> ";
+    String lineTwo = "";
+
+    lineOne.concat((**iter).getName());
+    iter++;
+    if (iter != this->entrys.end()) {
+        lineTwo.concat((**iter).getName());
+    } else
+        lineTwo.concat((*this->entrys.begin())->getName());
+
    this->inSubmenu = false;
 }