Explorar o código

V0.7
1、完成了暗色UI,所有的内容都完成了

Apple hai 4 meses
pai
achega
f7560bf9c3
Modificáronse 43 ficheiros con 706 adicións e 1899 borrados
  1. 1 1
      External
  2. 1 1
      SwitchOnOff.sql
  3. 25 21
      TransmitterSwitch/AddItem/addnormalitem.cpp
  4. 1 1
      TransmitterSwitch/AddItem/addnormalitem.h
  5. 24 19
      TransmitterSwitch/AddItem/addspecialitem.cpp
  6. 1 1
      TransmitterSwitch/AddItem/addspecialitem.h
  7. 17 0
      TransmitterSwitch/ItemData/oneitem.cpp
  8. 0 282
      TransmitterSwitch/Resource/QSS/AddNormalItem_Light.qss
  9. 0 301
      TransmitterSwitch/Resource/QSS/AddSpecialItem_Light.qss
  10. 0 185
      TransmitterSwitch/Resource/QSS/OneItem_dark.qss
  11. 0 242
      TransmitterSwitch/Resource/QSS/TransmitterSwitch_dark.qss
  12. 14 11
      TransmitterSwitch/Resource/QSS/black/addnormalitem.qss
  13. 16 4
      TransmitterSwitch/Resource/QSS/black/addspecialitem.qss
  14. 64 36
      TransmitterSwitch/Resource/QSS/black/importtemplate.qss
  15. 2 2
      TransmitterSwitch/Resource/QSS/black/oneitem.qss
  16. 50 30
      TransmitterSwitch/Resource/QSS/black/savetotemplate.qss
  17. 52 21
      TransmitterSwitch/Resource/QSS/black/warning.qss
  18. 0 126
      TransmitterSwitch/Resource/QSS/importtemplate_light.qss
  19. 0 109
      TransmitterSwitch/Resource/QSS/savetotemplate_light.qss
  20. 0 83
      TransmitterSwitch/Resource/QSS/warning_light.qss
  21. 17 4
      TransmitterSwitch/Resource/QSS/white/addnormalitem.qss
  22. 17 4
      TransmitterSwitch/Resource/QSS/white/addspecialitem.qss
  23. 34 5
      TransmitterSwitch/Resource/QSS/white/importtemplate.qss
  24. 2 5
      TransmitterSwitch/Resource/QSS/white/oneitem.qss
  25. 28 9
      TransmitterSwitch/Resource/QSS/white/savetotemplate.qss
  26. 33 5
      TransmitterSwitch/Resource/QSS/white/warning.qss
  27. 49 18
      TransmitterSwitch/Template/importtemplate.cpp
  28. 5 2
      TransmitterSwitch/Template/importtemplate.h
  29. 36 39
      TransmitterSwitch/Template/importtemplate.ui
  30. 30 13
      TransmitterSwitch/Template/savetotemplate.cpp
  31. 3 1
      TransmitterSwitch/Template/savetotemplate.h
  32. 36 39
      TransmitterSwitch/Template/savetotemplate.ui
  33. 25 1
      TransmitterSwitch/TransmitterSwitchInfo.cpp
  34. 32 0
      TransmitterSwitch/TransmitterSwitchInfo.h
  35. 1 1
      TransmitterSwitch/WidgetItems/widgetitems.cpp
  36. 2 1
      TransmitterSwitch/common/combobox/customcombobox.h
  37. 0 205
      TransmitterSwitch/common/warning/warning copy.ui_
  38. 29 14
      TransmitterSwitch/common/warning/warning.cpp
  39. 3 2
      TransmitterSwitch/common/warning/warning.h
  40. 36 39
      TransmitterSwitch/common/warning/warning.ui
  41. 15 12
      TransmitterSwitch/transmitterswitch.cpp
  42. 3 3
      TransmitterSwitch/transmitterswitch.h
  43. 2 1
      show1/widget.cpp

+ 1 - 1
External

@@ -1 +1 @@
-Subproject commit a4a44be90a55808230099f7d91058c41d1a22dfe
+Subproject commit df215c0e95cb4390fa4294619d1dffb578532a4f

+ 1 - 1
SwitchOnOff.sql

@@ -22,7 +22,7 @@ WHERE PTTypeCode = :PTTypeCode;
 #删除表格
 DROP TABLE IF EXISTS "EQM_CESHI"."tExecPlanTemplate";
 
-#创建模版表格,设置模板名称不能重复
+#创建模版表格
 CREATE TABLE IF NOT EXISTS "EQM_CESHI"."tExecPlanTemplate"
 (
     "TemplateName" VARCHAR(255),

+ 25 - 21
TransmitterSwitch/AddItem/addnormalitem.cpp

@@ -40,17 +40,11 @@ AddNormalItem::AddNormalItem(QWidget *parent) :
     // {
     //     LH_WRITE_ERROR(QString("打开文件失败:%1").arg(file.fileName()));
     // }
-    // LHStyleManager::Instance()->AddWidget(this);
-    setQSS();
+
     /* 创建阴影 */
     m_shadow = new OneShadow(ui->widget_background->size(), 16);
     m_shadow->image();
 
-    /* 设置comboBox阴影 */
-    ui->comBox_devSelect->setViewShadowEffect();
-    ui->comBox_actionSelect->setViewShadowEffect();
-
-
     ui->label_timeWarn->hide();
     ui->label_devWarn->hide();
     ui->label_actionWarn->hide();
@@ -77,7 +71,7 @@ AddNormalItem::AddNormalItem(QWidget *parent) :
     /* 设置事件过滤器 */
     ui->comBox_actionSelect->installEventFilter(this);
     ui->comBox_devSelect->installEventFilter(this);
-
+    ui->pBtn_Close->installEventFilter(this);
 }
 
 AddNormalItem::~AddNormalItem()
@@ -116,21 +110,11 @@ void AddNormalItem::setWeekDay(int week)
     m_week = week;
 }
 
-
 /* 设置QSS */
-void AddNormalItem::setQSS()
+void AddNormalItem::setQSS(const QString& qssPath)
 {
-    auto appPath = QApplication::applicationDirPath();
-    QString qssPath;
-    if(LHStyleManager::Instance()->GetCurSkinStyle() == eWhiteStyle)
-    {
-        qssPath = appPath + "/white/addnormalitem.qss";
-        
-    }else if(LHStyleManager::Instance()->GetCurSkinStyle() == eBlackStyle)
-    {
-        qssPath = appPath + "/black/addnormalitem.qss";
-    }
-    QFile file(qssPath);
+    QString qssFile = qssPath + "/addnormalitem.qss";
+    QFile file(qssFile);
     if(file.open(QIODevice::ReadOnly))
     {
         QString stylesheet = file.readAll();
@@ -140,6 +124,10 @@ void AddNormalItem::setQSS()
     {
         LH_WRITE_ERROR(QString("打开文件失败:%1").arg(file.fileName()));
     }
+
+    /* 设置comboBox阴影,需要先加载样式表,在设置这个阴影 */
+    ui->comBox_devSelect->setViewShadowEffect();
+    ui->comBox_actionSelect->setViewShadowEffect();
 }
 
 /* 进行查重和关闭页面 */
@@ -299,6 +287,22 @@ bool AddNormalItem::eventFilter(QObject *watched, QEvent *event)
             return true;
         }
     }
+    else if(watched == ui->pBtn_Close)
+    {
+        if(event->type() == QEvent::Enter)
+        {
+            ui->pBtn_Close->setProperty("Hover", true);
+            ui->pBtn_Close->style()->unpolish(ui->pBtn_Close);
+            ui->pBtn_Close->style()->polish(ui->pBtn_Close);
+            return true;
+        }else if(event->type() == QEvent::Leave)
+        {
+            ui->pBtn_Close->setProperty("Hover", false);
+            ui->pBtn_Close->style()->unpolish(ui->pBtn_Close);
+            ui->pBtn_Close->style()->polish(ui->pBtn_Close);
+            return true;
+        }
+    }
     return QDialog::eventFilter(watched, event);
 }
 

+ 1 - 1
TransmitterSwitch/AddItem/addnormalitem.h

@@ -38,7 +38,7 @@ public:
     bool isAddDev() const { return m_isAddDev; }
 
     /* 设置QSS */
-    void setQSS();
+    void setQSS(const QString& qssPath);
 
 signals:
     /* 添加正常日期的项 */

+ 24 - 19
TransmitterSwitch/AddItem/addspecialitem.cpp

@@ -41,13 +41,8 @@ AddSpecialItem::AddSpecialItem(QWidget *parent) :
     // {
     //     LH_WRITE_ERROR(QString("打开文件失败:%1").arg(file.fileName()));
     // }
-    setQSS();
     /* 创建弹窗阴影 */
     m_shadow = new OneShadow(ui->widget_background->size(), 16);
-    /* 设置comboBox阴影 */
-    ui->comBox_devSelect->setViewShadowEffect();
-    ui->comBox_actionSelect->setViewShadowEffect();
-
 
     ui->label_timeWarn->hide();
     ui->label_devWarn->hide();
@@ -79,7 +74,7 @@ AddSpecialItem::AddSpecialItem(QWidget *parent) :
     /* 设置事件过滤器 */
     ui->comBox_actionSelect->installEventFilter(this);
     ui->comBox_devSelect->installEventFilter(this);
-
+    ui->pBtn_Close->installEventFilter(this);
 }
 
 AddSpecialItem::~AddSpecialItem()
@@ -119,20 +114,10 @@ void AddSpecialItem::setWeekDay(int week)
     m_week = week;
 }
 
-/* 设置QSS */
-void AddSpecialItem::setQSS()
+void AddSpecialItem::setQSS(QString qssPath)
 {
-    auto appPath = QApplication::applicationDirPath();
-    QString qssPath;
-    if(LHStyleManager::Instance()->GetCurSkinStyle() == eWhiteStyle)
-    {
-        qssPath = appPath + "/white/addspecialitem.qss";
-        
-    }else if(LHStyleManager::Instance()->GetCurSkinStyle() == eBlackStyle)
-    {
-        qssPath = appPath + "/black/addspecialitem.qss";
-    }
-    QFile file(qssPath);
+    QString qssFile = qssPath + "/addspecialitem.qss";
+    QFile file(qssFile);
     if(file.open(QIODevice::ReadOnly))
     {
         QString stylesheet = file.readAll();
@@ -142,6 +127,10 @@ void AddSpecialItem::setQSS()
     {
         LH_WRITE_ERROR(QString("打开文件失败:%1").arg(file.fileName()));
     }
+
+    /* 设置comboBox阴影 */
+    ui->comBox_devSelect->setViewShadowEffect();
+    ui->comBox_actionSelect->setViewShadowEffect();
 }
 
 
@@ -304,6 +293,22 @@ bool AddSpecialItem::eventFilter(QObject *watched, QEvent *event)
             return true;
         }
     }
