Merge pull request FreeCAD#19649 from alfrix/taskpanel_improvements

refactor(Gui): improve the taskpanel

Author: chennes

src/Gui/CMakeLists.txt

@@ -449,7 +449,6 @@ set(Gui_RES_SRCS
     Icons/resource.qrc
     Language/translation.qrc
     ${FreeCAD_TR_QRC}
-    QSint/actionpanel/schemes.qrc
 )
 
 qt_add_resources(Gui_QRC_SRCS ${Gui_RES_SRCS})
@@ -862,20 +861,10 @@ SET(qsintActionPanel_SRCS
     QSint/actionpanel/actionpanel.h
     QSint/actionpanel/actionpanelscheme.cpp
     QSint/actionpanel/actionpanelscheme.h
-    QSint/actionpanel/androidpanelscheme.cpp
-    QSint/actionpanel/androidpanelscheme.h
-    QSint/actionpanel/macpanelscheme.cpp
-    QSint/actionpanel/macpanelscheme.h
     QSint/actionpanel/taskgroup_p.cpp
     QSint/actionpanel/taskgroup_p.h
     QSint/actionpanel/taskheader_p.cpp
     QSint/actionpanel/taskheader_p.h
-    QSint/actionpanel/winvistapanelscheme.cpp
-    QSint/actionpanel/winvistapanelscheme.h
-    QSint/actionpanel/winxppanelscheme.cpp
-    QSint/actionpanel/winxppanelscheme.h
-    QSint/actionpanel/freecadscheme.cpp
-    QSint/actionpanel/freecadscheme.h
 )
 SOURCE_GROUP("Widget\\QSintActionPanel" FILES ${qsintActionPanel_SRCS})
 set(qsint_MOC_HDRS

src/Gui/QSint/actionpanel/actionbox.cpp

@@ -9,94 +9,35 @@
 
 #include <QVariant>
 
-
 namespace QSint
 {
 
-
-const char* ActionBoxStyle =
-    "QSint--ActionBox {"
-        "background-color: white;"
-        "border: 1px solid white;"
-        "border-radius: 3px;"
-        "text-align: left;"
-    "}"
-
-    "QSint--ActionBox:hover {"
-        "background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F9FDFF, stop: 1 #EAF7FF);"
-        "border: 1px solid #DAF2FC;"
-    "}"
-
-
-    "QSint--ActionBox QSint--ActionLabel[class='header'] {"
-        "text-align: left;"
-        "font: 14px;"
-        "color: #006600;"
-        "background-color: transparent;"
-        "border: none;"
-    "}"
-
-    "QSint--ActionBox QSint--ActionLabel[class='header']:hover {"
-        "color: #00cc00;"
-        "text-decoration: underline;"
-    "}"
-
-
-    "QSint--ActionBox QSint--ActionLabel[class='action'] {"
-        "background-color: transparent;"
-        "border: none;"
-        "color: #0033ff;"
-        "text-align: left;"
-        "font: 11px;"
-    "}"
-
-    "QSint--ActionBox QSint--ActionLabel[class='action']:!enabled {"
-        "color: #999999;"
-    "}"
-
-    "QSint--ActionBox QSint--ActionLabel[class='action']:hover {"
-        "color: #0099ff;"
-        "text-decoration: underline;"
-    "}"
-
-    "QSint--ActionBox QSint--ActionLabel[class='action']:on {"
-        "background-color: #ddeeff;"
-        "color: #006600;"
-    "}"
-
-;
-
-
-ActionBox::ActionBox(QWidget *parent) :
-    QFrame(parent)
+ActionBox::ActionBox(QWidget *parent)
+    : QFrame(parent)
 {
     init();
 }
 
-ActionBox::ActionBox(const QString & headerText, QWidget *parent) :
-    QFrame(parent)
+ActionBox::ActionBox(const QString & headerText, QWidget *parent)
+    : QFrame(parent)
 {
-    init();
-    headerLabel->setText(headerText);
+    init(headerText);
 }
 
-ActionBox::ActionBox(const QPixmap & icon, const QString & headerText, QWidget *parent) :
-    QFrame(parent)
+ActionBox::ActionBox(const QPixmap & icon, const QString & headerText, QWidget *parent)
+    : QFrame(parent)
 {
-    init();
-    headerLabel->setText(headerText);
+    init(headerText);
     setIcon(icon);
 }
 
-void ActionBox::init()
+void ActionBox::init(const QString &headerText)
 {
-    setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Maximum);
-
-    setStyleSheet(QString(ActionBoxStyle));
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
 
-    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    auto *mainLayout = new QHBoxLayout(this);
 
-    QVBoxLayout *iconLayout = new QVBoxLayout();
+    auto *iconLayout = new QVBoxLayout();
     mainLayout->addLayout(iconLayout);
 
     iconLabel = new QLabel(this);
@@ -106,7 +47,7 @@ void ActionBox::init()
     dataLayout = new QVBoxLayout();
     mainLayout->addLayout(dataLayout);
 
-    headerLabel = createItem("");
+    headerLabel = createItem(headerText);
     headerLabel->setProperty("class", "header");
 }
 
@@ -118,22 +59,14 @@ void ActionBox::setIcon(const QPixmap & icon)
 
 QPixmap ActionBox::icon() const
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     return iconLabel->pixmap(Qt::ReturnByValue);
-#else
-    QPixmap p;
-    const QPixmap* ptr = iconLabel->pixmap();
-    if (ptr)
-        p = *ptr;
-    return p;
-#endif
 }
 
 ActionLabel* ActionBox::createItem(QAction * action, QLayout * l)
 {
-    if (!action)
+    if (!action) {
         return nullptr;
-
+    }
     ActionLabel *act = createItem("", l);
     act->setDefaultAction(action);
     return act;
@@ -143,15 +76,15 @@ QList<ActionLabel*> ActionBox::createItems(QList<QAction*> actions)
 {
     QList<ActionLabel*> list;
 
-    if (actions.isEmpty())
+    if (actions.isEmpty()) {
         return list;
-
+    }
     QLayout *l = createHBoxLayout();
 
-    Q_FOREACH (QAction *action, actions) {
-        ActionLabel *act = createItem(action, l);
-        if (act)
+    for (QAction *action : actions) {
+        if (auto *act = createItem(action, l)) {
             list.append(act);
+        }
     }
 
     return list;
@@ -162,10 +95,10 @@ ActionLabel* ActionBox::createItem(const QString & text, QLayout * l)
     ActionLabel *act = new ActionLabel(this);
     act->setText(text);
     act->setProperty("class", "action");
-    act->setStyleSheet("");
 
-    if (l)
+    if (l) {
         l->addWidget(act);
+    }
     else {
         QHBoxLayout *hbl = new QHBoxLayout();
         hbl->addWidget(act);
@@ -187,11 +120,14 @@ QSpacerItem* ActionBox::createSpacer(QLayout * l)
 {
     QSpacerItem * spacer;
 
-    if (l) // add horizontal spacer
+    if (l) {
+        // add horizontal spacer
         l->addItem(spacer = new QSpacerItem(1,0,QSizePolicy::MinimumExpanding,QSizePolicy::Ignored));
-    else // add vertical spacer
+    }
+    else {
+        // add vertical spacer
         dataLayout->addItem(spacer = new QSpacerItem(0,1,QSizePolicy::Ignored,QSizePolicy::MinimumExpanding));
-
+    }
     return spacer;
 }
 
@@ -215,13 +151,14 @@ void ActionBox::addLayout(QLayout * l)
 
 void ActionBox::addWidget(QWidget * w, QLayout * l)
 {
-    if (!w)
+    if (!w) {
         return;
-
+    }
     w->setParent(this);
 
-    if (l)
+    if (l) {
         l->addWidget(w);
+    }
     else {
         QHBoxLayout *hbl = new QHBoxLayout();
         hbl->addWidget(w);
@@ -235,5 +172,4 @@ QSize ActionBox::minimumSizeHint() const
     return {150,65};
 }
 
-
 } // namespace