From 524424ab23e41944dc3d80116954044032d05d47 Mon Sep 17 00:00:00 2001
From: andy <ranchuan1996@qq.com>
Date: Sun, 29 Oct 2023 22:06:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 updata/float_lable.py | 31 ++++++++++++++++++++++++-------
 updata/scheme_edit.py | 22 ++++++++++++++++++++++
 updata/updata.py      | 13 +++++++++++--
 3 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 updata/scheme_edit.py

diff --git a/updata/float_lable.py b/updata/float_lable.py
index 3f1e6a8..466127a 100644
--- a/updata/float_lable.py
+++ b/updata/float_lable.py
@@ -6,17 +6,33 @@ import sys
 
 
 
+
+_QSS="""
+QWidget {
+    background-color: rgb(245, 180, 245);
+}
+QLabel {
+    font-family: "Microsoft YaHei";
+    font-size: 16px;
+    color: #BDC8E2;
+    background-color: #2E3648;
+    padding-left: 5px;
+}
+QLabel:hover{
+	color: #CDD8F2;
+    background-color: #4E5668;
+}
+"""
+
+
 class floatBox(QWidget):
     def __init__(self,parent:QWidget=None,items:list=None,x:int=0,y:int=0):
         QWidget.__init__(self,parent)
         self.setMouseTracking(True)
         self.setWindowFlags(Qt.WindowType.FramelessWindowHint|Qt.WindowType.NoDropShadowWindowHint|Qt.WindowType.Popup)
-        # self.setWindowFlags(Qt.WindowType.FramelessWindowHint|Qt.WindowType.Popup)
         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
-        # self.setBackgroundRole()
-        self.setStyleSheet ("background-color: rgb(245, 180, 245);")
-        y_size=self._add_items(items)
-        x_size=500
+        self.setStyleSheet (_QSS)
+        x_size,y_size=self._add_items(items)
         desk=QApplication.desktop()
         if(y+y_size>desk.height()):
             y=desk.height()-y_size
@@ -24,13 +40,14 @@ class floatBox(QWidget):
             x=desk.width()-x_size
         self.setGeometry(QRect(x, y, x_size, y_size))
     def _add_items(self,items:list):
+        x_size=500
         if(items is None):
             items=["没有要显示的提示"]
         for i in range(len(items)):
             lable=QLabel(self)
             lable.setText(items[i])
-            lable.setGeometry(QRect(5,5+i*25,500,25))
-        return len(items)*25+10
+            lable.setGeometry(QRect(5,5+i*25,x_size,25))
+        return x_size+10,len(items)*25+10
 
 
 
diff --git a/updata/scheme_edit.py b/updata/scheme_edit.py
new file mode 100644
index 0000000..11f66cf
--- /dev/null
+++ b/updata/scheme_edit.py
@@ -0,0 +1,22 @@
+from PyQt5.QtCore import *
+from PyQt5.QtGui import *
+from PyQt5.QtWidgets import *
+import json
+import sys
+import os
+
+
+
+
+
+class TaskBox(QWidget):
+    def __init__(self,parent:QWidget=None,items:list=None,x:int=0,y:int=0):
+        QWidget.__init__(self,parent)
+        self.setMouseTracking(True)
+        self.setWindowFlags(Qt.WindowType.FramelessWindowHint|Qt.WindowType.NoDropShadowWindowHint|Qt.WindowType.Popup)
+        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
+
+
+
+
+
diff --git a/updata/updata.py b/updata/updata.py
index ca8063d..a8f961e 100644
--- a/updata/updata.py
+++ b/updata/updata.py
@@ -13,6 +13,14 @@ import memory_pic
 
 
 
+_QSS="""
+QListView {
+    border: 1px solid white;
+    border-radius: 3px;
+    show-decoration-selected: 1;
+}
+
+"""
 
 
 
@@ -22,6 +30,7 @@ class updata_dlg(QWidget):
     def __init__(self):
         QWidget.__init__(self)
         self.resize(870, 430)
+        self.setStyleSheet (_QSS)
         self.tab_widget=QTabWidget(self)
         self.setWindowTitle("设备软件升级维护工具")
         self.tab_widget.setGeometry(QRect(0,0,870,430))
@@ -30,14 +39,14 @@ class updata_dlg(QWidget):
         self.tab_widget.setTabPosition(QTabWidget.TabPosition.North)
         self.tab_widget.addTab(widget_ssh,"批检仪/赋码仪主板(SSH)")
         self.tab_widget.addTab(widget_uart,"MCU串口升级")
-        self.tab_widget.setTabShape(QTabWidget.TabShape.Triangular)
+        # self.tab_widget.setTabShape(QTabWidget.TabShape.Triangular)
         self.setWindowFlags(self.windowFlags() &(~ Qt.WindowType.WindowMaximizeButtonHint))
         self.setFixedSize(self.width(), self.height())
 
         Logo = QPixmap()
         Logo.loadFromData(base64.b64decode(memory_pic.icon_ico))
         icon = QIcon()
-        icon.addPixmap(Logo, QIcon.Normal, QIcon.Off)
+        icon.addPixmap(Logo, QIcon.Mode.Normal, QIcon.State.Off)
         self.setWindowIcon(icon)