+    else if(watched == ui->pBtn_Close)
+    {
+        if(event->type() == QEvent::Enter)
+        {
+            ui->pBtn_Close->setProperty("Hover", true);
+            ui->pBtn_Close->style()->unpolish(ui->pBtn_Close);
+            ui->pBtn_Close->style()->polish(ui->pBtn_Close);
+            return true;
+        }else if(event->type() == QEvent::Leave)
+        {
+            ui->pBtn_Close->setProperty("Hover", false);
+            ui->pBtn_Close->style()->unpolish(ui->pBtn_Close);
+            ui->pBtn_Close->style()->polish(ui->pBtn_Close);
+            return true;
+        }
+    }
     return QDialog::eventFilter(watched, event);
 }
 

+ 1 - 1
TransmitterSwitch/AddItem/addspecialitem.h

@@ -47,7 +47,7 @@ public:
     bool isAddDev() const { return m_isAddDev; }
 
     /* 设置QSS */
-    void setQSS();
+    void setQSS(QString qssPath);
 
 signals:
     /* 添加特殊日期项 */

+ 17 - 0
TransmitterSwitch/ItemData/oneitem.cpp

@@ -75,6 +75,7 @@ void OneItem::init()
     /* 注册事件过滤器 */
     ui->comboBox_devName->installEventFilter(this);
     ui->comboBox_action->installEventFilter(this);
+    ui->pBtn_close->installEventFilter(this);
 
     /* 连接信号和槽 */
     connect(ui->comboBox_devName,QOverload<const QString&>::of(&QComboBox::currentTextChanged),this,&OneItem::do_devChanged);
@@ -345,6 +346,22 @@ bool OneItem::eventFilter(QObject *watched, QEvent *event)
             return true;
         }
     }
+    else if(watched == ui->pBtn_close)
+    {
+        if(event->type() == QEvent::Enter)
+        {
+            ui->pBtn_close->setProperty("Hover", true);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+            return true;
+        }else if(event->type() == QEvent::Leave)
+        {
+            ui->pBtn_close->setProperty("Hover", false);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+            return true;
+        }
+    }
     return QWidget::eventFilter(watched,event);
 }
 

+ 0 - 282
TransmitterSwitch/Resource/QSS/AddNormalItem_Light.qss

