From e6aa3b17fb626f9c5bae10ea661872dff6e943a7 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Thu, 30 Mar 2023 20:20:28 +0200 Subject: [PATCH] Added two left and right indicator characters to ViewController --- es-app/src/guis/GuiThemeDownloader.cpp | 9 ++++++--- es-app/src/views/ViewController.h | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/es-app/src/guis/GuiThemeDownloader.cpp b/es-app/src/guis/GuiThemeDownloader.cpp index 35fe4828e..854fd21ae 100644 --- a/es-app/src/guis/GuiThemeDownloader.cpp +++ b/es-app/src/guis/GuiThemeDownloader.cpp @@ -143,10 +143,12 @@ GuiThemeDownloader::GuiThemeDownloader() }); mViewerIndicatorLeft = std::make_shared( - "\uf104", Font::get(FONT_SIZE_LARGE * 1.2f, FONT_PATH_BOLD), 0xCCCCCCFF, ALIGN_CENTER); + ViewController::ARROW_LEFT_CHAR, Font::get(FONT_SIZE_LARGE * 1.2f, FONT_PATH_BOLD), + 0xCCCCCCFF, ALIGN_CENTER); mViewerIndicatorRight = std::make_shared( - "\uf105", Font::get(FONT_SIZE_LARGE * 1.2f, FONT_PATH_BOLD), 0xCCCCCCFF, ALIGN_CENTER); + ViewController::ARROW_RIGHT_CHAR, Font::get(FONT_SIZE_LARGE * 1.2f, FONT_PATH_BOLD), + 0xCCCCCCFF, ALIGN_CENTER); git_libgit2_init(); @@ -277,7 +279,8 @@ bool GuiThemeDownloader::fetchRepository(const std::string& repositoryName, } if (mergeAnalysis & GIT_MERGE_ANALYSIS_UP_TO_DATE) { - LOG(LogInfo) << "Repository \"" << repositoryName << "\" already up to date"; + LOG(LogInfo) << "GuiThemeDownloader: Repository \"" << repositoryName + << "\" already up to date"; if (repositoryName != "themes-list") mMessage = "THEME ALREADY UP TO DATE"; git_annotated_commit_free(annotated); diff --git a/es-app/src/views/ViewController.h b/es-app/src/views/ViewController.h index 974017acb..61b3a88f2 100644 --- a/es-app/src/views/ViewController.h +++ b/es-app/src/views/ViewController.h @@ -134,6 +134,8 @@ public: // Font Awesome symbols. #if defined(_MSC_VER) // MSVC compiler. + static inline const std::string ARROW_LEFT_CHAR {Utils::String::wideStringToString(L"\uf104")}; + static inline const std::string ARROW_RIGHT_CHAR {Utils::String::wideStringToString(L"\uf105")}; static inline const std::string BRANCH_CHAR {Utils::String::wideStringToString(L"\uf18c")}; static inline const std::string CONTROLLER_CHAR {Utils::String::wideStringToString(L"\uf11b")}; static inline const std::string CROSSEDCIRCLE_CHAR { @@ -147,6 +149,8 @@ public: static inline const std::string KEYBOARD_CHAR {Utils::String::wideStringToString(L"\uf11c")}; static inline const std::string TICKMARK_CHAR {Utils::String::wideStringToString(L"\uf14A")}; #else + static inline const std::string ARROW_LEFT_CHAR {"\uf104"}; + static inline const std::string ARROW_RIGHT_CHAR {"\uf105"}; static inline const std::string BRANCH_CHAR {"\uf18c"}; static inline const std::string CONTROLLER_CHAR {"\uf11b"}; static inline const std::string CROSSEDCIRCLE_CHAR {"\uf05e"};