From c65d0ad3156e086250c3bd15226dceb5deb4727f Mon Sep 17 00:00:00 2001 From: shi_jq Date: Mon, 17 Mar 2025 11:16:07 +0800 Subject: [PATCH] =?UTF-8?q?[ref]=E5=90=8C=E6=AD=A5711?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CBreadcrumbNavWidget.cpp | 2 +- .../CBreadcrumbNavWidget.h | 2 +- .../CBreadcrumbPluginWidget.cpp | 2 +- .../CBreadcrumbPluginWidget.h | 4 ++-- .../BreadcrumbNavWidget/CNavInfoManage.cpp | 2 +- .../BreadcrumbNavWidget/CNavInfoManage.h | 2 +- .../BreadcrumbNavWidget/CToolButton.cpp | 2 +- .../plugin/BreadcrumbNavWidget/CToolButton.h | 2 +- .../gui/plugin/BreadcrumbNavWidget/main.cpp | 2 +- .../BriefReportWidget/BriefReportCommon.h | 2 +- .../BriefReportPluginWidget.cpp | 2 +- .../BriefReportPluginWidget.h | 4 ++-- .../BriefReportWidget/BriefReportWidget.cpp | 2 +- .../BriefReportWidget/BriefReportWidget.h | 2 +- .../plugin/BriefReportWidget/CMyCalendar.cpp | 2 +- .../plugin/BriefReportWidget/CMyCalendar.h | 2 +- .../plugin/BriefReportWidget/CMyCheckBox.cpp | 2 +- .../plugin/BriefReportWidget/CMyCheckBox.h | 2 +- .../BriefReportWidget/CMyListWidget.cpp | 2 +- .../plugin/BriefReportWidget/CMyListWidget.h | 2 +- .../plugin/BriefReportWidget/QueryThread.cpp | 2 +- .../plugin/BriefReportWidget/QueryThread.h | 2 +- .../CButtonGroupPluginWidget.cpp | 2 +- .../CButtonGroupPluginWidget.h | 4 ++-- .../ButtonGroupWidget/CButtonGroupWidget.cpp | 22 ++++++++++++++++++- .../ButtonGroupWidget/CButtonGroupWidget.h | 4 ++-- .../plugin/ButtonGroupWidget/CJsonReader.cpp | 2 +- .../plugin/ButtonGroupWidget/CJsonReader.h | 2 +- 28 files changed, 52 insertions(+), 32 deletions(-) diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp index 9498d262..b3f3de7a 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.cpp @@ -1,4 +1,4 @@ -#include "CBreadcrumbNavWidget.h" +#include "CBreadcrumbNavWidget.h" #include "public/pub_utility_api/FileStyle.h" #include "public/pub_utility_api/FileUtil.h" #include "CNavInfoManage.h" diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.h b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.h index 5b4e1133..1b87f331 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.h +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbNavWidget.h @@ -1,4 +1,4 @@ -#ifndef CBREADCRUMBNAVWIDGET_H +#ifndef CBREADCRUMBNAVWIDGET_H #define CBREADCRUMBNAVWIDGET_H #include diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.cpp b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.cpp index 4eb9639e..73b05684 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.cpp +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CBreadcrumbPluginWidget.h" +#include "CBreadcrumbPluginWidget.h" #include "CBreadcrumbNavWidget.h" #include diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.h b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.h index 9759e9b8..a501d541 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.h +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CBreadcrumbPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CBREADCRUMBPLUGINWIDGET_H +#ifndef CBREADCRUMBPLUGINWIDGET_H #define CBREADCRUMBPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CBreadcrumbPluginWidget : public QObject, public CPluginWidgetInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0") + Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID) Q_INTERFACES(CPluginWidgetInterface) public: diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp b/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp index 5f3d75a8..8f91e2e5 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.cpp @@ -1,4 +1,4 @@ -#include "CNavInfoManage.h" +#include "CNavInfoManage.h" #include "public/pub_utility_api/FileUtil.h" #include "public/pub_logger_api/logger.h" #include diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.h b/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.h index 8718e052..38b9bae6 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.h +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CNavInfoManage.h @@ -1,4 +1,4 @@ -#ifndef CJSONREADER_H +#ifndef CJSONREADER_H #define CJSONREADER_H #include diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.cpp b/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.cpp index bde40e1c..01c02f04 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.cpp +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.cpp @@ -1,4 +1,4 @@ -#include "CToolButton.h" +#include "CToolButton.h" CToolButton::CToolButton(QWidget *parent) : QToolButton(parent) diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.h b/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.h index 92356988..b2d8ece6 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.h +++ b/product/src/gui/plugin/BreadcrumbNavWidget/CToolButton.h @@ -1,4 +1,4 @@ -#ifndef CTOOLBUTTON_H +#ifndef CTOOLBUTTON_H #define CTOOLBUTTON_H #include diff --git a/product/src/gui/plugin/BreadcrumbNavWidget/main.cpp b/product/src/gui/plugin/BreadcrumbNavWidget/main.cpp index 3df68299..a2ea7bdb 100644 --- a/product/src/gui/plugin/BreadcrumbNavWidget/main.cpp +++ b/product/src/gui/plugin/BreadcrumbNavWidget/main.cpp @@ -1,4 +1,4 @@ -#include "CBreadcrumbNavWidget.h" +#include "CBreadcrumbNavWidget.h" #include int main(int argc, char *argv[]) diff --git a/product/src/gui/plugin/BriefReportWidget/BriefReportCommon.h b/product/src/gui/plugin/BriefReportWidget/BriefReportCommon.h index 5da8d6fb..a49ee80f 100644 --- a/product/src/gui/plugin/BriefReportWidget/BriefReportCommon.h +++ b/product/src/gui/plugin/BriefReportWidget/BriefReportCommon.h @@ -1,4 +1,4 @@ -#ifndef BRIEFREPORTCOMMON_H +#ifndef BRIEFREPORTCOMMON_H #define BRIEFREPORTCOMMON_H typedef struct diff --git a/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.cpp b/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.cpp index 02822fbf..5ee1cc49 100644 --- a/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.cpp +++ b/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "BriefReportPluginWidget.h" +#include "BriefReportPluginWidget.h" #include "BriefReportWidget.h" BriefReportPluginWidget::BriefReportPluginWidget(QObject *parent): QObject(parent) diff --git a/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.h b/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.h index 7f9eba40..cec2ba24 100644 --- a/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.h +++ b/product/src/gui/plugin/BriefReportWidget/BriefReportPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef BRIEFREPORTPLUGINWIDGET_H +#ifndef BRIEFREPORTPLUGINWIDGET_H #define BRIEFREPORTPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class BriefReportPluginWidget : public QObject, public CPluginWidgetInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0") + Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID) Q_INTERFACES(CPluginWidgetInterface) public: BriefReportPluginWidget(QObject *parent = 0); diff --git a/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp b/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp index 950694f3..ab761f74 100644 --- a/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp +++ b/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.cpp @@ -1,4 +1,4 @@ -#include "BriefReportWidget.h" +#include "BriefReportWidget.h" #include "ui_BriefReportWidget.h" #include #include diff --git a/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.h b/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.h index a0147cd9..76a41664 100644 --- a/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.h +++ b/product/src/gui/plugin/BriefReportWidget/BriefReportWidget.h @@ -1,4 +1,4 @@ -#ifndef BRIEFREPORTWIDGET_H +#ifndef BRIEFREPORTWIDGET_H #define BRIEFREPORTWIDGET_H #include diff --git a/product/src/gui/plugin/BriefReportWidget/CMyCalendar.cpp b/product/src/gui/plugin/BriefReportWidget/CMyCalendar.cpp index 3981b7bb..2a49eedc 100644 --- a/product/src/gui/plugin/BriefReportWidget/CMyCalendar.cpp +++ b/product/src/gui/plugin/BriefReportWidget/CMyCalendar.cpp @@ -1,4 +1,4 @@ -#include "CMyCalendar.h" +#include "CMyCalendar.h" #include "ui_CMyCalendar.h" #include "pub_logger_api/logger.h" #include diff --git a/product/src/gui/plugin/BriefReportWidget/CMyCalendar.h b/product/src/gui/plugin/BriefReportWidget/CMyCalendar.h index 90389b06..91695db1 100644 --- a/product/src/gui/plugin/BriefReportWidget/CMyCalendar.h +++ b/product/src/gui/plugin/BriefReportWidget/CMyCalendar.h @@ -1,4 +1,4 @@ -#ifndef CMYCALENDAR_H +#ifndef CMYCALENDAR_H #define CMYCALENDAR_H #include diff --git a/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.cpp b/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.cpp index b2bc5d95..797e7f84 100644 --- a/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.cpp +++ b/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.cpp @@ -1,4 +1,4 @@ -#include "CMyCheckBox.h" +#include "CMyCheckBox.h" #include CMyCheckBox::CMyCheckBox(QString text, QWidget *parent) diff --git a/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.h b/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.h index bdba8dbc..1dad82e3 100644 --- a/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.h +++ b/product/src/gui/plugin/BriefReportWidget/CMyCheckBox.h @@ -1,4 +1,4 @@ -#ifndef MYCHECKBOX_H +#ifndef MYCHECKBOX_H #define MYCHECKBOX_H #include diff --git a/product/src/gui/plugin/BriefReportWidget/CMyListWidget.cpp b/product/src/gui/plugin/BriefReportWidget/CMyListWidget.cpp index ded92615..fa73a493 100644 --- a/product/src/gui/plugin/BriefReportWidget/CMyListWidget.cpp +++ b/product/src/gui/plugin/BriefReportWidget/CMyListWidget.cpp @@ -1,4 +1,4 @@ -#include "CMyListWidget.h" +#include "CMyListWidget.h" CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent) { diff --git a/product/src/gui/plugin/BriefReportWidget/CMyListWidget.h b/product/src/gui/plugin/BriefReportWidget/CMyListWidget.h index 3e92461e..728f308d 100644 --- a/product/src/gui/plugin/BriefReportWidget/CMyListWidget.h +++ b/product/src/gui/plugin/BriefReportWidget/CMyListWidget.h @@ -1,4 +1,4 @@ -#ifndef CMYLISTWIDGET_H +#ifndef CMYLISTWIDGET_H #define CMYLISTWIDGET_H #include diff --git a/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp b/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp index c850b045..ddd5ff0c 100644 --- a/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp +++ b/product/src/gui/plugin/BriefReportWidget/QueryThread.cpp @@ -1,4 +1,4 @@ -#include "QueryThread.h" +#include "QueryThread.h" #include "pub_logger_api/logger.h" QueryThread::QueryThread(): location_id(0) diff --git a/product/src/gui/plugin/BriefReportWidget/QueryThread.h b/product/src/gui/plugin/BriefReportWidget/QueryThread.h index e23a4406..183b4db0 100644 --- a/product/src/gui/plugin/BriefReportWidget/QueryThread.h +++ b/product/src/gui/plugin/BriefReportWidget/QueryThread.h @@ -1,4 +1,4 @@ -#ifndef QUERYTHREAD_H +#ifndef QUERYTHREAD_H #define QUERYTHREAD_H #include diff --git a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.cpp b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.cpp index c9543b18..a285712f 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.cpp +++ b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CButtonGroupPluginWidget.h" +#include "CButtonGroupPluginWidget.h" #include "CButtonGroupWidget.h" CButtonGroupPluginWidget::CButtonGroupPluginWidget(QObject *parent) diff --git a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.h b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.h index 2d5b75ac..8779050a 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.h +++ b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CBUTTONGROUPPLUGINWIDGET_H +#ifndef CBUTTONGROUPPLUGINWIDGET_H #define CBUTTONGROUPPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CButtonGroupPluginWidget : public QObject, public CPluginWidgetInterface { Q_OBJECT - Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0") + Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID) Q_INTERFACES(CPluginWidgetInterface) public: diff --git a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp index d3c04546..f072814d 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp +++ b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.cpp @@ -1,4 +1,4 @@ -#include "CButtonGroupWidget.h" +#include "CButtonGroupWidget.h" #include "CJsonReader.h" #include "public/pub_utility_api/FileUtil.h" #include @@ -7,6 +7,7 @@ #include #include #include +#include "pub_utility_api/FileStyle.h" CButtonGroupWidget::CButtonGroupWidget(QWidget *parent, bool editMode) : QWidget(parent), @@ -14,6 +15,7 @@ CButtonGroupWidget::CButtonGroupWidget(QWidget *parent, bool editMode) m_isEdit(editMode) { initView(); + initQss(); } CButtonGroupWidget::~CButtonGroupWidget() @@ -153,3 +155,21 @@ void CButtonGroupWidget::initView() layout->setMargin(0); setLayout(layout); } + +void CButtonGroupWidget::initQss() +{ + QString qss = QString(); + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("cButtonGroupWidget.qss") ; + QFile qssfile2(QString::fromStdString(strFullPath)); + qssfile2.open(QFile::ReadOnly); + if (qssfile2.isOpen()) + { + qss += QLatin1String(qssfile2.readAll()); + //setStyleSheet(qss); + qssfile2.close(); + } + if(!qss.isEmpty()) + { + setStyleSheet(qss); + } +} diff --git a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.h b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.h index 94eaadef..79be8b07 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.h +++ b/product/src/gui/plugin/ButtonGroupWidget/CButtonGroupWidget.h @@ -1,4 +1,4 @@ -#ifndef CBUTTONGROUPWIDGET_H +#ifndef CBUTTONGROUPWIDGET_H #define CBUTTONGROUPWIDGET_H #include @@ -52,7 +52,7 @@ private slots: private: void initView(); - + void initQss(); private: CJsonReader *m_pJsonReader; bool m_isEdit; diff --git a/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp b/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp index 6782bda5..2ed709b9 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp +++ b/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.cpp @@ -1,4 +1,4 @@ -#include "CJsonReader.h" +#include "CJsonReader.h" #include "public/pub_utility_api/FileUtil.h" #include "public/pub_logger_api/logger.h" #include diff --git a/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.h b/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.h index 67f739c6..ebdbe93b 100644 --- a/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.h +++ b/product/src/gui/plugin/ButtonGroupWidget/CJsonReader.h @@ -1,4 +1,4 @@ -#ifndef CJSONREADER_H +#ifndef CJSONREADER_H #define CJSONREADER_H #include