From 1cf2f45e4660a6ba8ce8f72c9d708efb10dde066 Mon Sep 17 00:00:00 2001
From: zhangxuxutm <951937200@qq.com>
Date: Sun, 3 Sep 2023 20:28:11 +0800
Subject: [PATCH] 0903d

---
 Static/Main.qss                               |   9 +++++++
 UI/AreaSettingWidget.py                       |   2 +-
 UI/DelAreaWidget.py                           |   4 +--
 UI/DeviceWidget.py                            |   2 +-
 UI/MainWindow.py                              |  23 ++++++++++++------
 .../AreaSettingWidget.cpython-310.pyc         | Bin 2347 -> 2461 bytes
 UI/__pycache__/DeviceWidget.cpython-310.pyc   | Bin 2606 -> 2720 bytes
 bin.py                                        |  16 ++++++++++++
 8 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 Static/Main.qss
 create mode 100644 bin.py

diff --git a/Static/Main.qss b/Static/Main.qss
new file mode 100644
index 0000000..e534ace
--- /dev/null
+++ b/Static/Main.qss
@@ -0,0 +1,9 @@
+QMdiSubWindow {
+
+    font-size: 18px;
+    font-weight: bold;
+
+
+
+    }
+
diff --git a/UI/AreaSettingWidget.py b/UI/AreaSettingWidget.py
index 2a2ffb3..62cb8fb 100644
--- a/UI/AreaSettingWidget.py
+++ b/UI/AreaSettingWidget.py
@@ -37,7 +37,7 @@ class AreaSettingWidget(QDialog):
 
 
         layout.addRow(button_box)
-        self.setWindowIcon(QIcon('../Static/zhjt.ico'))
+        self.setWindowIcon(QIcon('Static/zhjt.ico'))
         self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)  # 去掉标题栏的问号
         self.setLayout(layout)
         self.setWindowTitle("通道配置")
diff --git a/UI/DelAreaWidget.py b/UI/DelAreaWidget.py
index 89ee564..985be5b 100644
--- a/UI/DelAreaWidget.py
+++ b/UI/DelAreaWidget.py
@@ -1,6 +1,6 @@
 from PyQt5.QtWidgets import QApplication, QMainWindow, QToolBar, QMdiArea, QAction, QInputDialog, QDialog, QFormLayout, QLineEdit, \
     QMdiSubWindow, QDialogButtonBox, QWidget, QComboBox, QTabBar, QTabWidget, QGridLayout, QLabel, QPushButton, QSpacerItem,QSizePolicy, QCheckBox, QVBoxLayout
-from AreaSettingWidget import AreaSettingWidget
+from UI.AreaSettingWidget import AreaSettingWidget
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QPixmap, QIcon
 import sys
@@ -47,7 +47,7 @@ class DelAreaWidget(QDialog):
         vorlayout.addLayout(layout)
         vorlayout.addWidget(button_box)
 
-        self.setWindowIcon(QIcon('../Static/zhjt.ico'))
+        self.setWindowIcon(QIcon('Static/zhjt.ico'))
         self.setWindowTitle("删除通道")
         self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)#去掉标题栏的问号
         self.setLayout(vorlayout)
diff --git a/UI/DeviceWidget.py b/UI/DeviceWidget.py
index 4c7f506..0632af9 100644
--- a/UI/DeviceWidget.py
+++ b/UI/DeviceWidget.py
@@ -47,7 +47,7 @@ class DeviceDialog(QDialog):
         button_box.rejected.connect(self.reject)
 
         layout.addRow(button_box)
-        self.setWindowIcon(QIcon('../Static/zhjt.ico'))
+        self.setWindowIcon(QIcon('Static/zhjt.ico'))
         self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)  # 去掉标题栏的问号
         self.setLayout(layout)
         self.setWindowTitle("设备信息")
diff --git a/UI/MainWindow.py b/UI/MainWindow.py
index 184acc6..1e825b7 100644
--- a/UI/MainWindow.py
+++ b/UI/MainWindow.py
@@ -7,7 +7,7 @@ from PyQt5.QtWidgets import QApplication, QMainWindow, QToolBar, QMdiArea, QActi
     QMdiSubWindow, QDialogButtonBox, QWidget, QComboBox, QTabBar, QTabWidget, QGridLayout, QLabel, QPushButton, QSpacerItem, QSizePolicy, QHBoxLayout, QTableWidget, QScrollArea
 from PyQt5 import QtCore
 from PyQt5.QtGui import QPixmap, QIcon
