diff options
Autocommit at 05.05.2022 @ 21:24
3 files changed, 24 insertions, 21 deletions
| -rw-r--r-- | src/ConsoleInterface/Menu.cpp | 8 | ||||
| -rw-r--r-- | src/ConsoleInterface/Toolbox.cpp | 12 | ||||
| -rw-r--r-- | src/ConsoleInterface/Toolbox.hpp | 25 |
diff --git a/src/ConsoleInterface/Menu.cpp b/src/ConsoleInterface/Menu.cpp index ae51c40..beb69c2 100644 --- a/src/ConsoleInterface/Menu.cpp +++ b/src/ConsoleInterface/Menu.cpp @@ -51,11 +51,11 @@ void Menu::navigate() const { while (buffer != 0) { clear(); - printTitle(title); + title(title); switch(msgType) { - case Error: printError(msg.get_cstr()); msgType = NoPrint; break; - case Warning: printWarning(msg.get_cstr()); msgType = NoPrint; break; - case Success: printSuccess(msg.get_cstr()); msgType = NoPrint; break; + case Error: error(msg.get_cstr()); msgType = NoPrint; break; + case Warning: warning(msg.get_cstr()); msgType = NoPrint; break; + case Success: success(msg.get_cstr()); msgType = NoPrint; break; case NoPrint: printLine(""); break; } printLine(""); diff --git a/src/ConsoleInterface/Toolbox.cpp b/src/ConsoleInterface/Toolbox.cpp index d42c16e..ea291bd 100644 --- a/src/ConsoleInterface/Toolbox.cpp +++ b/src/ConsoleInterface/Toolbox.cpp @@ -30,19 +30,23 @@ void inputLineBox(const char* label, char* output, unsigned maxWidth) { std::cin.getline(output, maxWidth); } -void printTitle(const char* title) { +void title(const char* title) { std::cout << std::endl << "### " << title << " ###" << std::endl; } -void printSuccess(const char* message) { +void printSubTitle(const char* title) { + std::cout << std::endl << "+#+ " << title << " +#+" << std::endl; +} + +void success(const char* message) { std::cout << "<S> " << message << std::endl; } -void printWarning(const char* message) { +void warning(const char* message) { std::cout << "<W> " << message << std::endl; } -void printError(const char* message) { +void error(const char* message) { std::cout << "<E> " << message << std::endl; } diff --git a/src/ConsoleInterface/Toolbox.hpp b/src/ConsoleInterface/Toolbox.hpp index c302860..2398abc 100644 --- a/src/ConsoleInterface/Toolbox.hpp +++ b/src/ConsoleInterface/Toolbox.hpp @@ -7,6 +7,18 @@ #define MAX_LINE_WIDTH 1024 void clear(); +void title(const char* title); +void printSubTitle(const char* title); +void success(const char* message); +void warning(const char* message); +void error(const char* message); + +void inputLineBox(const char* label, char* output, unsigned maxWidth); +void resetOrderedList(int starter = 1); + +void _printInputBoxLabel(const char* label); +void _printAltInputBoxLabel(const char* label); +void _printOrderedListBeginning(); template <class T> void read(T* storage) { @@ -38,7 +50,6 @@ void printLine(const T& item) { std::cout << item << std::endl; } -void _printOrderedListBeginning(); template <typename T> void printOrderedListElem(const T& elem) { @@ -46,22 +57,10 @@ void printOrderedListElem(const T& elem) { printLine(elem); } -void resetOrderedList(int starter = 1); - -void _printInputBoxLabel(const char* label); -void _printAltInputBoxLabel(const char* label); - template <typename T> void inputBox(const char* label, T* output) { _printInputBoxLabel(label); std::cin >> *output; } -void inputLineBox(const char* label, char* output, unsigned maxWidth); - -void printTitle(const char* title); -void printSuccess(const char* message); -void printWarning(const char* message); -void printError(const char* message); - #endif |