@@ -1,282 +0,0 @@
-
-/* ==========================================================
- *  通用样式
- * ========================================================== */
-QWidget
-{
-    font-family: 思源黑体R;
-    font-weight: 400;
-    font-size: 14px;
-    color: #3A3F63;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-    border-radius: 8px;
-    background: #FFFFFF;
-}
-
-QWidget#widget
-{
-    background: rgba(0,0,0,0.01);
-    /* background: rgba(255,255,255,1); */
-}
-
-QLabel#label_NC1
-{
-    font-weight: bold;
-    font-size: 18px;
-    color: #3A3F63;
-    line-height: 27px;
-    text-align: left;
-    font-style: normal;
-    text-transform: uppercase;
-}
-QLabel#label_NC4
-{
-    background: #E6E9F4;
-}
-
-QPushButton
-{
-	text-align: center;
-	font-family: 思源黑体M;
-}
-
-QPushButton#pBtn_Close{
-	image: url(:/ICON/ICON/Dialog_close.png);
-}
-QPushButton#pBtn_Close:hover
-{
-	image: url(:/ICON/ICON/Dialog_close2.png);
-}
-
-/********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel:enabled
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
-}
-QPushButton#pBtn_cancel:hover
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
-}
-
-
-/********* 带有底色按钮三种状态效果 *********/
-QPushButton#pBtn_ok
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
-    border-radius: 16px;
-}
-
-QPushButton#pBtn_ok:hover
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
-    border-radius: 16px;
-}
-
-
-QLabel#label_devWarn,QLabel#label_timeWarn,QLabel#label_actionWarn
-{
-    font-weight: 400;
-    font-size: 14px;
-    color: #D21F21;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-}
-
-/* ==========================================================
- *  QComboBox(这个是在用的)
- * ========================================================== */
-
-QComboBox:enabled
-{
-    background-color:#FFFFFF;
-    border: 1px solid #E6E9F4;
-    border-radius: 4px;
-    font-size:14px;
-    font-weight: 400;
-    color:#3A3F63;
-    padding-left: 12px;
-}
-
-/* 不能编辑的时候的样式,setEnable(false) */
-QComboBox:!enabled
-{
-    background:rgba(0,0,0,0.04);
-	border: 1px solid #E6E9F4;
-    border-radius: 4px;
-    font-size:14px;
-    font-weight: 400;
-    color:rgba(58,63,99,0.65);
-    padding-left: 12px;
-}
-
-QComboBox:hover
-{
-    border: 1px solid #4458FE;
-    border-radius: 4px;
-    background:transparent;
-}
-
-/* 下拉箭头所在的位置方框 */
-QComboBox::drop-down
-{
-    width: 24px;
-    border: none;
-}
-/* 下拉箭头图标 */
-QComboBox::down-arrow
-{
-    image: url(:/ICON/ICON/DownArrow.png);
-    height:16px;
-    width:16px;
-}
-
-/* 下拉条样式,就是view,整个下拉窗体的样式 */
-QComboBox QAbstractItemView
-{
-    background-color: #FFFFFF;
-    margin: 12px;
-    outline:0px;
-    font-size:14px;
-    color: #3A3F63;
-    border-radius: 4px;
-}
-
-/* 使下面两句生效,需要加上如下语句 */
-/* m_comBoxDev->setView(new QListView()); */
-QComboBox QAbstractItemView::item
-{
-    background-color: #FFFFFF;
-    border-radius:4px;
-    color: #3A3F63;
-    padding-left: 12px;
-    height: 32px;
-}
-
-QComboBox QAbstractItemView::item:hover
-{
-    border-radius:4px;
-    background-color: #EEF2FF;
-}
-
-/* QComboBox QAbstractItemView::item:selected
-{
-    border-radius:4px;
-    background-color: #EEF2FF;
-} */
-
-/******** combobox 滚动条  *********/
-QComboBox QScrollBar::vertical{ /*主体部分*/
-    width:8px;
-    background:transparent;
-    border:none;
-    border-radius:5px;
-}
-QComboBox QScrollBar::handle::vertical{ /*滑块主体*/
-    width: 8px;
-    background: #E2E2E2;
-    border-radius: 3px;
-    min-width: 8px;
-}
-QComboBox QScrollBar::handle::vertical::hover{
-    background:transparent;
-}
-QComboBox QScrollBar::add-line::vertical{/*上箭头*/
-    border:none;
-}
-QComboBox QScrollBar::sub-line::vertical{/*下箭头*/
-    border:none;
-}
-
-
-/* ==========================================================
- *  时间报警红框
- * ========================================================== */
-
-QLabel#label_iconTime
-{
-	border-image: url(:/ICON/ICON/Time.png);
-}
-
-TimeWidget
-{
-	background: transparent;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #E6E9F4;
-}
-
-TimeWidget[Warn=true]
-{
-	background: transparent;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #D21F21;
-}
-
-TimeWidget:!enabled
-{
-    background: rgba(0,0,0,0.04);
-    border: 1px solid #E6E9F4;
-}
-
-QPushButton#pBtn_selectTime
-{
-    background: transparent;
-    border: 1px solid #E6E9F4;
-    border-radius: 4px;
-    font-size: 14px;
-    font-weight: 400;
-    color: #3A3F63;
-    padding-left: 12px;
-    text-align: left;
-}
-
-QPushButton#pBtn_selectTime:hover
-{
-    background: transparent;
-    border: 1px solid #4458FE;
-    border-radius: 4px;
-    font-size: 14px;
-    font-weight: 400;
-    color: #4458FE;
-    padding-left: 12px;
-    text-align: left;
-}
-/* 报警红框 */
-QPushButton#pBtn_selectTime[Warn=true]
-{
-	background: transparent;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #D21F21;
-}
-
-TimeWidget
-{
-    /* background: transparent; */
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #4458FE;
-}
-
-/* TimeWidget QPushButton
-{
-    border-image: url(:/ICON/ICON/Time.png);
-} */
-
-QPushButton#btn_tip
-{
-    border-image: url(:/ICON/ICON/Time.png);
-}
-

+ 0 - 301
TransmitterSwitch/Resource/QSS/AddSpecialItem_Light.qss

@@ -1,301 +0,0 @@
-
-/* ==========================================================
- *  通用样式
- * ========================================================== */
-QWidget
-{
-    font-family: 思源黑体R;
-    font-weight: 400;
-    font-size: 14px;
-    color: #3A3F63;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-    border-radius: 8px;
-    background: #FFFFFF;
-}
-
-QWidget#widget
-{
-    background: rgba(0,0,0,0.01);
-    /* background: rgba(255,255,255,1); */
-}
-
-QLabel#label_NC1
-{
-    font-weight: bold;
-    font-size: 18px;
-    color: #3A3F63;
-    line-height: 27px;
-    text-align: left;
-    font-style: normal;
-    text-transform: uppercase;
-}
-QLabel#label_NC4
-{
-    background: #E6E9F4;
-}
-
-QPushButton
-{
-	text-align: center;
-	font-family: 思源黑体M;
-}
-
-QPushButton#pBtn_Close{
-	image: url(:/ICON/ICON/Dialog_close.png);
-}
-QPushButton#pBtn_Close:hover
-{
-	image: url(:/ICON/ICON/Dialog_close2.png);
-}
-
-/********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel:enabled
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
-}
-QPushButton#pBtn_cancel:hover
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
-}
-
-
-/********* 带有底色按钮三种状态效果 *********/
-QPushButton#pBtn_ok
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
-    border-radius: 16px;
-}
-
-QPushButton#pBtn_ok:hover
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
-    border-radius: 16px;
-}
-
-
-QLabel#label_devWarn,QLabel#label_timeWarn,QLabel#label_actionWarn
-{
-    font-weight: 400;
-    font-size: 14px;
-    color: #D21F21;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-}
-
-/* ==========================================================
- *  QComboBox(这个是在用的)
- * ========================================================== */
-
-QComboBox:enabled
-{
-    background-color:#FFFFFF;
-    border: 1px solid #E6E9F4;
-    border-radius: 4px;
-    font-size:14px;
-    font-weight: 400;
-    color:#3A3F63;
-    padding-left: 12px;
-}
-
-/* 不能编辑的时候的样式,setEnable(false) */
-QComboBox:!enabled
-{
-    background:rgba(0,0,0,0.04);
-	border: 1px solid #E6E9F4;
-    border-radius: 4px;
-    font-size:14px;
-    font-weight: 400;
-    color:rgba(58,63,99,0.65);
-    padding-left: 12px;
-}
-
-QComboBox:hover
-{
-    border: 1px solid #4458FE;
-    border-radius: 4px;
-    background:transparent;
-}
-
-/* 下拉箭头所在的位置方框 */
-QComboBox::drop-down
-{
-    width: 24px;
-    border: none;
-}
-/* 下拉箭头图标 */
-QComboBox::down-arrow
-{
-    image: url(:/ICON/ICON/DownArrow.png);
-    height:16px;
-    width:16px;
-}
-
-/* 下拉条样式,就是view,整个下拉窗体的样式 */
-QComboBox QAbstractItemView
-{
-    background-color: #FFFFFF;
-    margin: 12px;
-    outline:0px;
-    font-size:14px;
-    color: #3A3F63;
-    border-radius: 4px;
-}
-
-/* 使下面两句生效,需要加上如下语句 */
-/* m_comBoxDev->setView(new QListView()); */
-QComboBox QAbstractItemView::item
-{
-    background-color: #FFFFFF;
-    border-radius:4px;
-    color: #3A3F63;
-    padding-left: 12px;
-    height: 32px;
-}
-
-QComboBox QAbstractItemView::item:hover
-{
-    border-radius:4px;
-    background-color: #EEF2FF;
-}
-
-/* QComboBox QAbstractItemView::item:selected
-{
-    border-radius:4px;
-    background-color: #EEF2FF;
-} */
-
-/******** combobox 滚动条  *********/
-QComboBox QScrollBar::vertical{ /*主体部分*/
-    width:8px;
-    background:transparent;
-    border:none;
-    border-radius:5px;
-}
-QComboBox QScrollBar::handle::vertical{ /*滑块主体*/
-    width: 8px;
-    background: #E2E2E2;
-    border-radius: 3px;
-    min-width: 8px;
-}
-QComboBox QScrollBar::handle::vertical::hover{
-    background:transparent;
-}
-QComboBox QScrollBar::add-line::vertical{/*上箭头*/
-    border:none;
-}
-QComboBox QScrollBar::sub-line::vertical{/*下箭头*/
-    border:none;
-}
-
-
-/* ==========================================================
- *  时间选择器
- * ========================================================== */
-
-QPushButton#pBtn_iconTime
-{
-	border-image: url(:/ICON/ICON/Time.png);
-}
-
-TimeWidget
-{
-	background: transparent;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #E6E9F4;
-}
-
-TimeWidget[Warn=true]
-{
-	background: transparent;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #D21F21;
-}
-
-TimeWidget:!enabled
-{
-    background: rgba(0,0,0,0.04);
-    border: 1px solid #E6E9F4;
-}
-
-QPushButton#pBtn_selectTime
-{
-    background: transparent;
-    border: 1px solid #E6E9F4;
-    border-radius: 4px;
-    font-size: 14px;
-    font-weight: 400;
-    color: #3A3F63;
-    padding-left: 12px;
-    text-align: left;
-}
-
-QPushButton#pBtn_selectTime:hover
-{
-    background: transparent;
-    border: 1px solid #4458FE;
-    border-radius: 4px;
-    font-size: 14px;
-    font-weight: 400;
-    color: #4458FE;
-    padding-left: 12px;
-    text-align: left;
-}
-/* 报警红框 */
-QPushButton#pBtn_selectTime[Warn=true]
-{
-	background: transparent;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #D21F21;
-}
-
-QPushButton#btn_tip
-{
-    border-image: url(:/ICON/ICON/Time.png);
-}
-
-/* ==========================================================
- *  日期选择器
- * ========================================================== */
-
-CalendarDTEdit
-{
-	background: #FFFFFF;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #E6E9F4;
-}
-
-CalendarDTEdit[Warn=true]
-{
-	background: #FFFFFF;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #D21F21;
-}
-
-CalendarDTEdit:!enabled/* 或者disable */
-{
-    background: rgba(0,0,0,0.04);
-    border: 1px solid #E6E9F4;
-}
-
-CalendarDTEdit::drop-down
-{
- 	padding-right:8px;
-	width: 16px;
-    image: url(:/ICON/ICON/date_light.png);
-}

+ 0 - 185
TransmitterSwitch/Resource/QSS/OneItem_dark.qss

@@ -1,185 +0,0 @@
-
-QWidget
-{
-    font-family: 思源黑体R;
-    font-weight: 400;
-    font-size: 14px;
-    color: #D2D2D2;
-    line-height: 22px;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-
-}
-
-QWidget#widget
-{
-    background: transparent;
-    border: 0px solid #313539;
-}
-
-QWidget#widget_content
-{
-    background: transparent;
-    border: 0px solid #313539;
-}
-
-
-/* 序号 */
-QLabel#label_num
-{
-    background: #313539;
-    border-radius: 2px 2px 2px 2px;
-    border: 1px solid #313539;
-    padding-left: 12px;
-}
-
-
-
-QPushButton#pBtn_close
-{
-    background-color: #313539;
-    border-radius: 2px 2px 2px 2px;
-    padding-left: 6px;
-
-    border: 1px solid #313539;
-    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
-    qproperty-iconSize: 20px 20px;
-}
-
-QPushButton#pBtn_close:hover
-{
-    background-color: #313539;
-    border-radius: 2px 2px 2px 2px;
-    padding-left: 6px;
-
-    border: 1px solid #438EFF;
-    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
-    qproperty-iconSize: 20px 20px;
-}
-
-/* 执行时间 */
-QPushButton#pBtn_execTime, #pBtn_execDate
-{
-    background-color: #313539;
-    border-radius: 2px 2px 2px 2px;
-    padding-left: 12px;
-
-    border: 1px solid #313539;
-}
-
-QPushButton#pBtn_execTime:hover, #pBtn_execDate:hover
-{
-    background-color: #313539;
-    border-radius: 2px 2px 2px 2px;
-    padding-left: 12px;
-
-    border: 1px solid #438EFF;
-}
-
-/* 时间图标 */ 
-QPushButton#pBtn_iconTime
-{
-    background: transparent;
-    border: none;
-    qproperty-icon: url(:/ICON/ICON/Time.png);
-    qproperty-iconSize: 16px 16px;
-}
-
-/* 日期图标 */ 
-QPushButton#pBtn_iconDate
-{
-    background: transparent;
-    border: none;
-    qproperty-icon: url(:/ICON/ICON/date_dark.png);
-    qproperty-iconSize: 16px 16px;
-}
-
-
-/*=====================================================================
- * QComboBox下拉框
- *==================================================================== */
-
-QComboBox
-{
-	background-color: #313539;
-	border-radius: 4px;
-	border: 1px solid #313539;
-	font-weight: 400;
-	font-size: 14px;
-	color: #D2D2D2;
-	padding-left: 12px;
-}
-QComboBox:hover, QComboBox:on 
-{
-	border: 1px solid #438EFF;
-}
-/*下拉箭头样式*/
-QComboBox::down-arrow
-{
-	height: 16px;
-	width: 16px;
-	image: url(:/ICON/ICON/DownArrow_Dark.png);
-}
-QComboBox::drop-down
-{
-    background-color:transparent;
-	padding-right:12px;
-}
-/* 下拉后,整个下拉窗体样式 */
-QComboBox QAbstractItemView
-{
-	margin: 12px;
-	font-size: 14px;
-	background-color: #5C5E61;
-	outline:0px;
-	border-radius: 4px;
-}
-/* 下拉后,整个下拉窗体每项的样式 */
-QComboBox QAbstractItemView::item 
-{
-    border-radius: 4px;
-	color: #D2D2D2;
-    height: 32px;
-	background-color: #5C5E61;
-	font-weight: 400;
-	font-size: 14px;
-	padding-left: 12px;
-}
-QComboBox QAbstractItemView::item:hover 
-{
-	font-weight: 400;
-    color: #FFFFFF;
-	background-color: #438EFF;
-}
-QComboBox QAbstractItemView::item:selected 
-{
-	font-weight: 400;
-    color: #FFFFFF;
-	background-color: #438EFF;
-}
-
-
-/*=====================================================================
- * 报警文字和报警框
- *==================================================================== */
-
-QLabel#label_warnning
-{
-    font-weight: 400;
-    font-size: 14px;
-    color: #D21F21;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-    padding-left: 18px;
-}
-
-QPushButton#pBtn_execTime[Warn=true], #pBtn_execDate[Warn=true]
-{
-    background-color: #313539;
-    border-radius: 2px 2px 2px 2px;
-    padding-left: 12px;
-
-    border: 1px solid #D21F21;
-}

+ 0 - 242
TransmitterSwitch/Resource/QSS/TransmitterSwitch_dark.qss

@@ -1,242 +0,0 @@
-
-
-QWidget
-{
-    font-family: 思源黑体M;
-    font-weight: 400;
-    font-size: 14px;
-    color: #B1B3B4;
-    line-height: 22px;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-}
-
-/* 整体背景 */
-QWidget
-{
-    background: #202428;
-}
-
-QWidget#widget
-{
-    border-radius: 4px 4px 4px 4px;
-}
-
-QPushButton
-{
-    font-family: 思源黑体M;
-    font-weight: 400;
-    font-size: 14px;
-    color: #D2D2D2;
-    line-height: 22px;
-    text-align: center;
-    font-style: normal;
-    text-transform: none;
-}
-
-/*===============================================================
- * widget_Top
- ================================================================*/
-QLabel#label_X1
-{
-    text-align: center;
-    color: #F53F3F;
-}
-
-QPushButton#pBtn_defaultPlan
-{
-    /* background: #202428; */
-    border-radius: 20px 20px 20px 20px;
-}
-QPushButton#pBtn_defaultPlan:checked
-{
-    border-image: url(:/ICON/ICON/Switch_Open.png);
-}
-QPushButton#pBtn_defaultPlan
-{
-    border-image: url(:/ICON/ICON/Switch_Close.png);
-}
-
-QRadioButton#rBtn_moment::indicator:unchecked, QRadioButton#rBtn_day::indicator:unchecked
-{
-    background: #FFFFFF;
-    border-radius: 7px 7px 7px 7px;
-    border: 2px solid #E5E6EB;
-    /* border-image: url(:/ICON/ICON/rBtn_Unchaecked.png); */
-}
-QRadioButton#rBtn_moment::indicator:checked, QRadioButton#rBtn_day::indicator:checked
-{
-    background: #FFFFFF;
-    border-radius: 7px 7px 7px 7px;
-    border: 4px solid #165DFF;
-    color: #B1B3B4;
-    /* border-image: url(:/ICON/ICON/rBtn_Checked.png); */
-}
-
-QLabel#label_Tip
-{
-    border-image: url(:/ICON/ICON/Tip_Dark.png);
-}
-
-QLabel#label_TipText
-{
-    padding:8px;
-    color: #FFFFFF;
-    line-height: 14px;
-    border-radius: 4px;
-    background: #373639;
-    border: 1px solid rgba(255,255,255,0.15);
-}
-
-
-/*===============================================================
- * widget_Content
- ================================================================*/
-QWidget#widget_content
-{
-    border-radius: 0px 0px 0px 0px;
-    border: 1px solid rgba(255,255,255,0.15);
-}
-
-QWidget#widget_weekpBtn
-{
-    background: #313539;
-    border-radius: 0px 0px 0px 0px;
-}
-
-/* 周几按钮 */
-QPushButton#pBtn_Monday, #pBtn_Tuesday, #pBtn_Wednesday, #pBtn_Thursday, #pBtn_Friday, #pBtn_Saturday, #pBtn_Sunday, #pBtn_SpecialDay
-{
-    text-align: left;
-    padding-left: 19px;
-    background: #313539;
-    border-radius: 0px 0px 0px 0px;
-    border: 0px;
-}
-
-QPushButton#pBtn_Monday:checked, #pBtn_Tuesday:checked, #pBtn_Wednesday:checked, #pBtn_Thursday:checked, #pBtn_Friday:checked, #pBtn_Saturday:checked, #pBtn_Sunday:checked, #pBtn_SpecialDay:checked
-{
-    text-align: left;
-    padding-left: 19px;
-    background: rgba(67,142,255,0.2);
-    border-radius: 0px;
-    border-right: 2px solid #438EFF;
-}
-
-/*===============================================================
- * widget_bottom
- ================================================================*/
-
-QWidget#widget_bottom
-{
-    border-radius: 0px 0px 0px 0px;
-    border-left: 1px solid rgba(255,255,255,0.15);
-    border-right: 1px solid rgba(255,255,255,0.15);
-    border-bottom: 1px solid rgba(255,255,255,0.15);
-}
-
-QPushButton#pBtn_addPlan, QPushButton#pBtn_clearPlan, QPushButton#pBtn_importPlan, QPushButton#pBtn_exportPlan
-{
-    background: rgba(255,255,255,0.08);
-    border-radius: 4px 4px 4px 4px;
-}
-
-QPushButton#pBtn_addPlan:hover, #pBtn_clearPlan:hover, #pBtn_importPlan:hover, #pBtn_exportPlan:hover
-{
-    background: #1a69b8;
-    border-radius: 4px 4px 4px 4px;
-}
-
-
-/*===============================================================
- * WidgetItems
- ================================================================*/
-
-/* QWidget#widget_items_background
-{
-    border-radius: 0px 0px 0px 0px;
-    border: none;
-}
-
-QWidget#scrollAreaWidgetContents
-{
-    border-radius: 0px 0px 0px 0px;
-    border: 0px solid rgba(255,255,255,0.15);
-}
-
-QWidget#widget_items
-{
-    border-radius: 0px 0px 0px 0px;
-    border: 0px solid rgba(255,255,255,0.15);
-} */
-
-/*QScrollBar*/
-QScrollArea
-{
-	background:transparent;
-	border-radius:0px;
-	border:none;
-}
-QScrollBar:horizontal, QScrollBar:vertical
-{
-    border:none;
-    background-color: rgba(255, 255, 255, 0);
-    margin: 0px 0px 0px 0px;
-}
-QScrollBar:horizontal
-{
-    height: 12px;
-}
-QScrollBar:vertical
-{
-    width: 6px;
-}
-QScrollBar::handle:horizontal,QScrollBar::handle:vertical
-{
-    background: #E2E2E2;
-    border-radius: 3px;
-    min-width: 8px;
-}
-QScrollBar::handle:horizontal
-{
-    min-width: 8px;
-}
-QScrollBar::handle:vertical
-{
-    min-height: 113px;
-}
-QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal,
-QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical
-{
-    background-color: rgba(255, 255, 255, 0);
-    border: none;
-}
-QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal,
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
-{
-    background-color: rgba(255, 255, 255, 0);
-    background: none;
-}
-
-
-
-/*===============================================================
- * TimeWidget 时间选择器
- *===============================================================*/
-
-TimeWidget
-{
-    /* background: transparent; */
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #438EFF;
-}
-
-CDate
-{
-	background: #FFFFFF;
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #E6E9F4;
-}

+ 14 - 11
TransmitterSwitch/Resource/QSS/black/addnormalitem.qss

@@ -57,21 +57,24 @@ QPushButton
 
 QPushButton#pBtn_Close
 {
-    border-image: url(:/ICON/ICON/Dialog_close.png);
-    /* background-color: #313539; */
-    /* border: 1px solid rgba(255,255,255,0.25); */
+    /* border-image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
+    qproperty-iconSize: 20px 20px;
 
-    /* qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
-    qproperty-iconSize: 20px 20px; */
+    /* border: 1px solid #313539; */
 }
-QPushButton#pBtn_Close:hover
+QPushButton#pBtn_Close[Hover = true]
 {
-    border-image: url(:/ICON/ICON/Dialog_close2.png);
-    /* background-color: #313539;
-    border: 1px solid #438EFF;
-
+    /* border-image: url(:/ICON/ICON/Dialog_close2.png); */
+    
+    background: transparent;
+    border-radius: 4px;
     qproperty-icon: url(:/ICON/ICON/Close_pass.png);
-    qproperty-iconSize: 20px 20px; */
+    qproperty-iconSize: 20px 20px;
+
+    border: 1px solid #438EFF;
 }
 
 /********* 普通方框按钮三种状态效果 *********/

+ 16 - 4
TransmitterSwitch/Resource/QSS/black/addspecialitem.qss

@@ -53,12 +53,24 @@ QPushButton
 	font-family: 思源黑体M;
 }
 