-from DeviceWidget import *
+from UI.DeviceWidget import DeviceDialog
 from UI.AreaSettingWidget import AreaSettingWidget
 from UI.DelAreaWidget import DelAreaWidget
 # from model.ProjectModel.AreaManage import Devices, DevicesManange, Area
@@ -15,6 +15,14 @@ from protocol.ModBus.ModBusThread import MyThread
 from utils.DBModels.BaseModel import *
 # from utils.DBModels.ClientModels import DeviceDB
 # from model.ClientModel.Client import Client
+class CommonHelper:
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def readQss(style):
+        with open(style,"r") as f:
+            return f.read()
 
 
 class MainWindow(QMainWindow):
@@ -35,8 +43,10 @@ class MainWindow(QMainWindow):
         self.addToolBar(self.toolbar)
         # self.setWindowState(self.windowState() | QtCore.Qt.WindowMaximized)
         self.action1 = QAction("添加设备", self)
+        self.action1.setObjectName("action1")
         self.action1.triggered.connect(self.createDeciveWidget)
         self.action2 = QAction("开始通讯", self)
+        self.action2.setObjectName("action2")
         self.action2.triggered.connect(self.startProtocol)
 
         self.toolbar.addAction(self.action1)
@@ -47,7 +57,7 @@ class MainWindow(QMainWindow):
         # self.scrollArea.setWidget(self.mdi_area)
 
         self.setCentralWidget(self.mdi_area)
-        self.setWindowIcon(QIcon('../Static/zhjt.ico'))
+        self.setWindowIcon(QIcon('Static/zhjt.ico'))
 
 
         # self.mdi_area.setViewMode(QMdiArea.TabbedView)
@@ -101,7 +111,8 @@ class MainWindow(QMainWindow):
 
 
     def deviceWidget(self, windowTitle):
-        sub_window = AreaQMdiSubWindow()  # 创建一个子窗口
+        sub_window = AreaQMdiSubWindow()# 创建一个子窗口
+        sub_window.setObjectName('sub_window')
         areaLayout1 = QGridLayout()
         areaLayout2 = QGridLayout()
 
@@ -140,7 +151,8 @@ class MainWindow(QMainWindow):
         sub_window.setWindowTitle(windowTitle)
         sub_window.setGeometry(0, 0, 600, 500)
         sub_window.setWidget(scroll_widget)
-        sub_window.setWindowIcon(QIcon('../Static/zhjt.ico'))
+        sub_window.setWindowIcon(QIcon('Static/zhjt.ico'))
+
 
         self.mdi_area.addSubWindow(sub_window)  # 将子窗口添加到MDI区域
         # self.mdi_area.subWindowActivated.connect(self.adjustMdiAreaSize)
@@ -243,11 +255,9 @@ class MainWindow(QMainWindow):
             print(rowAndColumn)
             row = rowAndColumn[0]
             column = rowAndColumn[1]
-            print(row, column)
             if column == 0:
                 for i in range(4):
                     widget = areaLayout.itemAtPosition(row, i).widget()
-                    print(widget)
                     areaLayout.removeWidget(widget)
                     widget.deleteLater()
                     #删除self.areaLabel列表中的对象
@@ -257,7 +267,6 @@ class MainWindow(QMainWindow):
             else:
                 for i in range(4,8):
                     widget = areaLayout.itemAtPosition(row, i).widget()
-                    print(widget)
                     areaLayout.removeWidget(widget)
                     widget.deleteLater()
                     # 删除self.areaLabel列表中的对象
