Add stylesheet tools to caf

Fwk/AppFwk/cafUserInterface/CMakeLists.txt

@@ -163,6 +163,8 @@ set( PROJECT_FILES
     cafPdmDoubleStringValidator.cpp
     cafPickEventHandler.h
     cafPdmUiPickableLineEditor.cpp
+	cafStyleSheetTools.h
+	cafStyleSheetTools.cpp
 )
 
 add_library( ${PROJECT_NAME}

Fwk/AppFwk/cafUserInterface/cafQStyledProgressBar.cpp

@@ -35,12 +35,14 @@
 //##################################################################################################
 #include "cafQStyledProgressBar.h"
 
+#include "cafStyleSheetTools.h"
 
+using namespace caf;
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-caf::QStyledProgressBar::QStyledProgressBar(QString objectName, QWidget* parent /*= nullptr*/)
+QStyledProgressBar::QStyledProgressBar(QString objectName, QWidget* parent /*= nullptr*/)
     : QProgressBar(parent)
 {
     setObjectName(objectName);
@@ -49,25 +51,19 @@ caf::QStyledProgressBar::QStyledProgressBar(QString objectName, QWidget* parent
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void caf::QStyledProgressBar::setTextBackgroundAndProgressColor(QColor textColor, QColor backgroundColor, QColor backgroundFrameColor, QColor progressColor)
+void QStyledProgressBar::setTextBackgroundAndProgressColor(QColor textColor, QColor backgroundColor, QColor backgroundFrameColor, QColor progressColor)
 {
     QString styleSheetTemplate =
-        "QProgressBar#%1"
-        "{"
-        "color: %2;"
-        "background-color: %3;"
-        "border: 1px solid %4;"
-        "}"
         "QProgressBar#%1::chunk"
         "{"
-        "background-color: %5;"
+        "background-color: %2;"
         "}";
-    QString textColString     = colorStringWithAlpha(textColor);
-    QString bgColString       = colorStringWithAlpha(backgroundColor);
-    QString bgFrameColString  = colorStringWithAlpha(backgroundFrameColor);
     QString progressColString = colorStringWithAlpha(progressColor);
 
-    QString fullStyleSheet = styleSheetTemplate.arg(objectName()).arg(textColString).arg(bgColString).arg(bgFrameColString).arg(progressColString);
+    QString fullStyleSheet =
+        StyleSheetTools::createFrameStyleSheet("QProgressBar", objectName(), textColor, backgroundColor, backgroundFrameColor);
+    fullStyleSheet += styleSheetTemplate.arg(objectName()).arg(progressColString);
+
     setStyleSheet(fullStyleSheet);
     setAttribute(Qt::WA_TranslucentBackground);
 }
@@ -75,7 +71,7 @@ void caf::QStyledProgressBar::setTextBackgroundAndProgressColor(QColor textColor
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString caf::QStyledProgressBar::colorStringWithAlpha(QColor color)
+QString QStyledProgressBar::colorStringWithAlpha(QColor color)
 {
     return QString("rgba(%1, %2, %3, %4)").arg(color.red()).arg(color.green()).arg(color.blue()).arg(color.alpha());
 }

Fwk/AppFwk/cafUserInterface/cafStyleSheetTools.cpp

@@ -0,0 +1,72 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2019- Ceetron Solutions AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
+//   for more details.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+#include "cafStyleSheetTools.h"
+
+#include <QColor>
+
+using namespace caf;
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString StyleSheetTools::createFrameStyleSheet(const QString& classType,
+                                                    const QString& objectName,
+                                                    const QColor&  textColor,
+                                                    const QColor&  backgroundColor,
+                                                    const QColor&  backgroundFrameColor)
+{
+    QString styleSheetTemplate = "%1#%2"
+                                 "{"
+                                 "color: %3;"
+                                 "background-color: %4;"
+                                 "border: 1px solid %5;"
+                                 "}";
+    QString textColString     = colorStringWithAlpha(textColor);
+    QString bgColString       = colorStringWithAlpha(backgroundColor);
+    QString bgFrameColString  = colorStringWithAlpha(backgroundFrameColor);
+
+    QString fullStyleSheet =
+        styleSheetTemplate.arg(classType).arg(objectName).arg(textColString).arg(bgColString).arg(bgFrameColString);
+    return fullStyleSheet;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString StyleSheetTools::colorStringWithAlpha(const QColor& color) 
+{
+    return QString("rgba(%1, %2, %3, %4)").arg(color.red()).arg(color.green()).arg(color.blue()).arg(color.alpha());
+}

Fwk/AppFwk/cafUserInterface/cafStyleSheetTools.h

@@ -0,0 +1,56 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2019- Ceetron Solutions AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
+//   for more details.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+#pragma once
+
+#include <QString>
+
+class QColor;
+
+namespace caf
+{
+class StyleSheetTools
+{
+public:
+    static QString createFrameStyleSheet(const QString& classType,
+                                         const QString& objectName,
+                                         const QColor&  textColor,
+                                         const QColor&  backgroundColor,
+                                         const QColor&  backgroundFrameColor);
+    static QString colorStringWithAlpha(const QColor& color);
+};
+
+}
+