V0.6

1、完成了时间选择器和日期选择控件的亮色和暗色皮肤
2、完成了全部的亮色UI，完成了部分的暗色UI

TransmitterSwitch/AddItem/addnormalitem.ui

@@ -49,19 +49,6 @@
         <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="QLabel" name="label_NC2_x">
          <property name="geometry">
           <rect>
@@ -88,32 +75,6 @@
           <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 class="QLabel" name="label_NC4">
-         <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_cancel">
          <property name="geometry">
           <rect>
@@ -280,12 +241,45 @@
           <string>00:00:00</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>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>368</x>
+            <y>12</y>
+            <width>32</width>
+            <height>32</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </widget>
         <zorder>label_iconTime</zorder>
-        <zorder>label_NC1</zorder>
         <zorder>label_NC2_x</zorder>
         <zorder>label_NC3</zorder>
-        <zorder>pBtn_Close</zorder>
-        <zorder>label_NC4</zorder>
         <zorder>pBtn_cancel</zorder>
         <zorder>pBtn_ok</zorder>
         <zorder>label_timeWarn</zorder>
@@ -298,6 +292,7 @@
         <zorder>label_devWarn</zorder>
         <zorder>label_actionWarn</zorder>
         <zorder>pBtn_selectTime</zorder>
+        <zorder>widget_Top</zorder>
        </widget>
       </item>
      </layout>

TransmitterSwitch/AddItem/addspecialitem.ui

@@ -64,19 +64,6 @@
         <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="QLabel" name="label_NC2_x">
          <property name="geometry">
           <rect>
@@ -103,32 +90,6 @@
           <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 class="QLabel" name="label_NC4">
-         <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_cancel">
          <property name="geometry">
           <rect>
@@ -334,6 +295,42 @@
           <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>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>368</x>
+            <y>12</y>
+            <width>32</width>
+            <height>32</height>
+           </rect>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </widget>
        </widget>
       </item>
      </layout>

TransmitterSwitch/Resource/QSS/white/calendarnav.qss → TransmitterSwitch/Resource/QSS/black/SelectDate/calendarnav.qss

@@ -1,3 +1,17 @@
+
+
+QWidget
+{
+	color: rgba(255,255,255,0.9);
+	background-color: #747578;
+}
+
+
+QPushButton
+{
+	background: transparent;
+}
+
 QPushButton#btnPrevYear::hover
 {
 	image: url(:/Calendar/icon/light/preYear.png);
@@ -46,5 +60,5 @@ QLabel
 {
 	font-size: 14px;
 	font-weight: 500;
-	color: #3A3F63;
+	/* color: #3A3F63; */
 }

TransmitterSwitch/Resource/QSS/black/SelectTime/timepartwidget.qss

@@ -0,0 +1,64 @@
+
+
+QWidget
+{
+    border-radius: 0px;
+    background: #373639;
+}
+
+QListWidget
+{
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 400;
+    color: rgba(255,255,255,0.9);
+	border: none;
+	border-right: 1px solid rgba(0, 0, 0, 0.06);
+	background: #747578;
+	outline: 0px;
+}
+QListView::item:hover 
+{
+	/* background-color: rgb(245,245,245); */
+    background-color: rgb(227, 238, 255);
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 400;
+    color: "#3A3F63";
+}
+
+QListView::item:selected 
+{
+	/* background-color: rgb(227, 238, 255); */
+    background-color: #438EFF;
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 500;
+    color: rgba(255,255,255,0.9);
+	outline: none;
+}
+
+QScrollBar:vertical
+{
+	border:none;
+    background-color: #e2e2e2;
+    width: 4px;
+}
+
+QScrollBar::handle:vertical
+{
+	background: #e2e2e2;
+    border-radius: 2px;
+}
+
+QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical
+{
+	background: #ffffff;/*transparent;*/
+    border: none;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
+{
+	background: #ffffff;/*transparent;*/
+    border: none;
+}

TransmitterSwitch/Resource/QSS/black/SelectTime/timewidget.qss

@@ -0,0 +1,19 @@
+QPushButton
+{
+	border-image: url(:/images/datetime.png);
+}
+QPushButton[selected=true]
+{
+	border-image: url(:/images/datetime.png);
+}
+QPushButton::hover[selected=true]
+{
+	border-image: url(:/images/cancle.png);
+}
+
+QDateTimeEdit
+{
+	border: 0px solid #D8D8D8;
+}
+
+

TransmitterSwitch/Resource/QSS/black/addnormalitem.qss

@@ -7,12 +7,12 @@ QWidget
     font-family: 思源黑体R;
     font-weight: 400;
     font-size: 14px;
-    color: #3A3F63;
+    color: #D2D2D2;
     line-height: 21px;
     text-align: left;
     font-style: normal;
     border-radius: 8px;
-    background: #FFFFFF;
+    background: transparent;
 }
 
 QWidget#widget
@@ -21,20 +21,33 @@ QWidget#widget
     /* background: rgba(255,255,255,1); */
 }
 
-QLabel#label_NC1
+QWidget#widget_background
+{
+    /* background-color: #2E2D31; */
+    background-color: #313539;
+    /* background-color: #5C5E61; */
+}
+
+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
 {
+    background: transparent;
     font-weight: bold;
     font-size: 18px;
-    color: #3A3F63;
+    color: #EBEBEB;
     line-height: 27px;
     text-align: left;
     font-style: normal;
     text-transform: uppercase;
 }
-QLabel#label_NC4
-{
-    background: #E6E9F4;
-}
 
 QPushButton
 {
@@ -42,28 +55,39 @@ QPushButton
 	font-family: 思源黑体M;
 }
 
