V1.6

1、修改了TipWidget和warning的组件及其存放位置

Libraries/Libraries.cmake

@@ -56,6 +56,9 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/FreeType)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/QXlsx)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/OpenGLWidget)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/VideoPlayer)
+#添加纯源码的库
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/SelectTime)
+
 
 #搜索所有的库
 # find_package(fmt REQUIRED)
@@ -78,6 +81,8 @@ find_package(QXlsx REQUIRED)
 find_package(OpenGLWidget REQUIRED)
 find_package(VideoPlayer REQUIRED)
 
+find_package(SelectTime REQUIRED)
+
 #有些库缺少某些平台、编译器的库，所以这里也根据平台、编译器进行搜索
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     find_package(FreeType REQUIRED)

Libraries/SelectTime/FindSelectTime.cmake

@@ -0,0 +1,54 @@
+
+#查找LHHttpAPI库
+message(STATUS "===== FindSelectTime.cmake =====")
+
+
+#查找头文件
+unset(INCLUDE_DIR CACHE)
+find_path(INCLUDE_DIR 
+    NAMES timewidget.h
+    PATHS ${CMAKE_CURRENT_LIST_DIR}
+    NO_DEFAULT_PATH
+)
+unset(SelectTime_INCLUDE_DIRS CACHE)
+list(APPEND SelectTime_INCLUDE_DIRS ${INCLUDE_DIR})
+
+
+#添加源文件
+unset(SelectTime_SOURCE_DIRS CACHE)
+list(APPEND SelectTime_SOURCE_DIRS 
+    ${INCLUDE_DIR}/timewidget.cpp
+    ${INCLUDE_DIR}/timepopupwidget.cpp
+    ${INCLUDE_DIR}/timepartwidget.cpp
+    ${INCLUDE_DIR}/shadowwidget.cpp
+    ${INCLUDE_DIR}/mytimedelegate.cpp
+    ${INCLUDE_DIR}/SelectTime.qrc
+)
+
+
+#定义变量
+if(SelectTime_INCLUDE_DIRS AND SelectTime_SOURCE_DIRS)
+    set(SelectTime_FOUND TRUE)
+    set(SelectTime_VERSION 1.0.0)
+
+    # message(STATUS "SelectTime found: SelectTime")
+    message(STATUS "SelectTime include: SelectTime_INCLUDE_DIRS")
+    message(STATUS "SelectTime source: SelectTime_SOURCE_DIRS")
+    # message(STATUS "LHHTTPAPI library: LHHTTPAPI_LIBRARY")
+else()
+    set(SelectTime_FOUND FALSE)
+endif()
+
+
+message(STATUS "SelectTime Found : ${SelectTime_FOUND}")
+message(STATUS "SelectTime Version : ${SelectTime_VERSION}")
+message(STATUS "--------------------------------------------------")
+
+
+# 标记这些变量为高级变量
+mark_as_advanced(
+    SelectTime_INCLUDE_DIRS 
+    SelectTime_SOURCE_DIRS 
+)
+
+

UI/TipWidget/tip.qrc

@@ -0,0 +1,9 @@
+<!DOCTYPE RCC>
+<RCC>
+  <qresource prefix="/">
+    <file>Tip/Complete2x.png</file>
+    <file>Tip/Failed2x.png</file>
+    <file>Tip/Tips2x.png</file>
+    <file>Tip/Wait2x.png</file>
+  </qresource>
+</RCC>

common/warning/warning_light.qss → UI/warning/qss/warning_light.qss

@@ -44,7 +44,7 @@ QLabel#label_line
 /* 设置图标 */
 QLabel#label_warnIcon
 {
-    border-image: url(:/ICON/Tip/Tips2x.png);
+    border-image: url(:/Tip/Tips2x.png);
 }
 
 QLabel#label_Warn
@@ -60,7 +60,7 @@ QPushButton#pBtn_close{
 	/* border-image: url(:/ICON/ICON/Dialog_close.png); */
     background: transparent;
     border-radius: 4px;