diff --git a/UI/__pycache__/AreaSettingWidget.cpython-310.pyc b/UI/__pycache__/AreaSettingWidget.cpython-310.pyc
index f05111587cc0a62e67c786c67cc45b10613ad5af..d5c89af67b9513b8f2a27a0d342732acdd300e70 100644
GIT binary patch
delta 410
zcmZ22G*_4}pO=@50SE$%zodNR+{ibBiJt?=WdUMmATDNOoV=B(rhWlu30oHXLdIIQ
z8ny*oDI5zK85wF=!J<HREqe_+P?QrQn#H|<r-mVm7s}%U^Z3C$#s#c3tY8+y0)Z02
z6s~4QC{L({VS(^Mh7yr1QGNyo2B@f54Md)wVS#uGH%KsrA(%mvXYyp`Jc&{^paY*T
zT=#U{EHLwF|Fmb@I;!|5v#}^LN=(*ZaS~ulDlI9=&%4E5oLUl+T2V4NlVu?z$7F6+
z4U=1(`PuPMY2M_-yyVmzD7Q!yXfA{h1F-~v1SpJ(^(OnWN^|fqaxsGN<P6pijJlH}
z+5Rz_Opahzl{AKH0~-L=s|*w~nLLd>lg$Jqt2~*N!<tcfvLi=1w;4!)2Siv-KFkrz
QZNbIJ#>l}a#K`go0Dn7SrT_o{

delta 296
zcmbO$yjqAapO=@50SH#-d`Wr3v5{{E6F(b}%L2sCKwNx_Ve(d{nxrhw1za@@S=<X5
z85wF=vv|NfUNDbw0c#B_n8mPwuY^B^qnQ!P6R2TWAh?jBL?}y`pTU6vDk@R~lNU|l
z1c{|E1T$!IP2SI($66(%r>8&Jl|_+JY;rn_)8t(&3mDlZN3&{7p35pJqXu*k8zUPd
zA0rnd8xsWcu<$VQFbXhFzQy{1QFHQXwttKUlTWd$O6mg@7m30NF%U};NEl4!;K*b%
o0COjob67LVPu|Q?&TRw|-~kb)lTA5exlMq^GjcErF|zyt06OzMA^-pY

diff --git a/UI/__pycache__/DeviceWidget.cpython-310.pyc b/UI/__pycache__/DeviceWidget.cpython-310.pyc
index d95df96b49061a643459af43113e530d97238072..78eb6a029867a227ec93937dcdaec63a5f8b3698 100644
GIT binary patch
delta 389
zcmZ1{vOttCpO=@50SJPMzocB_*~sV0#K#TfvH-C&5Eo}mPGq`YzksuZEsK32V=ZS5
z=K`)2!G(;B3^g2JQ4XLeR}B|XR0txP#l3*1h9Qd=%Hsp`_`y8J1*|nd^+3H03j|68
zQ-qrtp*$g=i10#&5|J!Xeg+2ysHj*CM4q2vfq04tNHB#Vm_bu?@*?I75~XZF_dQ>@
z?&-Q&VCK{QY0tKGRPj$PXHjI7m^_okNq{Y>w4@|I?-qM;YDq|HMakq_EDIUAC)coA
zn?!NuXU9XNqj-}O^O93@pxh!6pt%r26vW~O5}+U{cA9*VRiBH8k&6+8`It5{u`w|+
zs!e8Pw_-Hk?7;5G$f!BFiNlah4WvzCGC#W_TahA=?J)TPM+TcFNK|pMAEz~=&g3r6
L3`XtApE<1oA~s<x

delta 272
zcmZ1=x=w^IpO=@50SH#-d`UUay^+tAiH{S=WdUMmATG9<oXB)PDT{LfR}DiJ_d-TS
zh8m769x#s=%wt@@TEhWmF)ZLK;ZG54W`yztY8Vy>E@UVX$`a;haA1Iniqyd5MN@=8
zVkr#444T4|&oN(MtrF7H)1SPJMUhc#@(mWJ$=a+77&#}OVYQyD$R^2XHQAa?pNWrg
za|s(0BctkM4R)Eyww(L|w|LW2O9B#$5_3~aQj3a>Hg95gWMtHs{Ds4iO%>>eB8kb3
m?22qf3P85?<RH!rHVu%d!sG*-){N?t|8Qn7YE4e%vIYQ$&_ap;

diff --git a/bin.py b/bin.py
new file mode 100644
index 0000000..34de450
--- /dev/null
+++ b/bin.py
@@ -0,0 +1,16 @@
+from PyQt5.QtWidgets import QApplication, QStyleFactory
+from UI.MainWindow import MainWindow, CommonHelper
+# from model.ClientModel.Client import Client
+
+import time
+import sys
+
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    # app.setStyle(QStyleFactory.create('Fusion'))
+    app.setStyleSheet(CommonHelper.readQss('static/main.qss'))
+    # Client.initDB()
+    window = MainWindow()
+    window.show()
+    sys.exit(app.exec_())
\ No newline at end of file