-QPushButton#pBtn_Close{
-	image: url(:/ICON/ICON/Dialog_close.png);
+QPushButton#pBtn_Close
+{
+    border-image: url(:/ICON/ICON/Dialog_close.png);
+    /* background-color: #313539; */
+    /* border: 1px solid rgba(255,255,255,0.25); */
+
+    /* qproperty-icon: url(:/ICON/ICON/Close_Dark.png);
+    qproperty-iconSize: 20px 20px; */
 }
 QPushButton#pBtn_Close:hover
 {
-	image: url(:/ICON/ICON/Dialog_close2.png);
+    border-image: url(:/ICON/ICON/Dialog_close2.png);
+    /* background-color: #313539;
+    border: 1px solid #438EFF;
+
+    qproperty-icon: url(:/ICON/ICON/Close_pass.png);
+    qproperty-iconSize: 20px 20px; */
 }
 
 /********* 普通方框按钮三种状态效果 *********/
 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);
 }
 
 
@@ -71,14 +95,14 @@ QPushButton#pBtn_cancel:hover
 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;
 }
 
@@ -99,12 +123,12 @@ QLabel#label_devWarn,QLabel#label_timeWarn,QLabel#label_actionWarn
 
 QComboBox:enabled
 {
-    background-color:#FFFFFF;
-    border: 1px solid #E6E9F4;
+    background: transparent;
+    border: 1px solid rgba(255,255,255,0.15);
     border-radius: 4px;
     font-size:14px;
     font-weight: 400;
-    color:#3A3F63;
+    color:#D2D2D2;
     padding-left: 12px;
 }
 
@@ -122,7 +146,7 @@ QComboBox:!enabled
 
 QComboBox:hover
 {
-    border: 1px solid #4458FE;
+    border: 1px solid #438EFF;
     border-radius: 4px;
     background:transparent;
 }
@@ -144,11 +168,11 @@ QComboBox::down-arrow
 /* 下拉条样式，就是view，整个下拉窗体的样式 */
 QComboBox QAbstractItemView
 {
-    background-color: #FFFFFF;
+    background-color: #5C5E61;
     margin: 12px;
     outline:0px;
     font-size:14px;
-    color: #3A3F63;
+    /* color: #3A3F63; */
     border-radius: 4px;
 }
 
@@ -156,24 +180,26 @@ QComboBox QAbstractItemView
 /* m_comBoxDev->setView(new QListView()); */
 QComboBox QAbstractItemView::item
 {
-    background-color: #FFFFFF;
+    background-color: #5C5E61;
     border-radius:4px;
-    color: #3A3F63;
+    color: #D2D2D2;
     padding-left: 12px;
     height: 32px;
 }
 
 QComboBox QAbstractItemView::item:hover
 {
+    color: #FFFFFF;
     border-radius:4px;
-    background-color: #EEF2FF;
+    background-color: #438EFF;
 }
 
-/* QComboBox QAbstractItemView::item:selected
+QComboBox QAbstractItemView::item:selected
 {
+    color: #FFFFFF;
     border-radius:4px;
-    background-color: #EEF2FF;
-} */
+    background-color: #438EFF;
+}
 
 /******** combobox 滚动条  *********/
 QComboBox QScrollBar::vertical{ /*主体部分*/
@@ -208,36 +234,23 @@ 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]
+TimeWidget
 {
-	background: transparent;
+    /* background: transparent; */
+    background: #373639;
     border-radius: 4px;
     padding-left:12px;
-    border: 1px solid #D21F21;
-}
-
-TimeWidget:!enabled
-{
-    background: rgba(0,0,0,0.04);
-    border: 1px solid #E6E9F4;
+    border: 1px solid #438EFF;
 }
 
 QPushButton#pBtn_selectTime
 {
     background: transparent;
-    border: 1px solid #E6E9F4;
+    border: 1px solid rgba(255,255,255,0.15);
     border-radius: 4px;
     font-size: 14px;
     font-weight: 400;
-    color: #3A3F63;
     padding-left: 12px;
     text-align: left;
 }
@@ -245,11 +258,10 @@ QPushButton#pBtn_selectTime
 QPushButton#pBtn_selectTime:hover
 {
     background: transparent;
-    border: 1px solid #4458FE;
+    border: 1px solid #438EFF;
     border-radius: 4px;
     font-size: 14px;
     font-weight: 400;
-    color: #4458FE;
     padding-left: 12px;
     text-align: left;
 }
@@ -262,13 +274,7 @@ QPushButton#pBtn_selectTime[Warn=true]
     border: 1px solid #D21F21;
 }
 
-TimeWidget
-{
-    /* background: transparent; */
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #4458FE;
-}
+
 
 /* TimeWidget QPushButton
 {

TransmitterSwitch/Resource/QSS/black/addspecialitem.qss

@@ -7,12 +7,12 @@ QWidget
     font-family: 思源黑体R;
     font-weight: 400;
     font-size: 14px;
-    color: #3A3F63;
+    color: #D2D2D2;
     line-height: 21px;
     text-align: left;
     font-style: normal;
     border-radius: 8px;
-    background: #FFFFFF;
+    background: transparent;
 }
 
 QWidget#widget
@@ -21,20 +21,31 @@ QWidget#widget
     /* background: rgba(255,255,255,1); */
 }
 