-QPushButton#pBtn_Close{
-	image: url(:/ICON/ICON/Dialog_close.png);
+QPushButton#pBtn_Close
+{
+	/* image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
+    qproperty-iconSize: 20px 20px;
 }
-QPushButton#pBtn_Close:hover
+
+QPushButton#pBtn_Close[Hover = true]
 {
-	image: url(:/ICON/ICON/Dialog_close2.png);
+	/* image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+
+    border: 1px solid #438EFF;
 }
 
 /********* 普通方框按钮三种状态效果 *********/

+ 64 - 36
TransmitterSwitch/Resource/QSS/black/importtemplate.qss

@@ -1,42 +1,42 @@
 QWidget
 {
-    background: #FFFFFF;
+    background: transparent;
     border-radius: 8px;
 
     font-family: 思源黑体R;
     font-weight: 400;
     font-size: 14px;
-    color: #3A3F63;
+    color: #D2D2D2;
     line-height: 21px;
     text-align: left;
     font-style: normal;
 }
 
-QLabel#label_NC1
+QWidget#widget
+{
+    background-color: #313539;
+}
+
+QWidget#widget_Top
+{
+    background: rgba(108,105,124,0.2);
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+QLabel#label_title
 {
     font-weight: bold;
     font-size: 18px;
-    color: #3A3F63;
+    color: #D2D2D2;
     line-height: 27px;
     text-align: left;
     font-style: normal;
     text-transform: uppercase;
 }
 
-QLabel#label_NC2,QLabel#label_NC3,QLabel#label_NC4
-{
-    font-weight: 400;
-    font-size: 14px;
-    color: #5A607F;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-}
-
-QLabel#label_line1,QLabel#label_line2,QLabel#label_line3
-{
-    background: #E6E9F4;
-}
 QLabel#label_warning
 {
     color:red;
@@ -44,43 +44,54 @@ QLabel#label_warning
 
 QPushButton#pBtn_close
 {
-	border-image: url(:/ICON/ICON/Dialog_close.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
+    qproperty-iconSize: 20px 20px;
+
+    text-align: center;
 }
 
-QPushButton#pBtn_close:hover
+QPushButton#pBtn_close[Hover = true]
 {	
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+    text-align: center;
+    border: 1px solid #438EFF;
 }
 
 
 
 /********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel
+QPushButton#pBtn_cancel:enabled
 {
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
+    text-align: center;
+    color: #EBEBEB;
+    border: 1px solid rgba(255,255,255,0.25);
     border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
+    background: transparent;
 }
 QPushButton#pBtn_cancel:hover
 {
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
+    text-align: center;
+    color: #EBEBEB;
+    border: 1px solid rgba(255,255,255,0.25);
     border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
+    background: rgba(0,0,0,0.15);
 }
 
+
 /********* 带有底色按钮三种状态效果 *********/
 QPushButton#pBtn_ok
 {
 	border-radius: 16px;
 	text-align: center;
     color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
+    background: #438EFF;
     border-radius: 16px;
 }
 
@@ -89,17 +100,32 @@ QPushButton#pBtn_ok:hover
 	border-radius: 16px;
 	text-align: center;
     color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
+    background: #5F9EFF;
     border-radius: 16px;
 }
 
 /* ==========================================================
  *  QTabelWidget
  * ========================================================== */
+/* 标题栏 */
+QLabel#label_NC2, #label_NC3, #label_NC4
+{
+    font-weight: 400;
+    font-size: 14px;
+    color: #D2D2D2;
+    line-height: 21px;
+    text-align: left;
+    font-style: normal;
+}
+
+QLabel#label_line2, #label_line3
+{
+    background: #E6E9F4;
+}
 
 QTableWidget
 {
-    background: #FFFFFF;
+    background: transparent;
     padding-left: 0px;
     border: 0px solid #E6E9F4;
     text-align: left;
@@ -121,6 +147,8 @@ QTableWidget::item
 
 QTableWidget::item:selected
 {
-    background: rgba(231,236,255,0.5);
+    color: #EBEBEB;
+    /* background: rgba(231,236,255,0.5); */
+    background: #438EFF;
 }
 

+ 2 - 2
TransmitterSwitch/Resource/QSS/black/oneitem.qss

@@ -47,14 +47,14 @@ QPushButton#pBtn_close
     qproperty-iconSize: 20px 20px;
 }
 
-QPushButton#pBtn_close:hover
+QPushButton#pBtn_close[Hover = true]
 {
     background-color: #313539;
     border-radius: 2px 2px 2px 2px;
     padding-left: 6px;
 
     border: 1px solid #438EFF;
-    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
     qproperty-iconSize: 20px 20px;
 }
 

+ 50 - 30
TransmitterSwitch/Resource/QSS/black/savetotemplate.qss

@@ -5,26 +5,37 @@ QWidget
     font-family: 思源黑体R;
     font-weight: 400;
     font-size: 14px;
-    color: #3A3F63;
+    color: #D2D2D2;
     line-height: 21px;
     text-align: left;
     font-style: normal;
+    background: transparent;
 }
 
-QLabel#label_NC1
+QWidget#widget
+{
+    background-color: #313539;
+}
+
+QWidget#widget_Top
+{
+    background: rgba(108,105,124,0.2);
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+QLabel#label_title
 {
     font-family: 思源黑体M;
     font-weight: bold;
     font-size: 18px;
-    color: #3A3F63;
+    color: #EBEBEB;
     line-height: 27px;
     text-transform: uppercase;
 }
 
-QLabel#label_line
-{
-    background: #E6E9F4;
-}
 
 QLabel#label_warn
 {
@@ -33,65 +44,74 @@ QLabel#label_warn
 
 QPushButton#pBtn_close
 {
-	border-image: url(:/ICON/ICON/Dialog_close.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
+    qproperty-iconSize: 20px 20px;
+    text-align: center;
 }
 
-QPushButton#pBtn_close:hover
+QPushButton#pBtn_close[Hover = true]
 {
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+    text-align: center;
+
+    border: 1px solid #438EFF;
 }
 
 /********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel
+QPushButton#pBtn_cancel:enabled
 {
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
+    color: #EBEBEB;
+    border: 1px solid rgba(255,255,255,0.25);
     border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
+    background: transparent;
+    text-align: center;
 }
 QPushButton#pBtn_cancel:hover
 {
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
+    color: #EBEBEB;
+    border: 1px solid rgba(255,255,255,0.25);
     border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
+    background: rgba(0,0,0,0.15);
+    text-align: center;
 }
 
+
 /********* 带有底色按钮三种状态效果 *********/
 QPushButton#pBtn_ok
 {
-	border-radius: 16px;
-	text-align: center;
     color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
+    background: #438EFF;
     border-radius: 16px;
+    text-align: center;
 }
 
 QPushButton#pBtn_ok:hover
 {
-	border-radius: 16px;
-	text-align: center;
     color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
+    background: #5F9EFF;
     border-radius: 16px;
+    text-align: center;
 }
 
 /****************  报警红框  ****************/
 QLineEdit
 {
-    background: #FFFFFF;
+    background: transparent;
     border-radius: 4px;
     padding-left:12px;
-	border: 1px solid #E6E9F4;
+	border: 1px solid rgba(255,255,255,0.15);
 }
 
 QLineEdit:hover
 {
-    border: 1px solid #4458FE;
+    border: 1px solid #438EFF;
 }
 
 

+ 52 - 21
TransmitterSwitch/Resource/QSS/black/warning.qss

@@ -1,22 +1,36 @@
 QWidget
 {
-    background: #FFFFFF;
+    background: transparent;
     border-radius: 8px;
     font-family: 思源黑体R;
     font-weight: 400;
     font-size: 18px;
-    color: #3A3F63;
+    color: #D2D2D2;
     line-height: 21px;
     text-align: left;
     font-style: normal;
 }
 
-QLabel#label_NC1
+QWidget#widget
+{
+    background-color: #313539;
+}
+
+QWidget#widget_Top
+{
+    background: rgba(108,105,124,0.2);
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+QLabel#label_title
 {
     font-family: 思源黑体M;
     font-weight: bold;
     font-size: 18px;
-    color: #3A3F63;
+    color: #D2D2D2;
     line-height: 27px;
     text-transform: uppercase;
 }
@@ -37,53 +51,70 @@ QLabel#label_Warn
 	font-family: 思源黑体R;
 	font-weight: 400;
 	font-size: 18px;
-	color: #3A3F63;
+	color: #D2D2D2;
 	line-height: 27px;
 }
 
-QPushButton#pBtn_close{
-	border-image: url(:/ICON/ICON/Dialog_close.png);
+/*设置图片居中 */
+QPushButton#pBtn_close
+{
+    background: transparent;
+	/* border-image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
+    qproperty-iconSize: 20px 20px;
+
+    padding-left: 0px;
 }
-QPushButton#pBtn_close:hover{
-	
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
+QPushButton#pBtn_close[Hover = true]
+{
+    background: transparent;
+	/* border-image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+    padding-left: 0px;
+    border: 1px solid #438EFF;
 }
 
 QPushButton
 {
 	background: #FFFFFF;
-	border: 1px solid #E6E9F4;
+	/* border: 1px solid #E6E9F4; */
 	text-align: center;
 }
 
 
 /********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel
+QPushButton#pBtn_cancel:enabled
 {
-    background: #FFFFFF;
+    color: #EBEBEB;
+    border: 1px solid rgba(255,255,255,0.25);
     border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
+    background: transparent;
 }
 QPushButton#pBtn_cancel:hover
 {
-    background: #FFFFFF;
+    color: #EBEBEB;
+    border: 1px solid rgba(255,255,255,0.25);
     border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
+    background: rgba(0,0,0,0.15);
 }
 
+
 /********* 带有底色按钮三种状态效果 *********/
 QPushButton#pBtn_ok
 {
     color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
+    background: #438EFF;
     border-radius: 16px;
 }
 
 QPushButton#pBtn_ok:hover
 {
     color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
+    background: #5F9EFF;
     border-radius: 16px;
-}
+}

+ 0 - 126
TransmitterSwitch/Resource/QSS/importtemplate_light.qss

@@ -1,126 +0,0 @@
-QWidget
-{
-    background: #FFFFFF;
-    border-radius: 8px;
-
-    font-family: 思源黑体R;
-    font-weight: 400;
-    font-size: 14px;
-    color: #3A3F63;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-}
-
-QLabel#label_NC1
-{
-    font-weight: bold;
-    font-size: 18px;
-    color: #3A3F63;
-    line-height: 27px;
-    text-align: left;
-    font-style: normal;
-    text-transform: uppercase;
-}
-
-QLabel#label_NC2,QLabel#label_NC3,QLabel#label_NC4
-{
-    font-weight: 400;
-    font-size: 14px;
-    color: #5A607F;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-}
-
-QLabel#label_line1,QLabel#label_line2,QLabel#label_line3
-{
-    background: #E6E9F4;
-}
-QLabel#label_warning
-{
-    color:red;
-}
-
-QPushButton#pBtn_close
-{
-	border-image: url(:/ICON/ICON/Dialog_close.png);
-}
-
-QPushButton#pBtn_close:hover
-{	
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
-}
-
-
-
-/********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel
-{
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
-}
-QPushButton#pBtn_cancel:hover
-{
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
-}
-
-/********* 带有底色按钮三种状态效果 *********/
-QPushButton#pBtn_ok
-{
-	border-radius: 16px;
-	text-align: center;
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
-    border-radius: 16px;
-}
-
-QPushButton#pBtn_ok:hover
-{
-	border-radius: 16px;
-	text-align: center;
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
-    border-radius: 16px;
-}
-
-/* ==========================================================
- *  QTabelWidget
- * ========================================================== */
-
-QTableWidget
-{
-    background: #FFFFFF;
-    padding-left: 0px;
-    border: 0px solid #E6E9F4;
-    text-align: left;
-}
-
-QTableWidget::item
-{
-    padding-left: 12px;
-    padding-right: 0px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-
-    margin: 0px;
-
-    text-align: left;
-
-    border: 0px solid #E6E9F4;
-}
-
-QTableWidget::item:selected
-{
-    background: rgba(231,236,255,0.5);
-}
-

+ 0 - 109
TransmitterSwitch/Resource/QSS/savetotemplate_light.qss

@@ -1,109 +0,0 @@
-QWidget
-{
-    background: #FFFFFF;
-    border-radius: 8px;
-    font-family: 思源黑体R;
-    font-weight: 400;
-    font-size: 14px;
-    color: #3A3F63;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-}
-
-QLabel#label_NC1
-{
-    font-family: 思源黑体M;
-    font-weight: bold;
-    font-size: 18px;
-    color: #3A3F63;
-    line-height: 27px;
-    text-transform: uppercase;
-}
-
-QLabel#label_line
-{
-    background: #E6E9F4;
-}
-
-QLabel#label_warn
-{
-	color:red;
-}
-
-QPushButton#pBtn_close
-{
-	border-image: url(:/ICON/ICON/Dialog_close.png);
-}
-
-QPushButton#pBtn_close:hover
-{
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
-}
-
-/********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel
-{
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
-}
-QPushButton#pBtn_cancel:hover
-{
-	border-radius: 16px;
-	text-align: center;
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
-}
-
-/********* 带有底色按钮三种状态效果 *********/
-QPushButton#pBtn_ok
-{
-	border-radius: 16px;
-	text-align: center;
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
-    border-radius: 16px;
-}
-
-QPushButton#pBtn_ok:hover
-{
-	border-radius: 16px;
-	text-align: center;
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
-    border-radius: 16px;
-}
-
-/****************  报警红框  ****************/
-QLineEdit
-{
-    background: #FFFFFF;
-    border-radius: 4px;
-    padding-left:12px;
-	border: 1px solid #E6E9F4;
-}
-
-QLineEdit:hover
-{
-    border: 1px solid #4458FE;
-}
-
-
-QLineEdit[Warn=true]
-{
-    border: 1px solid #D21F21;
-}
-
-QLineEdit:!enabled/* 或者disable */
-{
-    background: rgba(0,0,0,0.04);
-    border: 1px solid #E6E9F4;
-}
-
-

+ 0 - 83
TransmitterSwitch/Resource/QSS/warning_light.qss

@@ -1,83 +0,0 @@
-QWidget
-{
-    background: #FFFFFF;
-    border-radius: 8px;
-    font-family: 思源黑体R;
-    font-weight: 400;
-    font-size: 18px;
-    color: #3A3F63;
-    line-height: 21px;
-    text-align: left;
-    font-style: normal;
-}
-
-QLabel#label_NC1
-{
-    font-family: 思源黑体M;
-    font-weight: bold;
-    font-size: 18px;
-    color: #3A3F63;
-    line-height: 27px;
-    text-transform: uppercase;
-}
-
-QLabel#label_line
-{
-    background: #E6E9F4;
-}
-
-QLabel#label_Warn
-{
-	font-family: 思源黑体R;
-	font-weight: 400;
-	font-size: 18px;
-	color: #3A3F63;
-	line-height: 27px;
-}
-
-QPushButton#pBtn_close{
-	border-image: url(:/ICON/ICON/Dialog_close.png);
-}
-QPushButton#pBtn_close:hover{
-	
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
-}
-
-QPushButton
-{
-	background: #FFFFFF;
-	border: 1px solid #E6E9F4;
-	text-align: center;
-}
-
-
-/********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
-}
-QPushButton#pBtn_cancel:hover
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
-}
-
-/********* 带有底色按钮三种状态效果 *********/
-QPushButton#pBtn_ok
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
-    border-radius: 16px;
-}
-
-QPushButton#pBtn_ok:hover
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
-    border-radius: 16px;
-}

+ 17 - 4
TransmitterSwitch/Resource/QSS/white/addnormalitem.qss

@@ -54,12 +54,25 @@ QPushButton
 	font-family: 思源黑体M;
 }
 
-QPushButton#pBtn_Close{
-	image: url(:/ICON/ICON/Dialog_close.png);
+QPushButton#pBtn_Close
+{
+	/* image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Light.png);
+    qproperty-iconSize: 20px 20px;
+
+    /* border: 1px solid #E6E9F4; */
 }
-QPushButton#pBtn_Close:hover
+QPushButton#pBtn_Close[Hover = true]
 {
-	image: url(:/ICON/ICON/Dialog_close2.png);
+	/* image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+
+    border: 1px solid #438EFF;
 }
 
 /********* 普通方框按钮三种状态效果 *********/

+ 17 - 4
TransmitterSwitch/Resource/QSS/white/addspecialitem.qss

@@ -49,12 +49,25 @@ QPushButton
 	font-family: 思源黑体M;
 }
 
-QPushButton#pBtn_Close{
-	image: url(:/ICON/ICON/Dialog_close.png);
+QPushButton#pBtn_Close
+{
+	/* image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Light.png);
+    qproperty-iconSize: 20px 20px;
+
+    /* border: 1px solid #E6E9F4; */
 }
-QPushButton#pBtn_Close:hover
+QPushButton#pBtn_Close[Hover = true]
 {
-	image: url(:/ICON/ICON/Dialog_close2.png);
+	/* image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+
+    border: 1px solid #438EFF;
 }
 
 /********* 普通方框按钮三种状态效果 *********/

+ 34 - 5
TransmitterSwitch/Resource/QSS/white/importtemplate.qss

@@ -12,7 +12,22 @@ QWidget
     font-style: normal;
 }
 
-QLabel#label_NC1
+QWidget#widget
+{
+    background-color: #FFFFFF;
+}
+
+QWidget#widget_Top
+{
+    background: #FFFFFF;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-bottom: 1px solid #E6E9F4;
+}
+
+QLabel#label_title
 {
     font-weight: bold;
     font-size: 18px;
@@ -33,7 +48,7 @@ QLabel#label_NC2,QLabel#label_NC3,QLabel#label_NC4
     font-style: normal;
 }
 
-QLabel#label_line1,QLabel#label_line2,QLabel#label_line3
+QLabel#label_line2, #label_line3
 {
     background: #E6E9F4;
 }
@@ -44,12 +59,26 @@ QLabel#label_warning
 
 QPushButton#pBtn_close
 {
-	border-image: url(:/ICON/ICON/Dialog_close.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Light.png);
+    qproperty-iconSize: 20px 20px;
+
+    text-align: center;
+    border: 0px solid #438EFF;
 }
 
-QPushButton#pBtn_close:hover
+QPushButton#pBtn_close[Hover = true]
 {	
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+    text-align: center;
+
+    border: 1px solid #438EFF;
 }
 
 

+ 2 - 5
TransmitterSwitch/Resource/QSS/white/oneitem.qss

@@ -45,20 +45,17 @@ QPushButton#pBtn_close
     border: 1px solid #E6E9F4;
     qproperty-icon: url(:/ICON/ICON/Close_Light.png);
     qproperty-iconSize: 20px 20px;
-    /* border-image: url(:/ICON/ICON/Close_Light.png) 0 0 0 0 stretch stretch; */
 }
 
-QPushButton#pBtn_close:hover
+QPushButton#pBtn_close[Hover = true]
 {
     background-color: #FFFFFF;
     border-radius: 2px 2px 2px 2px;
     padding-left: 6px;
 
-    border: 1px solid #4458FE;
+    border: 1px solid #438EFF;
     qproperty-icon: url(:/ICON/ICON/Close_pass.png);
     qproperty-iconSize: 20px 20px;
-    /* border-image: url(:/ICON/ICON/Close_pass.png) 0 0 0 0 stretch stretch; */
-
 }
 
 /* 执行时间 */

+ 28 - 9
TransmitterSwitch/Resource/QSS/white/savetotemplate.qss

@@ -11,7 +11,17 @@ QWidget
     font-style: normal;
 }
 
-QLabel#label_NC1
+QWidget#widget_Top
+{
+    background: #FFFFFF;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-bottom: 1px solid #E6E9F4;
+}
+
+QLabel#label_title
 {
     font-family: 思源黑体M;
     font-weight: bold;
@@ -21,11 +31,6 @@ QLabel#label_NC1
     text-transform: uppercase;
 }
 
-QLabel#label_line
-{
-    background: #E6E9F4;
-}
-
 QLabel#label_warn
 {
 	color:red;
@@ -33,12 +38,26 @@ QLabel#label_warn
 
 QPushButton#pBtn_close
 {
-	border-image: url(:/ICON/ICON/Dialog_close.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Light.png);
+    qproperty-iconSize: 20px 20px;
+
+    text-align: center;
 }
 
-QPushButton#pBtn_close:hover
+QPushButton#pBtn_close[Hover = true]
 {
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+
+    text-align: center;
+
+    border: 1px solid #438EFF;
 }
 
 /********* 普通方框按钮三种状态效果 *********/

+ 33 - 5
TransmitterSwitch/Resource/QSS/white/warning.qss

@@ -1,6 +1,6 @@
 QWidget
 {
-    background: #FFFFFF;
+    background: transparent;
     border-radius: 8px;
     font-family: 思源黑体R;
     font-weight: 400;
@@ -11,7 +11,22 @@ QWidget
     font-style: normal;
 }
 
-QLabel#label_NC1
+QWidget#widget
+{
+    background: #FFFFFF;
+}
+
+QWidget#widget_Top
+{
+    background: #FFFFFF;
+    border-top-left-radius: 8px;
+    border-top-right-radius: 8px;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+    border-bottom: 1px solid #E6E9F4;
+}
+
+QLabel#label_title
 {
     font-family: 思源黑体M;
     font-weight: bold;
@@ -42,11 +57,24 @@ QLabel#label_Warn
 }
 
 QPushButton#pBtn_close{
-	border-image: url(:/ICON/ICON/Dialog_close.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_Light.png);
+    qproperty-iconSize: 20px 20px;
+    padding-left: 0px;
+    border: 0px solid #E6E9F4;
 }
-QPushButton#pBtn_close:hover{
+QPushButton#pBtn_close[Hover = true]
+{
 	
-	border-image: url(:/ICON/ICON/Dialog_close2.png);
+	/* border-image: url(:/ICON/ICON/Dialog_close2.png); */
+    background: transparent;
+    border-radius: 4px;
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px;
+    padding-left: 0px;
+    border: 1px solid #438EFF;
 }
 
 QPushButton

+ 49 - 18
TransmitterSwitch/Template/importtemplate.cpp

@@ -11,6 +11,7 @@
 #include "lhstylemanager.h"
 #include "LHQLogAPI.h"
 #include "oneshadow.h"
+#include "TransmitterSwitchInfo.h"
 
 ImportTemplate::ImportTemplate(QStringList& tabList,QWidget *parent) :
     QDialog(parent),
@@ -30,7 +31,6 @@ ImportTemplate::ImportTemplate(QStringList& tabList,QWidget *parent) :
     //     this->setStyleSheet(styleSheet);
     //     file.close();
     // }
-    setQSS();
     /* 创建阴影 */
     QSize size = this->size();
     size.setWidth(size.width() - 32);
@@ -87,6 +87,9 @@ ImportTemplate::ImportTemplate(QStringList& tabList,QWidget *parent) :
         createRow(i,i + 1,tabList.at(i));
     }
 