-    qproperty-icon: url(:/ICON/ICON/Close_Light.png);
+    qproperty-icon: url(:/ICON/Dialog_close.png);
     qproperty-iconSize: 20px 20px;
     padding-left: 0px;
     border: 0px solid #E6E9F4;
@@ -71,7 +71,7 @@ QPushButton#pBtn_close[Hover = true]
 	/* border-image: url(:/ICON/ICON/Dialog_close2.png); */
     background: transparent;
     border-radius: 4px;
-    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-icon: url(:/ICON/Dialog_close2.png);
     qproperty-iconSize: 20px 20px;
     padding-left: 0px;
     border: 1px solid #438EFF;

common/warning/warning.cpp → UI/warning/warning.cpp

@@ -9,8 +9,8 @@
 #include <QMouseEvent>
 
 #include "OneShadowEffect.h"
-// #include "lhstylemanager.h"
 #include "LHQLogAPI.h"
+#include "UIStyleManager.h"
 
 
 Warning::Warning(QWidget *parent) :
@@ -22,15 +22,6 @@ Warning::Warning(QWidget *parent) :
     this->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint);
     this->setAttribute(Qt::WA_TranslucentBackground);
 
-    /* 加载QSS */
-    // QFile file(":/QSS/QSS/warning_light.qss");
-    // if(file.open(QFile::ReadOnly))
-    // {
-    //     QString styleSheet = file.readAll();
-    //     this->setStyleSheet(styleSheet);
-    //     file.close();
-    // }
-
     /* 设置文字自动换行 */
     ui->label_Warn->setWordWrap(true);
     /* 设置文本居中 */
@@ -50,6 +41,23 @@ Warning::Warning(QWidget *parent) :
     connect(ui->pBtn_ok,SIGNAL(clicked()),this,SLOT(do_ok()));
     /* 注册事件过滤器 */
     ui->pBtn_close->installEventFilter(this);
+
+    /* 加载QSS */
+    QString qssPath;
+    if(UIStyle.getUIStyle() == EUIStyle::UI_Light)
+    {
+        qssPath = ":/qss/warning_light.qss";
+    } else
+    {
+        qssPath = ":/qss/warning_dark.qss";
+    }
+    QFile file(qssPath);
+    if(file.open(QFile::ReadOnly))
+    {
+        QString styleSheet = file.readAll();
+        this->setStyleSheet(styleSheet);
+        file.close();
+    }
 }
 
 Warning::~Warning()
@@ -57,6 +65,13 @@ Warning::~Warning()
     delete ui;
 }
 
+
+void Warning::setTitle(const QString& title)
+{
+    ui->label_title->setText(title);
+}
+
+
 void Warning::setText(const QString &text)
 {
     /* 根据文本大小设置高度 */

common/warning/warning.h → UI/warning/warning.h

@@ -17,6 +17,7 @@ public:
     explicit Warning(QWidget *parent = nullptr);
     ~Warning();
 
+    void setTitle(const QString& title);
     void setText(const QString& text);
     void setTextWithOneButton(const QString& text);     /* 只有一个确定按钮 */
     bool isOk() const { return m_isOk; }

UI/warning/warning.qrc

@@ -0,0 +1,15 @@
+<!DOCTYPE RCC>
+<RCC>
+  <qresource prefix="/">
+    <file>Tip/Complete2x.png</file>
+    <file>Tip/Failed2x.png</file>
+    <file>Tip/Tips2x.png</file>
+    <file>Tip/Wait2x.png</file>
+    <file>ICON/Dialog_close.png</file>
+    <file>ICON/Dialog_close2.png</file>
+  </qresource>
+  <qresource prefix="/">
+    <file>qss/warning_light.qss</file>
+    <file>qss/warning_dark.qss</file>
+  </qresource>
+</RCC>

common/TipWidget/tip.qrc

@@ -1,8 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>Tip/Complete2x.png</file>
-        <file>Tip/Failed2x.png</file>
-        <file>Tip/Tips2x.png</file>
-        <file>Tip/Wait2x.png</file>
-    </qresource>
-</RCC>