-QLabel#label_NC1
+QWidget#widget_background
+{
+    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
 {
+    background: transparent;
     font-weight: bold;
     font-size: 18px;
-    color: #3A3F63;
+    color: #EBEBEB;
     line-height: 27px;
     text-align: left;
     font-style: normal;
     text-transform: uppercase;
 }
-QLabel#label_NC4
-{
-    background: #E6E9F4;
-}
 
 QPushButton
 {
@@ -53,17 +64,17 @@ QPushButton#pBtn_Close:hover
 /********* 普通方框按钮三种状态效果 *********/
 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);
 }
 
 
@@ -71,14 +82,14 @@ QPushButton#pBtn_cancel:hover
 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;
 }
 
@@ -99,12 +110,12 @@ QLabel#label_devWarn,QLabel#label_timeWarn,QLabel#label_actionWarn
 
 QComboBox:enabled
 {
-    background-color:#FFFFFF;
-    border: 1px solid #E6E9F4;
+    background: transparent;
+    border: 1px solid rgba(255,255,255,0.15);
     border-radius: 4px;
     font-size:14px;
     font-weight: 400;
-    color:#3A3F63;
+    color:#D2D2D2;
     padding-left: 12px;
 }
 
@@ -122,7 +133,7 @@ QComboBox:!enabled
 
 QComboBox:hover
 {
-    border: 1px solid #4458FE;
+    border: 1px solid #438EFF;
     border-radius: 4px;
     background:transparent;
 }
@@ -144,11 +155,11 @@ QComboBox::down-arrow
 /* 下拉条样式，就是view，整个下拉窗体的样式 */
 QComboBox QAbstractItemView
 {
-    background-color: #FFFFFF;
+    background-color: #5C5E61;
     margin: 12px;
     outline:0px;
     font-size:14px;
-    color: #3A3F63;
+    /* color: #3A3F63; */
     border-radius: 4px;
 }
 
@@ -156,24 +167,26 @@ QComboBox QAbstractItemView
 /* m_comBoxDev->setView(new QListView()); */
 QComboBox QAbstractItemView::item
 {
-    background-color: #FFFFFF;
+    background-color: #5C5E61;
     border-radius:4px;
-    color: #3A3F63;
+    color: #D2D2D2;
     padding-left: 12px;
     height: 32px;
 }
 
 QComboBox QAbstractItemView::item:hover
 {
+    color: #FFFFFF;
     border-radius:4px;
-    background-color: #EEF2FF;
+    background-color: #438EFF;
 }
 
-/* QComboBox QAbstractItemView::item:selected
+QComboBox QAbstractItemView::item:selected
 {
+    color: #FFFFFF;
     border-radius:4px;
-    background-color: #EEF2FF;
-} */
+    background-color: #438EFF;
+}
 
 /******** combobox 滚动条  *********/
 QComboBox QScrollBar::vertical{ /*主体部分*/
@@ -210,34 +223,20 @@ QPushButton#pBtn_iconTime
 
 TimeWidget
 {
-	background: transparent;
+    /* background: transparent; */
+    background: #373639;
     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;
+    border: 1px solid #438EFF;
 }
 
 QPushButton#pBtn_selectTime
 {
     background: transparent;
-    border: 1px solid #E6E9F4;
+    border: 1px solid rgba(255,255,255,0.15);
     border-radius: 4px;
     font-size: 14px;
     font-weight: 400;
-    color: #3A3F63;
     padding-left: 12px;
     text-align: left;
 }
@@ -245,11 +244,10 @@ QPushButton#pBtn_selectTime
 QPushButton#pBtn_selectTime:hover
 {
     background: transparent;
-    border: 1px solid #4458FE;
+    border: 1px solid #438EFF;
     border-radius: 4px;
     font-size: 14px;
     font-weight: 400;
-    color: #4458FE;
     padding-left: 12px;
     text-align: left;
 }
@@ -273,15 +271,23 @@ QPushButton#btn_tip
 
 CalendarDTEdit
 {
-	background: #FFFFFF;
+	background: transparent;
     border-radius: 4px;
     padding-left:12px;
-    border: 1px solid #E6E9F4;
+    border: 1px solid rgba(255,255,255,0.15);
+}
+
+CalendarDTEdit:hover
+{
+	background: transparent;
+    border-radius: 4px;
+    padding-left:12px;
+    border: 1px solid #438EFF;
 }
 
 CalendarDTEdit[Warn=true]
 {
-	background: #FFFFFF;
+	background: transparent;
     border-radius: 4px;
     padding-left:12px;
     border: 1px solid #D21F21;

TransmitterSwitch/Resource/QSS/black/transmitterswitch.qss

@@ -236,7 +236,7 @@ TimeWidget
 
 CDate
 {
-	background: #FFFFFF;
+	background: transparent;
     border-radius: 4px;
     padding-left:12px;
     border: 1px solid #E6E9F4;

TransmitterSwitch/Resource/QSS/white/SelectTime/timepartwidget.qss

@@ -0,0 +1,54 @@
+QListWidget
+{
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 400;
+    color: "#3A3F63";
+	border: none;
+	border-right: 1px solid rgba(0, 0, 0, 0.06);
+	background: #ffffff;
+	outline: 0px;
+}
+QListView::item:hover 
+{
+	background-color: rgb(245,245,245);
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 400;
+    color: "#3A3F63";
+}
+
+QListView::item:selected 
+{
+	background-color: rgb(227, 238, 255);
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 500;
+    color: "#3A3F63";
+	outline: none;
+}
+
+QScrollBar:vertical
+{
+	border:none;
+    background-color: #e2e2e2;
+    width: 4px;
+}
+
+QScrollBar::handle:vertical
+{
+	background: #e2e2e2;
+    border-radius: 2px;
+}
+
+QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical
+{
+	background: #ffffff;/*transparent;*/
+    border: none;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
+{
+	background: #ffffff;/*transparent;*/
+    border: none;
+}

TransmitterSwitch/Resource/QSS/white/SelectTime/timewidget.qss

@@ -0,0 +1,17 @@
+QPushButton
+{
+	border-image: url(:/images/datetime.png);
+}
+QPushButton[selected=true]
+{
+	border-image: url(:/images/datetime.png);
+}
+QPushButton::hover[selected=true]
+{
+	border-image: url(:/images/cancle.png);
+}
+
+QDateTimeEdit
+{
+	border: 0px solid #D8D8D8;
+}

TransmitterSwitch/Resource/QSS/white/addnormalitem.qss

@@ -12,7 +12,7 @@ QWidget
     text-align: left;
     font-style: normal;
     border-radius: 8px;
-    background: #FFFFFF;
+    /* background: transparent; */
 }
 
 QWidget#widget
@@ -21,7 +21,22 @@ QWidget#widget
     /* background: rgba(255,255,255,1); */
 }
 
-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;
+}
+
+QWidget#widget_background
+{
+    background-color: #FFFFFF;
+}
+
+QLabel#label_title
 {
     font-weight: bold;
     font-size: 18px;
@@ -31,10 +46,7 @@ QLabel#label_NC1
     font-style: normal;
     text-transform: uppercase;
 }
-QLabel#label_NC4
-{
-    background: #E6E9F4;
-}
+
 
 QPushButton
 {
@@ -208,28 +220,37 @@ QLabel#label_iconTime
 	border-image: url(:/ICON/ICON/Time.png);
 }
 
-TimeWidget
+/* TimeWidget
 {
 	background: transparent;
     border-radius: 4px;
     padding-left:12px;
     border: 1px solid #E6E9F4;
-}
+} */
 
-TimeWidget[Warn=true]
+/* TimeWidget[Warn=true]
 {
 	background: transparent;
     border-radius: 4px;
     padding-left:12px;
     border: 1px solid #D21F21;
-}
+} */
 
-TimeWidget:!enabled
+/* TimeWidget:!enabled
 {
     background: rgba(0,0,0,0.04);
     border: 1px solid #E6E9F4;
+} */
+
+TimeWidget
+{
+    /* background: transparent; */
+    border-radius: 4px;
+    padding-left:12px;
+    border: 1px solid #4458FE;
 }
 
+
 QPushButton#pBtn_selectTime
 {
     background: transparent;
@@ -249,7 +270,7 @@ QPushButton#pBtn_selectTime:hover
     border-radius: 4px;
     font-size: 14px;
     font-weight: 400;
-    color: #4458FE;
+    color: #3A3F63;
     padding-left: 12px;
     text-align: left;
 }
@@ -262,13 +283,6 @@ QPushButton#pBtn_selectTime[Warn=true]
     border: 1px solid #D21F21;
 }
 
