diff --git a/auxiliary/auxiliary.pri b/auxiliary/auxiliary.pri index ea374848e8cd04aa528cfff6454749b2cbdc647a..8b6be36e1fdc0e43792fdd9c57cf12e56392fa03 100644 --- a/auxiliary/auxiliary.pri +++ b/auxiliary/auxiliary.pri @@ -2,7 +2,8 @@ HEADERS += \ $$PWD/AppStyleSheetHandler.h \ $$PWD/ScreenInfo.h \ $$PWD/UiScaling.h \ - $$PWD/Utils.h + $$PWD/Utils.h \ + $$PWD/defines.h SOURCES += \ $$PWD/AppStyleSheetHandler.cpp \ diff --git a/auxiliary/defines.h b/auxiliary/defines.h new file mode 100644 index 0000000000000000000000000000000000000000..9d83145ca3da9fda29321b0774cb121b26dcea6a --- /dev/null +++ b/auxiliary/defines.h @@ -0,0 +1,13 @@ +#ifndef DEFINES_H +#define DEFINES_H + +#include <QString> + +namespace Properties { + static const QString TEXT = "text"; + static const QString STATE = "state"; + +} + + +#endif // DEFINES_H diff --git a/controls/AdaptiveWidget.h b/controls/AdaptiveWidget.h index 0d6476722e702f05d1f03ff9a558342ee0017d2c..72165c0bec7eb71f2f984ccc82a4c4197bba439a 100644 --- a/controls/AdaptiveWidget.h +++ b/controls/AdaptiveWidget.h @@ -1,9 +1,10 @@ #ifndef ADAPTIVEWIDGET_H #define ADAPTIVEWIDGET_H -#include "QStackedWidget" +#include <QStackedWidget> #include <ScreenInfo.h> #include <QState> +#include <QStyle> class AdaptiveWidget : public QStackedWidget { @@ -44,6 +45,14 @@ protected: } } + void updateChildStyle(const QString& a_objName) + { + for (auto widget : getTheSameWidgets<QWidget>(a_objName)) { + widget->style()->unpolish(widget); + widget->style()->polish(widget); + } + } + template <class T /*= QWidget*/> inline QList<T*> getTheSameWidgets(const QString& a_objName) {