From d3b10bc5fd04e01a6ba398fa5e1bd709d26c30e7 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Fri, 26 Aug 2016 15:31:57 +0200 Subject: [PATCH] ui: Fixed font colors in indexing dialogs and line breaks in status bar --- bin/app/data/gui/indexing_dialog/indexing_dialog.css | 5 +++-- src/lib/component/controller/StatusBarController.cpp | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bin/app/data/gui/indexing_dialog/indexing_dialog.css b/bin/app/data/gui/indexing_dialog/indexing_dialog.css index cc98137c..56e15a4e 100644 --- a/bin/app/data/gui/indexing_dialog/indexing_dialog.css +++ b/bin/app/data/gui/indexing_dialog/indexing_dialog.css @@ -1,4 +1,4 @@ -* { +QLabel { color: white; } @@ -29,9 +29,10 @@ } #errorCount { - font-size: 12pt; border: none; background: transparent; + color: white; + font-size: 14pt; } #windowButton { diff --git a/src/lib/component/controller/StatusBarController.cpp b/src/lib/component/controller/StatusBarController.cpp index 364872bd..f86c7731 100644 --- a/src/lib/component/controller/StatusBarController.cpp +++ b/src/lib/component/controller/StatusBarController.cpp @@ -3,6 +3,7 @@ #include "component/view/StatusBarView.h" #include "data/access/StorageAccess.h" #include "utility/logging/logging.h" +#include "utility/utilityString.h" StatusBarController::StatusBarController(StorageAccess* storageAccess) : m_storageAccess(storageAccess) @@ -51,10 +52,12 @@ void StatusBarController::handleMessage(MessageStatus* message) void StatusBarController::setStatus(const std::string& status, bool isError, bool showLoader) { - if (!status.empty()) - { - LOG_INFO_STREAM(<< "STATUS " << status); + std::string str = utility::replace(status, "\n", " "); - getView()->showMessage(status, isError, showLoader); + if (!str.empty()) + { + LOG_INFO_STREAM(<< "STATUS " << str); + + getView()->showMessage(str, isError, showLoader); } }