-TimeWidget
-{
-    /* background: transparent; */
-    border-radius: 4px;
-    padding-left:12px;
-    border: 1px solid #4458FE;
-}
 
 /* TimeWidget QPushButton
 {

TransmitterSwitch/Resource/QSS/white/addspecialitem.qss

@@ -21,7 +21,17 @@ QWidget#widget
     /* background: rgba(255,255,255,1); */
 }
 
-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-weight: bold;
     font-size: 18px;
@@ -31,10 +41,7 @@ QLabel#label_NC1
     font-style: normal;
     text-transform: uppercase;
 }
-QLabel#label_NC4
-{
-    background: #E6E9F4;
-}
+
 
 QPushButton
 {
@@ -249,7 +256,7 @@ QPushButton#pBtn_selectTime:hover
     border-radius: 4px;
     font-size: 14px;
     font-weight: 400;
-    color: #4458FE;
+    color: #3A3F63;
     padding-left: 12px;
     text-align: left;
 }
@@ -279,6 +286,14 @@ CalendarDTEdit
     border: 1px solid #E6E9F4;
 }
 
+CalendarDTEdit:hover
+{
+	background: #FFFFFF;
+    border-radius: 4px;
+    padding-left:12px;
+    border: 1px solid #4458FE;
+}
+
 CalendarDTEdit[Warn=true]
 {
 	background: #FFFFFF;

TransmitterSwitch/Resource/QSS/white/oneitem.qss

@@ -35,7 +35,7 @@ QLabel#label_num
 }
 
 
-
+/*  设置图标并设置缩放 */
 QPushButton#pBtn_close
 {
     background-color: #FFFFFF;
@@ -45,6 +45,7 @@ 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
@@ -56,6 +57,8 @@ QPushButton#pBtn_close:hover
     border: 1px solid #4458FE;
     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; */
+
 }
 
 /* 执行时间 */
