kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #19636 from kadet1090/color-in-base

Browse Source 
Base: Move App::Color to Base
This commit is contained in:
Chris Hennes
2025-03-02 16:36:40 -06:00
committed by GitHub
parent f2a8bc92af 97de3de68f
commit 1a2070c36f
216 changed files with 1121 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Gui/MainWindow.cpp
View File

@@ -116,7 +116,7 @@
#include "View3DInventor.h"
#include "View3DInventorViewer.h"
#include "Dialogs/DlgObjectSelection.h"
#include <App/Color.h>
#include <Base/Color.h>
FC_LOG_LEVEL_INIT("MainWindow",false,true,true)
@@ -2349,15 +2349,15 @@ void MainWindow::setWindowTitle(const QString& string)
auto format = QStringLiteral("#statusBar{color: %1}");
if (strcmp(sReason, "colorText") == 0) {
unsigned long col = rclGrp.GetUnsigned(sReason);
this->msg = format.arg(App::Color::fromPackedRGB<QColor>(col).name());
this->msg = format.arg(Base::Color::fromPackedRGB<QColor>(col).name());
}
else if (strcmp(sReason, "colorWarning") == 0) {
unsigned long col = rclGrp.GetUnsigned(sReason);
this->wrn = format.arg(App::Color::fromPackedRGB<QColor>(col).name());
this->wrn = format.arg(Base::Color::fromPackedRGB<QColor>(col).name());
}
else if (strcmp(sReason, "colorError") == 0) {
unsigned long col = rclGrp.GetUnsigned(sReason);
this->err = format.arg(App::Color::fromPackedRGB<QColor>(col).name());
this->err = format.arg(Base::Color::fromPackedRGB<QColor>(col).name());
}
else if (strcmp(sReason, "colorCritical") == 0) {
unsigned long col = rclGrp.GetUnsigned(sReason);