+    /* 注册事件过滤器 */
+    ui->pBtn_close->installEventFilter(this);
+
 }
 
 ImportTemplate::~ImportTemplate()
@@ -115,6 +118,7 @@ void ImportTemplate::do_seletctRow(int row, int col)
     {
         /* 弹出框提示确定要删除 */
         Warning w(this);
+        w.setQSS(EPConfig.getQSSPath());
         w.setText("是否删除模板?");
         bool flag = false;
         connect(&w,&Warning::signal_ok,this,[&](){
@@ -142,6 +146,9 @@ void ImportTemplate::do_seletctRow(int row, int col)
 /* 创建一行数据 */
 void ImportTemplate::createRow(int row,int num,const QString &text)
 {
+    /* 获取亮色还是暗色 */
+    bool isDark = (LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eBlackStyle ? true : false);
+
     QTableWidgetItem* item = new QTableWidgetItem;
     item->setData(Qt::DisplayRole,num);
     // item->setTextAlignment(Qt::AlignVCenter);
@@ -153,33 +160,33 @@ void ImportTemplate::createRow(int row,int num,const QString &text)
 
     item = new QTableWidgetItem("删除");
     // item->setTextAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
-    item->setForeground(Qt::blue);
+    if(isDark)
+    {
+        item->setForeground(QColor(95, 158, 255));
+    }else {
+        item->setForeground(Qt::blue);
+    }
     ui->tableWidget->setItem(row,2,item);
 }
 
 /* 设置QSS */
-void ImportTemplate::setQSS()
+void ImportTemplate::setQSSPath(const QString& qssPath)
 {
-    auto appPath = QApplication::applicationDirPath();
-    QString qssPath;
-    if(LHStyleManager::Instance()->GetCurSkinStyle() == eWhiteStyle)
-    {
-        qssPath = appPath + "/white/importtemplate.qss";
-        
-    }else if(LHStyleManager::Instance()->GetCurSkinStyle() == eBlackStyle)
+    if(qssPath.isEmpty())
     {
-        qssPath = appPath + "/black/importtemplate.qss";
+        return;
     }
-    QFile file(qssPath);
-    if(file.open(QIODevice::ReadOnly))
+    QString qssFile = qssPath + "/importtemplate.qss";
+    QFile file(qssFile);
+    if(file.open(QFile::ReadOnly))
     {
-        QString stylesheet = file.readAll();
-        this->setStyleSheet(stylesheet);
+        QString styleSheet = file.readAll();
+        this->setStyleSheet(styleSheet);
         file.close();
-    } else
+    }else 
     {
-        LH_WRITE_ERROR(QString("打开文件失败:%1").arg(file.fileName()));
-    }
+        LH_WRITE_ERROR(QString("Open %1 failed").arg(qssFile));
+    }   
 }
 
 /* 绘画事件 */
@@ -190,3 +197,27 @@ void ImportTemplate::paintEvent(QPaintEvent *event)
     painter.drawImage(QPoint(0, 0), m_shadow->image());
 }
 