@@ -102,24 +105,24 @@ QPushButton#pBtn_iconDate
 
 QComboBox
 {
-	background-color: #313539;
+	background-color: #FFFFFF;
 	border-radius: 4px;
-	border: 1px solid #313539;
+	border: 1px solid #E6E9F4;
 	font-weight: 400;
 	font-size: 14px;
-	color: #D2D2D2;
+	color: #3A3F63;
 	padding-left: 12px;
 }
 QComboBox:hover, QComboBox:on 
 {
-	border: 1px solid #438EFF;
+	border: 1px solid #4458FE;
 }
 /*下拉箭头样式*/
 QComboBox::down-arrow
 {
 	height: 16px;
 	width: 16px;
-	image: url(:/ICON/ICON/DownArrow_Dark.png);
+	image: url(:/ICON/ICON/DownArrow_Light.png);
 }
 QComboBox::drop-down
 {
@@ -129,35 +132,35 @@ QComboBox::drop-down
 /* 下拉后，整个下拉窗体样式 */
 QComboBox QAbstractItemView
 {
+    background-color: #FFFFFF;
 	margin: 12px;
 	font-size: 14px;
-	background-color: #5C5E61;
 	outline:0px;
 	border-radius: 4px;
 }
 /* 下拉后，整个下拉窗体每项的样式 */
 QComboBox QAbstractItemView::item 
 {
+    color: #3A3F63;
+    background-color: #FFFFFF;
     border-radius: 4px;
-	color: #D2D2D2;
     height: 32px;
-	background-color: #5C5E61;
 	font-weight: 400;
 	font-size: 14px;
 	padding-left: 12px;
 }
 QComboBox QAbstractItemView::item:hover 
 {
+    color: #3A3F63;
 	font-weight: 400;
-    color: #FFFFFF;
-	background-color: #438EFF;
+	background-color: #EEF2FF;
 }
-QComboBox QAbstractItemView::item:selected 
+/* QComboBox QAbstractItemView::item:selected 
 {
 	font-weight: 400;
     color: #FFFFFF;
-	background-color: #438EFF;
-}
+	background-color: #EEF2FF;
+} */
 
 
 /*=====================================================================

TransmitterSwitch/Resource/TransSwitch.qrc

@@ -27,7 +27,7 @@
         <file>ICON/Time.png</file>
         <file>ICON/date_dark.png</file>
         <file>ICON/date_light.png</file>
-        <file>ICON/DownArrow.png</file>
+        <file>ICON/DownArrow_Light.png</file>
         <file>ICON/Close_Dark.png</file>
         <file>ICON/Close_Light.png</file>
         <file>ICON/Close_pass.png</file>

TransmitterSwitch/common/SelectTime/QSS/timepartwidget.qss

@@ -0,0 +1,54 @@
+QListWidget
+{
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 400;
+    color: "#3A3F63";
+	border: none;
+	border-right: 1px solid rgba(0, 0, 0, 0.06);
+	background: #ffffff;
+	outline: 0px;
+}
+QListView::item:hover 
+{
+	background-color: rgb(245,245,245);
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 400;
+    color: "#3A3F63";
+}
+
+QListView::item:selected 
+{
+	background-color: rgb(227, 238, 255);
+	font-family:"Source Han Sans CN";
+    font-size: 14px;
+    font-weight: 500;
+    color: "#3A3F63";
+	outline: none;
+}
+
+QScrollBar:vertical
+{
+	border:none;
+    background-color: #e2e2e2;
+    width: 4px;
+}
+
+QScrollBar::handle:vertical
+{
+	background: #e2e2e2;
+    border-radius: 2px;
+}
+
+QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical
+{
+	background: #ffffff;/*transparent;*/
+    border: none;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
+{
+	background: #ffffff;/*transparent;*/
+    border: none;
+}

TransmitterSwitch/common/SelectTime/QSS/timewidget.qss

@@ -0,0 +1,12 @@
+QPushButton
+{
+	border-image: url(:/images/datetime.png);
+}
+QPushButton[selected=true]
+{
+	border-image: url(:/images/datetime.png);
+}
+QPushButton::hover[selected=true]
+{
+	border-image: url(:/images/cancle.png);
+}

TransmitterSwitch/common/SelectTime/timepartwidget.cpp

@@ -5,7 +5,10 @@
 #include <QDateTime>
 #include <QMouseEvent>
 #include <QDebug>
+#include <QFile>
 #include "mytimedelegate.h"
+#include "lhstylemanager.h"
+#include "LHQLogApi.h"
 
 TimePartWidget::TimePartWidget(QWidget *parent) :
     QWidget(parent),
@@ -35,6 +38,8 @@ TimePartWidget::TimePartWidget(TimePartWidget::emSection type, QWidget* parent)
         connect(ui->listWidget->verticalScrollBar(), &QScrollBar::rangeChanged, m_pListBar.data(), &QScrollBar::setRange);
         connect(m_pListBar.data(), &QScrollBar::valueChanged, ui->listWidget->verticalScrollBar(), &QScrollBar::setValue);
     }
+    /* 设置QSS */
+    setQSS();
 
     switch (type) {
     case MINUTE:
@@ -96,6 +101,32 @@ void TimePartWidget::ScrollToSelect()
     }
 }
 
