From 3ef9db3a84669ace6291322daafe914378627d6f Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 26 Apr 2016 18:36:50 +0200 Subject: [PATCH] ui: removed us of utf8 circle due to Linux issues * Use dot.png in status bar again * use * for out-dated files --- src/lib_gui/qt/element/QtCodeFile.cpp | 2 +- src/lib_gui/qt/element/QtStatusBar.cpp | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib_gui/qt/element/QtCodeFile.cpp b/src/lib_gui/qt/element/QtCodeFile.cpp index 22bfe5e1..9b2ea02c 100644 --- a/src/lib_gui/qt/element/QtCodeFile.cpp +++ b/src/lib_gui/qt/element/QtCodeFile.cpp @@ -541,7 +541,7 @@ void QtCodeFile::doUpdateTitleBar() if ((!FileSystem::exists(m_filePath.str())) || (FileSystem::getLastWriteTime(m_filePath) > m_modificationTime)) { - m_title->setText(QString(m_filePath.fileName().c_str()) + " " + QChar(0x25CF)); + m_title->setText(QString(m_filePath.fileName().c_str()) + "*"); m_title->setToolTip(QString::fromStdString("out of date: " + m_filePath.str())); } else diff --git a/src/lib_gui/qt/element/QtStatusBar.cpp b/src/lib_gui/qt/element/QtStatusBar.cpp index d7ca8e0b..47e95ca2 100644 --- a/src/lib_gui/qt/element/QtStatusBar.cpp +++ b/src/lib_gui/qt/element/QtStatusBar.cpp @@ -2,6 +2,7 @@ #include +#include "qt/utility/utilityQt.h" #include "utility/messaging/type/MessageSearch.h" #include "utility/ResourcePaths.h" @@ -26,10 +27,11 @@ QtStatusBar::QtStatusBar() m_errorButton.hide(); m_errorButton.setFlat(true); m_errorButton.setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac - m_errorButton.setStyleSheet( - "QPushButton { color: #D00000; background: none; border: none; margin-right: 0; spacing: none; } " - "QPushButton:hover { text-decoration: underline; }" - ); + m_errorButton.setStyleSheet("QPushButton { color: #D00000; margin-right: 0; spacing: none; }"); + m_errorButton.setIcon(utility::colorizePixmap( + QPixmap((ResourcePaths::getGuiPath() + "statusbar_view/dot.png").c_str()), + "#D00000" + ).scaledToHeight(12)); addPermanentWidget(&m_errorButton); connect(&m_errorButton, SIGNAL(clicked()), this, SLOT(showErrors())); @@ -67,7 +69,7 @@ void QtStatusBar::setErrorCount(ErrorCountInfo errorCount) if (errorCount.total > 0) { m_errorButton.setText( - QChar(0x25CF) + QString::number(errorCount.total) + " error" + (errorCount.total > 1 ? "s" : "") + + QString::number(errorCount.total) + " error" + (errorCount.total > 1 ? "s" : "") + (errorCount.fatal > 0 ? " (" + QString::number(errorCount.fatal) + " fatal)" : "")); m_errorButton.show(); }