+/* 事件过滤器 */
+bool ImportTemplate::eventFilter(QObject *watched, QEvent *event)
+{
+    if(watched == ui->pBtn_close)
+    {
+        if(event->type() == QEvent::Enter)
+        {
+            ui->pBtn_close->setProperty("Hover", true);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+
+            return true;
+        }else if(event->type() == QEvent::Leave)
+        {
+            ui->pBtn_close->setProperty("Hover", false);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+
+            return true;
+        }
+    }
+    return QWidget::eventFilter(watched,event);
+}
+

+ 5 - 2
TransmitterSwitch/Template/importtemplate.h

@@ -26,7 +26,7 @@ public:
     QString getTemplateName() const { return m_templateName; }
 
     /* 设置QSS */
-    void setQSS();
+    void setQSSPath(const QString& qssPath);
     
 signals:
     /* 选择一个模版 */
@@ -36,11 +36,14 @@ signals:
 
 private slots:
     void do_ok();
-    void do_seletctRow(int row,int col);                                    /* 选中一行 */
+    /* 选中一行 */
+    void do_seletctRow(int row,int col);
 
 protected:
     /* 绘画事件 */
     void paintEvent(QPaintEvent *event) override;
+    /* 事件过滤器 */
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private:
     Ui::ImportTemplate *ui;

+ 36 - 39
TransmitterSwitch/Template/importtemplate.ui

@@ -39,45 +39,6 @@ background:transparent;
      <property name="styleSheet">
       <string notr="true"/>
      </property>