+/* 设置QSS */
+void TimePartWidget::setQSS()
+{
+    QString appPath = QCoreApplication::applicationDirPath();
+    QString qssPath;
+    if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eWhiteStyle)
+    {
+        qssPath = appPath + "/white/SelectTime/timepartwidget.qss";
+    }
+    else if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eBlackStyle)
+    {
+        qssPath = appPath + "/black/SelectTime/timepartwidget.qss";
+    }
+
+    QFile file(qssPath);
+    if(file.open(QFile::ReadOnly))
+    {
+        QString styleSheet = QLatin1String(file.readAll());
+        setStyleSheet(styleSheet);
+        file.close();
+    }else 
+    {
+        LH_WRITE_ERROR("open qss file failed: " + qssPath);
+    }
+}
+
 void TimePartWidget::enterEvent(QEvent *event)
 {
     if (!m_pListBar.isNull()) {

TransmitterSwitch/common/SelectTime/timepartwidget.h

@@ -30,6 +30,10 @@ public:
     void SetTime(const QDateTime& dt);
     void SetMaxWidth(int w);
     void ScrollToSelect();
+
+    /* 设置QSS */
+    void setQSS();
+
 protected:
     void enterEvent(QEvent* event) override;
     void leaveEvent(QEvent* event) override;

TransmitterSwitch/common/SelectTime/timepartwidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>56</width>
+    <width>116</width>
     <height>192</height>
    </rect>
   </property>
@@ -50,57 +50,7 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">QListWidget
-{
-	font-family:&quot;Source Han Sans CN&quot;;
-    font-size: 14px;
-    font-weight: 400;
-    color: &quot;#3A3F63&quot;;
-	border: none;
-	border-right: 1px solid rgba(0, 0, 0, 0.06);
-	background: #ffffff;
-	outline: 0px;
-}
-QListView::item:hover {
-	background-color: rgb(245,245,245);
-	font-family:&quot;Source Han Sans CN&quot;;
-    font-size: 14px;
-    font-weight: 400;
-    color: &quot;#3A3F63&quot;;
-}
-QListView::item:selected {
-	background-color: rgb(227, 238, 255);
-	font-family:&quot;Source Han Sans CN&quot;;
-    font-size: 14px;
-    font-weight: 500;
-    color: &quot;#3A3F63&quot;;
-	outline: none;
-}
-
-QScrollBar:vertical
-{
-	border:none;
-    background-color: #e2e2e2;
-    width: 4px;
-}
-QScrollBar::handle:vertical
-{
-	background: #e2e2e2;
-    border-radius: 2px;
-}
-
-QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical
-{
-	background: #ffffff;/*transparent;*/
-    border: none;
-}
-
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
-{
-	background: #ffffff;/*transparent;*/
-    border: none;
-}
-</string>
+      <string notr="true"/>
      </property>
     </widget>
    </item>

TransmitterSwitch/common/SelectTime/timewidget.cpp

@@ -4,8 +4,11 @@
 #include <QMouseEvent>
 #include <QDebug>
 #include <QSizePolicy>
+#include <QFile>
 #include "timepartwidget.h"
 #include "shadowwidget.h"
+#include "lhstylemanager.h"
+#include "LHQLogApi.h"
 
 TimeWidget::TimeWidget(QWidget *parent , ShowType type) :
     QFrame(parent),
@@ -221,6 +224,32 @@ void TimeWidget::setEditLine(int w, int h)
     this->resize(w, h);
 }
 
+/* 设置QSS */
+void TimeWidget::setQSS()
+{
+    QString appPath = QCoreApplication::applicationDirPath();
+    QString qssPath;
+    if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eWhiteStyle)
+    {
+        qssPath = appPath + "/white/SelectTime/timewidget.qss";
+    }
+    else if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eBlackStyle)
+    {
+        qssPath = appPath + "/black/SelectTime/timewidget.qss";
+    }
+
+    QFile file(qssPath);
+    if(file.open(QFile::ReadOnly))
+    {
+        QString styleSheet = QLatin1String(file.readAll());
+        setStyleSheet(styleSheet);
+        file.close();
+    }else 
+    {
+        LH_WRITE_ERROR("open qss file failed: " + qssPath);
+    }
+}
+
 /**
  * @brief 点击提示信息
  */
@@ -463,6 +492,8 @@ void TimeWidget::CreatePopupWidget()
 /* 初始化函数 */
 void TimeWidget::Init()
 {
+    /* 设置QSS */
+    setQSS();
     // InitUI
     ui->dateTimeEdit->hide();
     ui->dateTimeEdit->installEventFilter(this);

TransmitterSwitch/common/SelectTime/timewidget.h

@@ -69,6 +69,9 @@ public:
     void setDefaultStyle();
     /* 设置编辑栏大小 */
     void setEditLine(int w, int h);
+
+    /* 设置QSS */
+    void setQSS();
 signals:
     void signal_nowTime(const QTime& time);
     void signal_formerTimer(const QTime& time);

TransmitterSwitch/common/SelectTime/timewidget.ui

@@ -67,18 +67,7 @@
       </size>
      </property>
      <property name="styleSheet">
-      <string notr="true">QPushButton
-{
-	border-image: url(:/images/datetime.png);
-}
-QPushButton[selected=true]
-{
-	border-image: url(:/images/datetime.png);
-}
-QPushButton::hover[selected=true]
-{
-	border-image: url(:/images/cancle.png);
-}</string>
+      <string notr="true"/>
      </property>
      <property name="text">
       <string/>

TransmitterSwitch/common/date/calendarheader.cpp

@@ -2,6 +2,9 @@
 #include "ui_calendarheader.h"
 #include "PaintHelper/painthelper.h"
 #include "StyleManager/lhstylemanager.h"
+#include "LHQLogAPI.h"
+
+#include <QFile>
 
 CalendarHeader::CalendarHeader(QWidget *parent) :
     QWidget(parent),
@@ -34,7 +37,24 @@ void CalendarHeader::SetFirstDayOfWeek(Qt::DayOfWeek dayOfWeek)
 /* 设置QSS */
 void CalendarHeader::setQSS()
 {
-
+    QString qssPath;
+    if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eWhiteStyle)
+    {
+        qssPath = ":/Calendar/qss/calendarheader_light.qss";
+    } 
+    else if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eBlackStyle)
+    {
+        qssPath = ":/Calendar/qss/calendarheader_dark.qss";
+    }
+    QFile qssFile(qssPath);
+    if(qssFile.open(QFile::ReadOnly))
+    {
+        QString qss = qssFile.readAll();
+        setStyleSheet(qss);
+        qssFile.close();
+    }else {
+        LH_WRITE_ERROR("open qss file failed, path: " + qssPath);
+    }
 }
 
 void CalendarHeader::paintEvent(QPaintEvent *)

