更新代码

2022-06-23 11:00:06 +08:00
parent 7cfbb51e3e
commit f625f1d55b
30 changed files with 35 additions and 12 deletions
--- a/ui/core_common/appdata.cpp
+++ b/ui/core_common/appdata.cpp
--- a/ui/core_common/appdata.h
+++ b/ui/core_common/appdata.h
--- a/ui/core_common/appinit.cpp
+++ b/ui/core_common/appinit.cpp
--- a/ui/core_common/appinit.h
+++ b/ui/core_common/appinit.h
--- a/ui/core_common/base64helper.cpp
+++ b/ui/core_common/base64helper.cpp
--- a/ui/core_common/base64helper.h
+++ b/ui/core_common/base64helper.h
--- a/ui/core_common/core_common.pri
+++ b/ui/core_common/core_common.pri
--- a/ui/core_common/h3.pri
+++ b/ui/core_common/h3.pri
--- a/ui/core_common/iconhelper.cpp
+++ b/ui/core_common/iconhelper.cpp
--- a/ui/core_common/iconhelper.h
+++ b/ui/core_common/iconhelper.h
--- a/ui/core_common/qrc/font.qrc
+++ b/ui/core_common/qrc/font.qrc
--- a/ui/core_common/qrc/font/fontawesome-webfont.ttf
+++ b/ui/core_common/qrc/font/fontawesome-webfont.ttf
--- a/ui/core_common/qrc/font/iconfont.ttf
+++ b/ui/core_common/qrc/font/iconfont.ttf
--- a/ui/core_common/qrc/font/pe-icon-set-weather.ttf
+++ b/ui/core_common/qrc/font/pe-icon-set-weather.ttf
--- a/ui/core_common/qrc/image.qrc
+++ b/ui/core_common/qrc/image.qrc
--- a/ui/core_common/qrc/image/bg_novideo.png
+++ b/ui/core_common/qrc/image/bg_novideo.png
--- a/ui/core_common/qrc/qm.qrc
+++ b/ui/core_common/qrc/qm.qrc
--- a/ui/core_common/qrc/qm/qt_zh_CN.qm
+++ b/ui/core_common/qrc/qm/qt_zh_CN.qm
--- a/ui/core_common/qrc/qm/widgets.qm
+++ b/ui/core_common/qrc/qm/widgets.qm
--- a/ui/core_common/quihelper.cpp
+++ b/ui/core_common/quihelper.cpp
--- a/ui/core_common/quihelper.h
+++ b/ui/core_common/quihelper.h
--- a/ui/core_qss/qss/blacksoft.css
+++ b/ui/core_qss/qss/blacksoft.css
@@ -102,7 +102,7 @@ border-radius:3px;
 .QGroupBox{
 border:1px solid #242424;
 border-radius:5px;
-margin-top:3ex;
+margin-top:9px;
 }

 .QGroupBox::title{
@@ -680,6 +680,10 @@ border-color:#484848;
 color:#242424;
 }

+QLabel:disabled{
+background:none;
+}
+
 /*TextColor:#DCDCDC*/
 /*PanelColor:#444444*/
 /*BorderColor:#242424*/
--- a/ui/styledemo/frmmain.cpp
+++ b/ui/styledemo/frmmain.cpp
@@ -43,6 +43,10 @@ void frmMain::initForm()

 void frmMain::loadStyle(const QString &qssFile)
 {
+    //开启计时
+    QElapsedTimer time;
+    time.start();
+
    //加载样式表
    QString qss;
    QFile file(qssFile);
@@ -61,8 +65,11 @@ void frmMain::loadStyle(const QString &qssFile)
        qss = list.join("\n");
        QString paletteColor = qss.mid(20, 7);
        qApp->setPalette(QPalette(paletteColor));
+        //用时主要在下面这句
        qApp->setStyleSheet(qss);
    }