-     <widget class="QLabel" name="label_NC1">
-      <property name="geometry">
-       <rect>
-        <x>32</x>
-        <y>18</y>
-        <width>80</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>导入模板</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pBtn_close">
-      <property name="geometry">
-       <rect>
-        <x>396</x>
-        <y>12</y>
-        <width>32</width>
-        <height>32</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_line1">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>56</y>
-        <width>444</width>
-        <height>1</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
      <widget class="QLabel" name="label_line2">
       <property name="geometry">
        <rect>
@@ -192,6 +153,42 @@ background:transparent;
        <string>TextLabel</string>
       </property>
      </widget>
+     <widget class="QWidget" name="widget_Top" native="true">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>444</width>
+        <height>56</height>
+       </rect>
+      </property>
+      <widget class="QPushButton" name="pBtn_close">
+       <property name="geometry">
+        <rect>
+         <x>396</x>
+         <y>12</y>
+         <width>32</width>
+         <height>32</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label_title">
+       <property name="geometry">
+        <rect>
+         <x>32</x>
+         <y>18</y>
+         <width>80</width>
+         <height>18</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>导入模板</string>
+       </property>
+      </widget>
+     </widget>
     </widget>
    </item>
   </layout>

+ 30 - 13
TransmitterSwitch/Template/savetotemplate.cpp

@@ -28,7 +28,6 @@ SaveToTemplate::SaveToTemplate(QWidget *parent) :
     //     this->setStyleSheet(styleSheet);
     //     file.close();
     // }
-    setQSS();
     /* 创建阴影,这里大小使用最外面的大小减去阴影宽度 */
     QSize size = this->size();
     size.setWidth(size.width() - 32);
@@ -45,6 +44,9 @@ SaveToTemplate::SaveToTemplate(QWidget *parent) :
     connect(ui->pBtn_close,SIGNAL(clicked()),this,SLOT(close()));
     connect(ui->pBtn_cancel,SIGNAL(clicked()),this,SLOT(close()));
     connect(ui->pBtn_ok,SIGNAL(clicked()),this,SLOT(do_ok()));
+
+    /* 注册事件过滤器 */
+    ui->pBtn_close->installEventFilter(this);
 }
 
 SaveToTemplate::~SaveToTemplate()
@@ -79,19 +81,10 @@ QString SaveToTemplate::getTemplateName()
 }
 
 /* 设置QSS */
-void SaveToTemplate::setQSS()
+void SaveToTemplate::setQSS(QString qssPath)
 {
-    auto appPath = QApplication::applicationDirPath();
-    QString qssPath;
-    if(LHStyleManager::Instance()->GetCurSkinStyle() == eWhiteStyle)
-    {
-        qssPath = appPath + "/white/savetotemplate.qss";
-        
-    }else if(LHStyleManager::Instance()->GetCurSkinStyle() == eBlackStyle)
-    {
-        qssPath = appPath + "/black/savetotemplate.qss";
-    }
-    QFile file(qssPath);
+    QString qssFile = qssPath + "/savetotemplate.qss";
+    QFile file(qssFile);
     if(file.open(QIODevice::ReadOnly))
     {
         QString stylesheet = file.readAll();
@@ -174,3 +167,27 @@ void SaveToTemplate::paintEvent(QPaintEvent *event)
     painter.setRenderHint(QPainter::Antialiasing);
     painter.drawImage(QPoint(0, 0), m_shadow->image());
 }
+
+
+bool SaveToTemplate::eventFilter(QObject *watched, QEvent *event)
+{
+    if(watched == ui->pBtn_close)
+    {
+        if(event->type() == QEvent::Enter)
+        {
+            ui->pBtn_close->setProperty("Hover", true);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+
+            return true;
+        }else if(event->type() == QEvent::Leave)
+        {
+            ui->pBtn_close->setProperty("Hover", false);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+
+            return true;
+        }
+    }
+    return QWidget::eventFilter(watched,event);
+}

+ 3 - 1
TransmitterSwitch/Template/savetotemplate.h

@@ -33,7 +33,7 @@ public:
     QString getTemplateName();
 
     /* 设置QSS */
-    void setQSS();
+    void setQSS(QString qssPath);
 
 signals:
     void signal_templateName(QString name);
@@ -47,6 +47,8 @@ private:
 protected:
     /* 绘画事件 */
     void paintEvent(QPaintEvent *event) override;
+    /* 事件过滤器 */
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private:
     Ui::SaveToTemplate *ui;

+ 36 - 39
TransmitterSwitch/Template/savetotemplate.ui

@@ -39,45 +39,6 @@ background:transparent;
      <property name="styleSheet">
       <string notr="true"/>
      </property>
-     <widget class="QLabel" name="label_NC1">
-      <property name="geometry">
-       <rect>
-        <x>32</x>
-        <y>18</y>
-        <width>110</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>保存为模版</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_line">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>56</y>
-        <width>416</width>
-        <height>1</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pBtn_close">
-      <property name="geometry">
-       <rect>
-        <x>368</x>
-        <y>12</y>
-        <width>32</width>
-        <height>32</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
      <widget class="QLabel" name="label_NC3_x">
       <property name="geometry">
        <rect>
@@ -164,6 +125,42 @@ background:transparent;
        <string/>
       </property>
      </widget>
+     <widget class="QWidget" name="widget_Top" native="true">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>416</width>
+        <height>56</height>
+       </rect>
+      </property>
+      <widget class="QLabel" name="label_title">
+       <property name="geometry">
+        <rect>
+         <x>32</x>
+         <y>18</y>
+         <width>110</width>
+         <height>18</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>保存为模版</string>
+       </property>
+      </widget>
+      <widget class="QPushButton" name="pBtn_close">
+       <property name="geometry">
+        <rect>
+         <x>368</x>
+         <y>12</y>
+         <width>32</width>
+         <height>32</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </widget>
     </widget>
    </item>
   </layout>

+ 25 - 1
TransmitterSwitch/TransmitterSwitchInfo.cpp

@@ -1,6 +1,6 @@
 #include "TransmitterSwitchInfo.h"
 
-
+#include "lhstylemanager.h"
 
 
 ExecPlanItemInfo::ExecPlanItemInfo()
@@ -181,4 +181,28 @@ void MapDevice::deleteDevice(const QString& devName)
 }
 
 
+ExecPlanGlobalConfig::ExecPlanGlobalConfig()
+{
+    m_qssPath = "";
+}
+
+/* 设置样式表路径 */
+void ExecPlanGlobalConfig::setQSSPath(const QString& qssPath)
+{
+    m_qssPath = qssPath;
+}
+
+/* 获取样式表路径 */
+QString ExecPlanGlobalConfig::getQSSPath()
+{
+    if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eWhiteStyle)
+    {
+        return m_qssPath + m_lightQSS;
+    }
+    else if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eBlackStyle)
+    {
+        return m_qssPath + m_darkQSS;
+    }
+    return QString();
+}
 

+ 32 - 0
TransmitterSwitch/TransmitterSwitchInfo.h

@@ -162,5 +162,37 @@ private:
 #define DeviceContainer MapDevice::getInstance()
 
 
+/**
+ * @brief 执行计划页面的全局配置信息
+ * 
+ */
+class ExecPlanGlobalConfig
+{
+    ExecPlanGlobalConfig();
+    ExecPlanGlobalConfig(const ExecPlanGlobalConfig& config) = delete;
+    ExecPlanGlobalConfig& operator=(const ExecPlanGlobalConfig& config) = delete;
+public:
+    ~ExecPlanGlobalConfig() {}
+
+    static ExecPlanGlobalConfig& getInstance()
+    {
+        static ExecPlanGlobalConfig config;
+        return config;
+    }
+
+    /* 设置样式表路径 */
+    void setQSSPath(const QString& qssPath);
+    /* 获取样式表路径 */
+    QString getQSSPath();
+
+private:
+    QString m_qssPath;                      /* 样式表路径 */
+    const QString m_lightQSS = "/white";    /* 亮色样式表路径 */
+    const QString m_darkQSS = "/black";     /* 暗色样式表路径 */
+
+};
+
+#define EPConfig ExecPlanGlobalConfig::getInstance()
+
 
 #endif /* TRANSMITTERSWITCHINFO_H */

+ 1 - 1
TransmitterSwitch/WidgetItems/widgetitems.cpp

@@ -42,7 +42,7 @@ void WidgetItems::setDayType(bool isSpecial)
         ui->label_devName->move(112, 12);
         ui->label_execDate->move(388, 12);
         ui->label_execTime->move(536, 12);