TransmitterSwitch/common/date/calendarnav.cpp

@@ -69,10 +69,12 @@ void CalendarNav::setQSS()
     QString qssFile;
     if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eWhiteStyle)
     {
-        qssFile = qssPath + "/white/calendarnav.qss";
+        // qssFile = qssPath + "/white/SelectDate/calendarnav.qss";
+        qssFile = ":/Calendar/qss/CalendarNav_light.qss";
     }else if(LHStyleManager::Instance()->GetCurSkinStyle() == SkinStyle::eBlackStyle)
     {
-        qssFile = qssPath + "/black/calendarnav.qss";
+        // qssFile = qssPath + "/black/SelectDate/calendarnav.qss";
+        qssFile = ":/Calendar/qss/CalendarNav_dark.qss";
     }
     QFile file(qssFile);
     if(file.open(QIODevice::ReadOnly))

TransmitterSwitch/common/date/calendarwidgetex.cpp

@@ -83,6 +83,10 @@ CalendarWidgetEx::CalendarWidgetEx(QWidget *parent)
 
     connect(this, &QCalendarWidget::clicked, this, &CalendarWidgetEx::OnClicked);
     initSkinColor();
+
+    /* 设置对象名称，加载QSS */
+    // this->setObjectName("calendarWidget");
+    this->setStyleSheet("background-color:transparent;");
 }
 
 
@@ -206,7 +210,7 @@ void CalendarWidgetEx::paintEvent(QPaintEvent *)
 
     //边框和背景
     painter.setPen(Qt::transparent);
-    painter.setBrush(QColor(255, 255, 255));
+    painter.setBrush(m_bgBrushColor);
     QRect rc(rect());
     painter.DrawRoundedRect(rc, WINDOW_RADIUS);
 
@@ -218,12 +222,14 @@ void CalendarWidgetEx::paintEvent(QPaintEvent *)
         QRectF tmpRc(1, 0, WINDOW_WIDTH - WINDOW_RADIUS, 40);
         path.addRoundedRect(tmpRc, WINDOW_RADIUS, WINDOW_RADIUS);
         path.addRect(QRectF(tmpRc.x(), tmpRc.y() + WINDOW_RADIUS, tmpRc.width(), tmpRc.height()));
-        painter.fillPath(path, QColor(255, 255, 255));
+        // painter.fillPath(path, QColor(255, 255, 255));
+        painter.fillPath(path, m_bgBrushColor);
         //分割线
         QWidget* pNav = vBodyLayout->itemAt(0)->widget();
         if (nullptr != pNav) {
             int h = pNav->mapTo(this, pNav->rect().bottomRight()).y();
-            painter.SetPenOnly(QColor(0, 0, 0, 23));
+            // painter.SetPenOnly(QColor(0, 0, 0, 23));
+            painter.setPen(m_bgPenColor);
             painter.drawLine(QPoint(0, h), QPoint(width(), h));
         }
     }
@@ -311,6 +317,8 @@ void CalendarWidgetEx::initSkinColor()
         m_splitLineColor = SPLIT_LINE_BRIGHT;
         m_selectBlockColor = SELECT_BRIGHT;
         m_hoverBlockColor = HOVER_BRIGHT;
+        m_bgBrushColor = BG_BRUSH_BRIGHT;
+        m_bgPenColor = BG_PEN_BRIGHT;
         break;
     case eBlackStyle:
         m_normalTextColor = NORMAL_TEXT_DEEP;
@@ -320,7 +328,8 @@ void CalendarWidgetEx::initSkinColor()
         m_splitLineColor = SPLIT_LINE_DEEP;
         m_selectBlockColor = SELECT_DEEP;
         m_hoverBlockColor = HOVER_DEEP;
-        
+        m_bgBrushColor = BG_BRUSH_DEEP;
+        m_bgPenColor = BG_PEN_DEEP;
         break;
     default:
         break;

TransmitterSwitch/common/date/calendarwidgetex.h

@@ -38,6 +38,7 @@ public:
     QList<QDate> GetSelectDays(){return m_listMultiSelectDays;}
 
     void hideNavigatioinButton(bool bPreYear, bool bPreMon, bool bNextYear, bool bNextMon);
+
 private:
     QDate dateForCell(int row, int column) const;
     QDate referenceDate() const;
@@ -62,26 +63,29 @@ private:
     const QColor SPLIT_LINE_BRIGHT{QColor(0, 0, 0, 23)};
     const QColor SELECT_BRIGHT{QColor(68, 88, 254)};
     const QColor HOVER_BRIGHT{QColor(227, 238, 255)};
+    const QColor BG_BRUSH_BRIGHT{QColor(255,255,255)};      /* 背景 */
+    const QColor BG_PEN_BRIGHT{QColor(0, 0, 0, 23)};        /* 线条 */
+
     /* 暗色 */
     const QColor NORMAL_TEXT_DEEP{QColor(255,255,255,230)};
-    const QColor TODAY_TEXT_DEEP{Qt::white};
-    const QColor SELECT_TEXT_DEEP{Qt::white};
+    const QColor TODAY_TEXT_DEEP{Qt::black};
+    const QColor SELECT_TEXT_DEEP{Qt::black};
     const QColor DISABLE_TEXT_DEEP{QColor(255,255,255,77)};
     const QColor SPLIT_LINE_DEEP{QColor(255,255,255,64)};
     const QColor SELECT_DEEP{QColor(233, 161, 18)};
     const QColor HOVER_DEEP{QColor(132, 134, 136)};
     
     const QColor TODAY_DEEP{QColor(67, 142, 255)};