+
+    qDebug() << "用时:" << time.elapsed();
 }

 void frmMain::on_btnStyle1_clicked()
--- a/ui/styledemo/qrc/qss/blacksoft.css
+++ b/ui/styledemo/qrc/qss/blacksoft.css
@@ -102,7 +102,7 @@ border-radius:3px;
 .QGroupBox{
 border:1px solid #242424;
 border-radius:5px;
-margin-top:3ex;
+margin-top:9px;
 }

 .QGroupBox::title{
@@ -680,6 +680,10 @@ border-color:#484848;
 color:#242424;
 }

+QLabel:disabled{
+background:none;
+}
+
 /*TextColor:#DCDCDC*/
 /*PanelColor:#444444*/
 /*BorderColor:#242424*/
--- a/ui/styledemo/qrc/qss/flatgray.css
+++ b/ui/styledemo/qrc/qss/flatgray.css
@@ -102,7 +102,7 @@ border-radius:3px;
 .QGroupBox{
 border:1px solid #B6B6B6;
 border-radius:5px;
-margin-top:3ex;
+margin-top:9px;
 }

 .QGroupBox::title{
@@ -680,6 +680,10 @@ border-color:#E4E4E4;
 color:#B6B6B6;
 }

+QLabel:disabled{
+background:none;
+}
+
 /*TextColor:#57595B*/
 /*PanelColor:#FFFFFF*/
 /*BorderColor:#B6B6B6*/
--- a/ui/styledemo/qrc/qss/lightblue.css
+++ b/ui/styledemo/qrc/qss/lightblue.css
@@ -102,7 +102,7 @@ border-radius:3px;
 .QGroupBox{
 border:1px solid #C0DCF2;
 border-radius:5px;
-margin-top:3ex;
+margin-top:9px;
 }

 .QGroupBox::title{
@@ -680,6 +680,10 @@ border-color:#DEF0FE;
 color:#C0DCF2;
 }

+QLabel:disabled{
+background:none;
+}
+
 /*TextColor:#386487*/
 /*PanelColor:#EAF7FF*/
 /*BorderColor:#C0DCF2*/
--- a/ui/uidemo01/uidemo01.pro
+++ b/ui/uidemo01/uidemo01.pro
@@ -14,5 +14,5 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += $$PWD/form
 include ($$PWD/form/form.pri)

-INCLUDEPATH += $$PWD/../core_common
-include ($$PWD/../core_common/core_common.pri)
+INCLUDEPATH += $$PWD/../core_base
+include ($$PWD/../core_base/core_base.pri)
--- a/ui/uidemo08/uidemo08.pro
+++ b/ui/uidemo08/uidemo08.pro
@@ -14,5 +14,5 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += $$PWD/form
 include ($$PWD/form/form.pri)

-INCLUDEPATH += $$PWD/../core_common
-include ($$PWD/../core_common/core_common.pri)
+INCLUDEPATH += $$PWD/../core_base
+include ($$PWD/../core_base/core_base.pri)
--- a/ui/uidemo09/uidemo09.pro
+++ b/ui/uidemo09/uidemo09.pro
@@ -14,5 +14,5 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += $$PWD/form
 include ($$PWD/form/form.pri)

-INCLUDEPATH += $$PWD/../core_common
-include ($$PWD/../core_common/core_common.pri)
+INCLUDEPATH += $$PWD/../core_base
+include ($$PWD/../core_base/core_base.pri)
--- a/ui/uidemo10/uidemo10.pro
+++ b/ui/uidemo10/uidemo10.pro
@@ -12,5 +12,5 @@ INCLUDEPATH += $$PWD
 INCLUDEPATH += $$PWD/form
 include ($$PWD/form/form.pri)

-INCLUDEPATH += $$PWD/../core_common
-include ($$PWD/../core_common/core_common.pri)
+INCLUDEPATH += $$PWD/../core_base
+include ($$PWD/../core_base/core_base.pri)