diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp index 322111e04..13e2c3aa1 100644 --- a/src/blackconfig/buildconfig.cpp +++ b/src/blackconfig/buildconfig.cpp @@ -162,9 +162,9 @@ namespace BlackConfig return QDateTime::currentDateTime() > getEol(); } - QString boolToYesNo(bool v) + const QString boolToYesNo(bool v) { - return v ? "yes" : "no"; + return v ? QStringLiteral("yes") : QStringLiteral("no"); } const QString &CBuildConfig::compiledWithInfo(bool shortVersion) @@ -210,7 +210,7 @@ namespace BlackConfig const QString &CBuildConfig::buildDateAndTime() { // http://en.cppreference.com/w/cpp/preprocessor/replace#Predefined_macros - static const QString buildDateAndTime(__DATE__ " " __TIME__); + static const QString buildDateAndTime = QString(__DATE__ " " __TIME__).simplified(); return buildDateAndTime; } diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp index 6281245bc..9231eae07 100644 --- a/src/blackgui/components/hotkeydialog.cpp +++ b/src/blackgui/components/hotkeydialog.cpp @@ -124,7 +124,7 @@ namespace BlackGui CStyleSheetUtility::fileNameStandardWidget() } ); - setStyleSheet(s); + this->setStyleSheet(s); } CActionHotkey CHotkeyDialog::getActionHotkey(const CActionHotkey &initial, const CIdentifierList &identifiers, QWidget *parent) diff --git a/src/blackgui/components/logcomponent.ui b/src/blackgui/components/logcomponent.ui index a16d826da..27bbd2da6 100644 --- a/src/blackgui/components/logcomponent.ui +++ b/src/blackgui/components/logcomponent.ui @@ -2,6 +2,14 @@ CLogComponent + + + 0 + 0 + 264 + 335 + + Log component @@ -60,6 +68,9 @@ + + Status message log view + Qt::ScrollBarAlwaysOn diff --git a/src/blackgui/filters/filterdialog.cpp b/src/blackgui/filters/filterdialog.cpp index b45c31275..862db5631 100644 --- a/src/blackgui/filters/filterdialog.cpp +++ b/src/blackgui/filters/filterdialog.cpp @@ -21,14 +21,14 @@ namespace BlackGui CFilterDialog::CFilterDialog(QWidget *parent) : QDialog(parent, Qt::Tool) { this->setWindowTitle("Filter dialog"); - this->ps_onStyleSheetChanged(); - connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CFilterDialog::ps_onStyleSheetChanged); + this->onStyleSheetChanged(); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CFilterDialog::onStyleSheetChanged); } CFilterDialog::~CFilterDialog() { } - void CFilterDialog::ps_onStyleSheetChanged() + void CFilterDialog::onStyleSheetChanged() { const QString qss = sGui->getStyleSheetUtility().style(CStyleSheetUtility::fileNameFilterDialog()); this->setStyleSheet(qss); diff --git a/src/blackgui/filters/filterdialog.h b/src/blackgui/filters/filterdialog.h index aaebf5cbb..154b9ac23 100644 --- a/src/blackgui/filters/filterdialog.h +++ b/src/blackgui/filters/filterdialog.h @@ -33,9 +33,9 @@ namespace BlackGui //! Destructor virtual ~CFilterDialog(); - private slots: + private: //! Stylesheet changed - void ps_onStyleSheetChanged(); + void onStyleSheetChanged(); }; } // namespace diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp index 58411f952..2d1b32872 100644 --- a/src/blackgui/stylesheetutility.cpp +++ b/src/blackgui/stylesheetutility.cpp @@ -37,8 +37,8 @@ namespace BlackGui CStyleSheetUtility::CStyleSheetUtility(BlackMisc::Restricted, QObject *parent) : QObject(parent) { this->read(); - connect(&this->m_fileWatcher, &QFileSystemWatcher::directoryChanged, this, &CStyleSheetUtility::qssDirectoryChanged); - connect(&this->m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &CStyleSheetUtility::qssDirectoryChanged); + connect(&m_fileWatcher, &QFileSystemWatcher::directoryChanged, this, &CStyleSheetUtility::qssDirectoryChanged); + connect(&m_fileWatcher, &QFileSystemWatcher::fileChanged, this, &CStyleSheetUtility::qssDirectoryChanged); } const QString &CStyleSheetUtility::fontStyleAsString(const QFont &font) @@ -137,8 +137,8 @@ namespace BlackGui if (!directory.exists()) { return false; } // qss/css files - const bool needsWatcher = this->m_fileWatcher.files().isEmpty(); - if (needsWatcher) { this->m_fileWatcher.addPath(CDirectoryUtils::stylesheetsDirectory()); } // directory to deleted file watching + const bool needsWatcher = m_fileWatcher.files().isEmpty(); + if (needsWatcher) { m_fileWatcher.addPath(CDirectoryUtils::stylesheetsDirectory()); } // directory to deleted file watching directory.setNameFilters({"*.qss", "*.css"}); directory.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); @@ -150,7 +150,7 @@ namespace BlackGui QFile file(absolutePath); if (file.open(QFile::QIODevice::ReadOnly | QIODevice::Text)) { - if (needsWatcher) { this->m_fileWatcher.addPath(absolutePath); } + if (needsWatcher) { m_fileWatcher.addPath(absolutePath); } QTextStream in(&file); const QString c = in.readAll(); const QString f = fileInfo.fileName().toLower(); @@ -162,9 +162,9 @@ namespace BlackGui } // ignore redundant re-reads - if (newStyleSheets != this->m_styleSheets) + if (newStyleSheets != m_styleSheets) { - this->m_styleSheets = newStyleSheets; + m_styleSheets = newStyleSheets; emit this->styleSheetsChanged(); } return true; @@ -173,7 +173,7 @@ namespace BlackGui QString CStyleSheetUtility::style(const QString &fileName) const { if (!this->containsStyle(fileName)) { return QString(); } - return this->m_styleSheets[fileName.toLower()].trimmed(); + return m_styleSheets[fileName.toLower()].trimmed(); } QString CStyleSheetUtility::styles(const QStringList &fileNames) const @@ -193,12 +193,12 @@ namespace BlackGui if (fontAdded) { continue; } fontAdded = true; s = hasModifiedFont ? - this->m_styleSheets[fileNameFontsModified().toLower()] : - this->m_styleSheets[fileNameFonts()]; + m_styleSheets[fileNameFontsModified().toLower()] : + m_styleSheets[fileNameFonts()]; } else { - s = this->m_styleSheets[key]; + s = m_styleSheets[key]; } if (s.isEmpty()) continue; if (!style.isEmpty()) style.append("\n\n"); @@ -211,7 +211,7 @@ namespace BlackGui bool CStyleSheetUtility::containsStyle(const QString &fileName) const { if (fileName.isEmpty()) return false; - return this->m_styleSheets.contains(fileName.toLower().trimmed()); + return m_styleSheets.contains(fileName.toLower().trimmed()); } bool CStyleSheetUtility::updateFont(const QFont &font)