-    const QColor BG_PEN_DEEP{QColor(255,255,255,51)};
-    const QColor BG_BRUSH_DEEP{QColor{116,117,120}};
-    const QColor BG_SPECIAL_PEN_DEEP{QColor{27, 186, 102}};
+    const QColor BG_PEN_DEEP{QColor(255,255,255,51)};       /* 线条 */
+    const QColor BG_BRUSH_DEEP{QColor{116,117,120}};        /* 背景 */
+    const QColor BG_SPECIAL_PEN_DEEP{QColor{27, 186, 102}}; 
     const QColor BG_SPECIAL_BRUSH_DEEP{QColor{78, 112, 97}};
 
 
 
-    const int DEFAULT_FONT_SIZE = 14;
+    const int DEFAULT_FONT_SIZE = 16;
     const int TEXT_WIDTH = 24;
-    const qreal WINDOW_RADIUS = 2.0;
+    const qreal WINDOW_RADIUS = 4.0;
     const int WINDOW_WIDTH = 325;
     const int WINDOW_HEIGHT = 350;
 
@@ -98,5 +102,7 @@ private:
     QColor m_splitLineColor;
     QColor m_selectBlockColor;
     QColor m_hoverBlockColor;
+    QColor m_bgBrushColor;          /* 背景画刷 */
+    QColor m_bgPenColor;            /* 背景画笔 */
 };
 #endif // QCUSTOMCALENDARWIDGET_H

TransmitterSwitch/common/date/qss/CalendarNav_dark.qss

@@ -1,9 +1,17 @@
 
+
 QWidget
 {
+	color: rgba(255,255,255,0.9);
 	background-color: #747578;
 }
 
+
+QPushButton
+{
+	background: transparent;
+}
+
 QPushButton#btnPrevYear::hover
 {
 	image: url(:/Calendar/icon/dark/preYear.png);
@@ -52,5 +60,5 @@ QLabel
 {
 	font-size: 14px;
 	font-weight: 500;
-	color: #3A3F63;
+	/* color: #3A3F63; */
 }

TransmitterSwitch/common/date/qss/CalendarNav_light.qss

@@ -1,44 +1,44 @@
 QPushButton#btnPrevYear::hover
 {
-	image: url(:/Calendar/image/preYear.png);
+	image: url(:/Calendar/icon/light/preYear.png);
 	border:none;
 }
 QPushButton#btnPrevYear
 {
-	image: url(:/Calendar/image/preYear_hover.png);
+	image: url(:/Calendar/icon/light/preYear_hover.png);
 	border:none;
 }
 
 QPushButton#btnPrevMonth::hover
 {
-	image: url(:/Calendar/image/preMonth.png);
+	image: url(:/Calendar/icon/light/preMonth.png);
 	border:none;
 }
 QPushButton#btnPrevMonth
 {
-	image: url(:/Calendar/image/preMonth_hover.png);
+	image: url(:/Calendar/icon/light/preMonth_hover.png);
 	border:none;
 }
 
 QPushButton#btnNextMonth::hover
 {
-	image: url(:/Calendar/image/nextMonth.png);
+	image: url(:/Calendar/icon/light/nextMonth.png);
 	border:none;
 }
 QPushButton#btnNextMonth
 {
-	image: url(:/Calendar/image/nextMonth_hover.png);
+	image: url(:/Calendar/icon/light/nextMonth_hover.png);
 	border:none;
 }
 
 QPushButton#btnNextYear::hover
 {
-	image: url(:/Calendar/image/nextYear.png);
+	image: url(:/Calendar/icon/light/nextYear.png);
 	border:none;
 }
 QPushButton#btnNextYear
 {
-	image: url(:/Calendar/image/nextYear_hover.png);
+	image: url(:/Calendar/icon/light/nextYear_hover.png);
 	border:none;
 }
 

TransmitterSwitch/common/date/qss/calendarheader_dark.qss

@@ -0,0 +1,6 @@
+
+QWidget
+{
+    background: transparent;
+    color: rgba(255,255,255,0.9);
+}

TransmitterSwitch/common/date/qss/calendarheader_light.qss

@@ -0,0 +1,6 @@
+
+QWidget
+{
+    background: transparent;
+    color: #3A3F63;
+}

TransmitterSwitch/common/date/rescalendar.qrc

@@ -18,5 +18,7 @@
         <file>icon/dark/preYear_hover.png</file>
         <file>qss/CalendarNav_light.qss</file>
         <file>qss/CalendarNav_dark.qss</file>
+        <file>qss/calendarheader_light.qss</file>
+        <file>qss/calendarheader_dark.qss</file>
     </qresource>
 </RCC>

TransmitterSwitch/transmitterswitch.cpp

@@ -308,6 +308,8 @@ void TransmitterSwitch::do_editExecTime(QTime t)
     tw->setTimeAreaWidth(140);
     /* 移动位置，覆盖显示时间的按钮，获取的坐标是相对于Dialog的位置 */
     auto pos = one->mapTo(this, one->getExecTimePos());
+    pos.setX(pos.x() - 1);     /* 去掉阴影的宽度 */
+    pos.setY(pos.y());     /* 去掉阴影的高度 */
     tw->move(pos);
     /* 设置默认的时间 */
     tw->setTime(t);