From f625f1d55bc764a98cb1d939ad1907f8bda5bf55 Mon Sep 17 00:00:00 2001 From: feiyangqingyun Date: Thu, 23 Jun 2022 11:00:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/{core_common => core_base}/appdata.cpp | 0 ui/{core_common => core_base}/appdata.h | 0 ui/{core_common => core_base}/appinit.cpp | 0 ui/{core_common => core_base}/appinit.h | 0 ui/{core_common => core_base}/base64helper.cpp | 0 ui/{core_common => core_base}/base64helper.h | 0 .../core_common.pri => core_base/core_base.pri} | 0 ui/{core_common => core_base}/h3.pri | 0 ui/{core_common => core_base}/iconhelper.cpp | 0 ui/{core_common => core_base}/iconhelper.h | 0 ui/{core_common => core_base}/qrc/font.qrc | 0 .../qrc/font/fontawesome-webfont.ttf | Bin ui/{core_common => core_base}/qrc/font/iconfont.ttf | Bin .../qrc/font/pe-icon-set-weather.ttf | Bin ui/{core_common => core_base}/qrc/image.qrc | 0 .../qrc/image/bg_novideo.png | Bin ui/{core_common => core_base}/qrc/qm.qrc | 0 ui/{core_common => core_base}/qrc/qm/qt_zh_CN.qm | Bin ui/{core_common => core_base}/qrc/qm/widgets.qm | Bin ui/{core_common => core_base}/quihelper.cpp | 0 ui/{core_common => core_base}/quihelper.h | 0 ui/core_qss/qss/blacksoft.css | 6 +++++- ui/styledemo/frmmain.cpp | 7 +++++++ ui/styledemo/qrc/qss/blacksoft.css | 6 +++++- ui/styledemo/qrc/qss/flatgray.css | 6 +++++- ui/styledemo/qrc/qss/lightblue.css | 6 +++++- ui/uidemo01/uidemo01.pro | 4 ++-- ui/uidemo08/uidemo08.pro | 4 ++-- ui/uidemo09/uidemo09.pro | 4 ++-- ui/uidemo10/uidemo10.pro | 4 ++-- 30 files changed, 35 insertions(+), 12 deletions(-) rename ui/{core_common => core_base}/appdata.cpp (100%) rename ui/{core_common => core_base}/appdata.h (100%) rename ui/{core_common => core_base}/appinit.cpp (100%) rename ui/{core_common => core_base}/appinit.h (100%) rename ui/{core_common => core_base}/base64helper.cpp (100%) rename ui/{core_common => core_base}/base64helper.h (100%) rename ui/{core_common/core_common.pri => core_base/core_base.pri} (100%) rename ui/{core_common => core_base}/h3.pri (100%) rename ui/{core_common => core_base}/iconhelper.cpp (100%) rename ui/{core_common => core_base}/iconhelper.h (100%) rename ui/{core_common => core_base}/qrc/font.qrc (100%) rename ui/{core_common => core_base}/qrc/font/fontawesome-webfont.ttf (100%) rename ui/{core_common => core_base}/qrc/font/iconfont.ttf (100%) rename ui/{core_common => core_base}/qrc/font/pe-icon-set-weather.ttf (100%) rename ui/{core_common => core_base}/qrc/image.qrc (100%) rename ui/{core_common => core_base}/qrc/image/bg_novideo.png (100%) rename ui/{core_common => core_base}/qrc/qm.qrc (100%) rename ui/{core_common => core_base}/qrc/qm/qt_zh_CN.qm (100%) rename ui/{core_common => core_base}/qrc/qm/widgets.qm (100%) rename ui/{core_common => core_base}/quihelper.cpp (100%) rename ui/{core_common => core_base}/quihelper.h (100%) diff --git a/ui/core_common/appdata.cpp b/ui/core_base/appdata.cpp similarity index 100% rename from ui/core_common/appdata.cpp rename to ui/core_base/appdata.cpp diff --git a/ui/core_common/appdata.h b/ui/core_base/appdata.h similarity index 100% rename from ui/core_common/appdata.h rename to ui/core_base/appdata.h diff --git a/ui/core_common/appinit.cpp b/ui/core_base/appinit.cpp similarity index 100% rename from ui/core_common/appinit.cpp rename to ui/core_base/appinit.cpp diff --git a/ui/core_common/appinit.h b/ui/core_base/appinit.h similarity index 100% rename from ui/core_common/appinit.h rename to ui/core_base/appinit.h diff --git a/ui/core_common/base64helper.cpp b/ui/core_base/base64helper.cpp similarity index 100% rename from ui/core_common/base64helper.cpp rename to ui/core_base/base64helper.cpp diff --git a/ui/core_common/base64helper.h b/ui/core_base/base64helper.h similarity index 100% rename from ui/core_common/base64helper.h rename to ui/core_base/base64helper.h diff --git a/ui/core_common/core_common.pri b/ui/core_base/core_base.pri similarity index 100% rename from ui/core_common/core_common.pri rename to ui/core_base/core_base.pri diff --git a/ui/core_common/h3.pri b/ui/core_base/h3.pri similarity index 100% rename from ui/core_common/h3.pri rename to ui/core_base/h3.pri diff --git a/ui/core_common/iconhelper.cpp b/ui/core_base/iconhelper.cpp similarity index 100% rename from ui/core_common/iconhelper.cpp rename to ui/core_base/iconhelper.cpp diff --git a/ui/core_common/iconhelper.h b/ui/core_base/iconhelper.h similarity index 100% rename from ui/core_common/iconhelper.h rename to ui/core_base/iconhelper.h diff --git a/ui/core_common/qrc/font.qrc b/ui/core_base/qrc/font.qrc similarity index 100% rename from ui/core_common/qrc/font.qrc rename to ui/core_base/qrc/font.qrc diff --git a/ui/core_common/qrc/font/fontawesome-webfont.ttf b/ui/core_base/qrc/font/fontawesome-webfont.ttf similarity index 100% rename from ui/core_common/qrc/font/fontawesome-webfont.ttf rename to ui/core_base/qrc/font/fontawesome-webfont.ttf diff --git a/ui/core_common/qrc/font/iconfont.ttf b/ui/core_base/qrc/font/iconfont.ttf similarity index 100% rename from ui/core_common/qrc/font/iconfont.ttf rename to ui/core_base/qrc/font/iconfont.ttf diff --git a/ui/core_common/qrc/font/pe-icon-set-weather.ttf b/ui/core_base/qrc/font/pe-icon-set-weather.ttf similarity index 100% rename from ui/core_common/qrc/font/pe-icon-set-weather.ttf rename to ui/core_base/qrc/font/pe-icon-set-weather.ttf diff --git a/ui/core_common/qrc/image.qrc b/ui/core_base/qrc/image.qrc similarity index 100% rename from ui/core_common/qrc/image.qrc rename to ui/core_base/qrc/image.qrc diff --git a/ui/core_common/qrc/image/bg_novideo.png b/ui/core_base/qrc/image/bg_novideo.png similarity index 100% rename from ui/core_common/qrc/image/bg_novideo.png rename to ui/core_base/qrc/image/bg_novideo.png diff --git a/ui/core_common/qrc/qm.qrc b/ui/core_base/qrc/qm.qrc similarity index 100% rename from ui/core_common/qrc/qm.qrc rename to ui/core_base/qrc/qm.qrc diff --git a/ui/core_common/qrc/qm/qt_zh_CN.qm b/ui/core_base/qrc/qm/qt_zh_CN.qm similarity index 100% rename from ui/core_common/qrc/qm/qt_zh_CN.qm rename to ui/core_base/qrc/qm/qt_zh_CN.qm diff --git a/ui/core_common/qrc/qm/widgets.qm b/ui/core_base/qrc/qm/widgets.qm similarity index 100% rename from ui/core_common/qrc/qm/widgets.qm rename to ui/core_base/qrc/qm/widgets.qm diff --git a/ui/core_common/quihelper.cpp b/ui/core_base/quihelper.cpp similarity index 100% rename from ui/core_common/quihelper.cpp rename to ui/core_base/quihelper.cpp diff --git a/ui/core_common/quihelper.h b/ui/core_base/quihelper.h similarity index 100% rename from ui/core_common/quihelper.h rename to ui/core_base/quihelper.h diff --git a/ui/core_qss/qss/blacksoft.css b/ui/core_qss/qss/blacksoft.css index 5bc640a..6780634 100644 --- 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*/ diff --git a/ui/styledemo/frmmain.cpp b/ui/styledemo/frmmain.cpp index 493307f..5236a24 100644 --- 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() diff --git a/ui/styledemo/qrc/qss/blacksoft.css b/ui/styledemo/qrc/qss/blacksoft.css index 5bc640a..6780634 100644 --- 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*/ diff --git a/ui/styledemo/qrc/qss/flatgray.css b/ui/styledemo/qrc/qss/flatgray.css index dbe4b0d..fe82b5b 100644 --- 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*/ diff --git a/ui/styledemo/qrc/qss/lightblue.css b/ui/styledemo/qrc/qss/lightblue.css index 8397685..4928ebd 100644 --- 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*/ diff --git a/ui/uidemo01/uidemo01.pro b/ui/uidemo01/uidemo01.pro index 032f02a..51296cc 100644 --- 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) diff --git a/ui/uidemo08/uidemo08.pro b/ui/uidemo08/uidemo08.pro index 7b360cb..ac0a6fe 100644 --- 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) diff --git a/ui/uidemo09/uidemo09.pro b/ui/uidemo09/uidemo09.pro index 7e68742..30d36c0 100644 --- 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) diff --git a/ui/uidemo10/uidemo10.pro b/ui/uidemo10/uidemo10.pro index 5b47610..973aeb4 100644 --- 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)