-        ui->label_action->move(648, 12);
+        ui->label_action->move(684, 12);
         ui->label_operate->move(960, 12);
     }else
     {

+ 2 - 1
TransmitterSwitch/common/combobox/customcombobox.h

@@ -7,6 +7,7 @@
  * @brief 1、使用此类绘制下拉框阴影需要在样式表中设置QAbstractItemView {margin: LISTVIEW_MARGIN;}
  *          否则阴影会被遮挡
  *        2、调用函数setViewShadowEffect()设置下拉框阴影
+ *        3、调用setViewShadowEffect()前,需要先设置样式表
  */
 class CustomComboBox : public QComboBox
 {
@@ -14,7 +15,7 @@ public:
     explicit CustomComboBox(QWidget *parent = nullptr);
     ~CustomComboBox();
 
-    /* 设置下拉框阴影 */
+    /* 设置下拉框阴影,需要先设置样式表,再调用此函数 */
     void setViewShadowEffect();
 
     //重写下拉框弹出位置

+ 0 - 205
TransmitterSwitch/common/warning/warning copy.ui_

@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Warning</class>
- <widget class="QDialog" name="Warning">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>448</width>
-    <height>249</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">QDialog#Warning
-{
-background:transparent;
-}</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>16</number>
-   </property>
-   <property name="topMargin">
-    <number>16</number>
-   </property>
-   <property name="rightMargin">
-    <number>16</number>
-   </property>
-   <property name="bottomMargin">
-    <number>16</number>
-   </property>
-   <item>
-    <widget class="QWidget" name="widget" native="true">
-     <property name="styleSheet">
-      <string notr="true">QWidget{
-background: #FFFFFF;
-border-radius: 8px;
-font-family: 思源黑体R;
-font-weight: 400;
-font-size: 18px;
-color: #3A3F63;
-line-height: 21px;
-text-align: left;
-font-style: normal;
-}
-
-QLabel#label_NC1
-{
-font-family: 思源黑体M;
-font-weight: bold;
-font-size: 18px;
-color: #3A3F63;
-line-height: 27px;
-text-transform: uppercase;
-}
-
-QLabel#label_line
-{
-background: #E6E9F4;
-}
-
-QLabel#label_Warn
-{
-	
-}
-
-QPushButton#pBtn_close{
-	border-image: url(:/ESM-8C_ICON/Dialog_close.png);
-}
-QPushButton#pBtn_close:hover{
-	
-	border-image: url(:/ESM-8C_ICON/Dialog_close2.png);
-}
-
-QPushButton
-{
-	background: #FFFFFF;
-	border: 1px solid #E6E9F4;
-	text-align: center;
-}
-
-
-/********* 普通方框按钮三种状态效果 *********/
-QPushButton#pBtn_cancel
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #E6E9F4;
-    color: #3A3F63;
-}
-QPushButton#pBtn_cancel:hover
-{
-    background: #FFFFFF;
-    border-radius: 16px;
-    border: 1px solid #4458FE;
-    color: #4458FE;
-}
-
-/********* 带有底色按钮三种状态效果 *********/
-QPushButton#pBtn_ok
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:1 #4F8AFF,stop:0 #4B5EFF);
-    border-radius: 16px;
-}
-
-QPushButton#pBtn_ok:hover
-{
-    color:white;
-    background: qlineargradient( x0:1,x1:1,y1:0,y2:0,stop:0 #5D73FF,stop:1 #6092FF);
-    border-radius: 16px;
-}
-</string>
-     </property>
-     <widget class="QLabel" name="label_NC1">
-      <property name="geometry">
-       <rect>
-        <x>32</x>
-        <y>18</y>
-        <width>90</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>提示</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_line">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>56</y>
-        <width>416</width>
-        <height>1</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pBtn_close">
-      <property name="geometry">
-       <rect>
-        <x>368</x>
-        <y>12</y>
-        <width>32</width>
-        <height>32</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_Warn">
-      <property name="geometry">
-       <rect>
-        <x>40</x>
-        <y>78</y>
-        <width>331</width>
-        <height>61</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>删除该设备,“执行计划”中与之对应的计划也会删除!</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pBtn_cancel">
-      <property name="geometry">
-       <rect>
-        <x>248</x>
-        <y>153</y>
-        <width>60</width>
-        <height>32</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>取消</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pBtn_ok">
-      <property name="geometry">
-       <rect>
-        <x>324</x>
-        <y>153</y>
-        <width>60</width>
-        <height>32</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>确定</string>
-      </property>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

+ 29 - 14
TransmitterSwitch/common/warning/warning.cpp

@@ -5,6 +5,7 @@
 #include <QLayout>
 #include <QDebug>
 #include <QFile>
+#include <QStyle>
 
 #include "oneshadow.h"
 #include "lhstylemanager.h"
@@ -27,9 +28,6 @@ Warning::Warning(QWidget *parent) :
     //     this->setStyleSheet(styleSheet);
     //     file.close();
     // }
-    /* 设置QSS */
-    setQSS();
-
 
     /* 设置文字自动换行 */
     ui->label_Warn->setWordWrap(true);
@@ -46,6 +44,8 @@ Warning::Warning(QWidget *parent) :
     connect(ui->pBtn_close,SIGNAL(clicked()),this,SLOT(close()));
     connect(ui->pBtn_cancel,SIGNAL(clicked()),this,SLOT(close()));
     connect(ui->pBtn_ok,SIGNAL(clicked()),this,SLOT(do_ok()));
+    /* 注册事件过滤器 */
+    ui->pBtn_close->installEventFilter(this);
 }
 
 Warning::~Warning()
@@ -74,18 +74,10 @@ void Warning::setTextWithOneButton(const QString &text)
 }
 
 /* 设置QSS */
-void Warning::setQSS()
+void Warning::setQSS(const QString& qssPath)
 {
-    QString appPath = QApplication::applicationDirPath();
-    QString qssPath;
-    if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eWhiteStyle)
-    {
-        qssPath = appPath + "/white/warning.qss";
-    }else if (LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eBlackStyle)
-    {
-        qssPath = appPath + "/black/warning.qss";
-    }
-    QFile file(qssPath);
+    QString qssFile = qssPath + "/warning.qss";
+    QFile file(qssFile);
     if(file.open(QIODevice::ReadOnly))
     {
         QString stylesheet = file.readAll();
@@ -105,6 +97,29 @@ void Warning::paintEvent(QPaintEvent *event)
     painter.drawImage(QPoint(0,0),m_shadow->image());
 }
 
+/* 事件过滤器 */
+bool Warning::eventFilter(QObject *watched, QEvent *event)
+{
+    if(watched == ui->pBtn_close)
+    {
+        if(event->type() == QEvent::Enter)
+        {
+            ui->pBtn_close->setProperty("Hover", true);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+            return true;
+        }else if(event->type() == QEvent::Leave)
+        {
+            ui->pBtn_close->setProperty("Hover", false);
+            ui->pBtn_close->style()->unpolish(ui->pBtn_close);
+            ui->pBtn_close->style()->polish(ui->pBtn_close);
+
+            return true;
+        }
+    }
+    return QWidget::eventFilter(watched,event);
+}
+
 
 
 void Warning::do_ok()

+ 3 - 2
TransmitterSwitch/common/warning/warning.h

@@ -21,14 +21,15 @@ public:
     void setTextWithOneButton(const QString& text);     /* 只有一个确定按钮 */
     bool isOk() const { return m_isOk; }
     /* 设置QSS */
-    void setQSS();
-
+    void setQSS(const QString& qssPath);
 
 signals:
     void signal_ok();
 
 protected:
     void paintEvent(QPaintEvent *event);
+    /* 事件过滤器 */
+    bool eventFilter(QObject *watched, QEvent *event);
 
 private slots:
     void do_ok();

+ 36 - 39
TransmitterSwitch/common/warning/warning.ui

@@ -40,45 +40,6 @@ background:transparent;
      <property name="styleSheet">
       <string notr="true"/>
      </property>
-     <widget class="QLabel" name="label_NC1">
-      <property name="geometry">
-       <rect>
-        <x>32</x>
-        <y>18</y>
-        <width>90</width>
-        <height>18</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>提示</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_line">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>56</y>
-        <width>416</width>
-        <height>1</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="pBtn_close">
-      <property name="geometry">
-       <rect>
-        <x>368</x>
-        <y>12</y>
-        <width>32</width>
-        <height>32</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string/>
-      </property>
-     </widget>
      <widget class="QLabel" name="label_Warn">
       <property name="geometry">
        <rect>
@@ -131,6 +92,42 @@ background:transparent;
        <string/>
       </property>
      </widget>
+     <widget class="QWidget" name="widget_Top" native="true">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>408</width>
+        <height>56</height>
+       </rect>
+      </property>
+      <widget class="QPushButton" name="pBtn_close">
+       <property name="geometry">
+        <rect>
+         <x>368</x>
+         <y>12</y>
+         <width>32</width>
+         <height>32</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+      <widget class="QLabel" name="label_title">
+       <property name="geometry">
+        <rect>
+         <x>32</x>
+         <y>18</y>
+         <width>90</width>
+         <height>18</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>提示</string>
+       </property>
+      </widget>
+     </widget>
     </widget>
    </item>
   </layout>

+ 15 - 12
TransmitterSwitch/transmitterswitch.cpp

@@ -76,22 +76,21 @@ TransmitterSwitch::~TransmitterSwitch()
 }
 
 
-/**
- * @brief 设置样式表
- * 
- * @param qssPath 样式表文件路径
- */
-void TransmitterSwitch::setQSS(const QString &qssPath)
+/* 设置样式表路径,给弹窗页面使用,不需要包含最后的white,black */
+void TransmitterSwitch::setQSSPath(const QString &qssPath)
 {
-    QFile file(qssPath);
-    if (!file.open(QFile::ReadOnly))
+    if(qssPath.isEmpty())
     {
-        LH_WRITE_ERROR("TransmitterSwitch Open qss file failed: " + qssPath);
         return;
     }
-    m_styleSheet = file.readAll();
-    this->setStyleSheet(m_styleSheet);
-    file.close();
+    /* 去掉最后的“/” */
+    if(qssPath.endsWith("/"))
+    {
+        EPConfig.setQSSPath(qssPath.left(qssPath.length() - 1));
+    } else
+    {
+        EPConfig.setQSSPath(qssPath);
+    }
 }
 
 /**
@@ -215,6 +214,7 @@ void TransmitterSwitch::do_pBtnAddExecPlan()
     {
         std::shared_ptr<AddNormalItem> atf = std::make_shared<AddNormalItem>(this);
         atf->setParentPointer(this);
+        atf->setQSS(EPConfig.getQSSPath());
         /* 设置可选项 */
         atf->setDevice(DeviceContainer.getMapDevice());
         /* 设置是周几 */
@@ -233,6 +233,7 @@ void TransmitterSwitch::do_pBtnAddExecPlan()
         /* 特殊日 */
         std::shared_ptr<AddSpecialItem> atf = std::make_shared<AddSpecialItem>(this);
         atf->setParentPointer(this);
+        atf->setQSS(EPConfig.getQSSPath());
         /* 设置可选项 */
         atf->setDevice(DeviceContainer.getMapDevice());
         /* 设置是周几 */
@@ -388,6 +389,7 @@ void TransmitterSwitch::do_importData()
     // tabList << "模板1" << "模板2" << "模板3" << "模板4" << "模板5";
     m_fromWebAPI->getTemplateList(tabList);
     std::shared_ptr<ImportTemplate> itf = std::make_shared<ImportTemplate>(tabList, this);
+    itf->setQSSPath(EPConfig.getQSSPath());
 
     /* 连接信号和槽 */
     connect(itf.get(), &ImportTemplate::signal_deleteTemplate, this, &TransmitterSwitch::do_deleteTemplate);
@@ -431,6 +433,7 @@ void TransmitterSwitch::do_importData()
 void TransmitterSwitch::do_exportData()
 {
     std::shared_ptr<SaveToTemplate> stt = std::make_shared<SaveToTemplate>(this);
+    stt->setQSS(EPConfig.getQSSPath());
     int weekDay = ui->stackedWidget_items->currentIndex();
     /* 设置周几 */
     stt->setWeekDay(weekDay);

+ 3 - 3
TransmitterSwitch/transmitterswitch.h

@@ -21,11 +21,11 @@ public:
     explicit TransmitterSwitch(QWidget *parent = nullptr);
     ~TransmitterSwitch();
 
-    /* 设置样式表 */
-    void setQSS(const QString &qssPath);
+    /* 设置样式表路径,给弹窗页面使用,不需要包含最后的white,black */
+    void setQSSPath(const QString &qssPath);
     /* 设置WebAPI信息 */
     void setWebAPIInfo(const QString &url, const QString &serverID, const QString &serverKey);
-    /* 获取EQM数据库计划 */
+    /* 获取EQM数据库中的计划 */
     void getExecPlanFromEQM();
     /* 将计划保存到EQM数据库 */
     void saveExecPlanToEQM();

+ 2 - 1
show1/widget.cpp

@@ -25,7 +25,8 @@ Widget::Widget(QWidget *parent) :
     m_layout->setSpacing(0);
 
     /* 设置参数 */
-    // m_tSwitch->setQSS(":/QSS/QSS/TransmitterSwitch_dark.qss");
+    QString qssPath = QApplication::applicationDirPath();
+    m_tSwitch->setQSSPath(qssPath);
 
     /* 初始化WebAPI */
     m_tSwitch->setWebAPIInfo("http://192.1.3.133:31000/v6/", "2e36b53ccd2a433b9a803b98d683ed91", "TMS");