diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 717ba9ae..a0bdbc60 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,23 +4,19 @@
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
-
-
-
-
+
+
@@ -529,7 +525,14 @@
1699367814847
-
+
+ 1699373594568
+
+
+
+ 1699373594568
+
+
@@ -565,7 +568,6 @@
-
@@ -590,7 +592,8 @@
-
+
+
@@ -604,7 +607,7 @@
file://$PROJECT_DIR$/main.py
- 23
+ 22
diff --git a/app/ImageBox/ui.py b/app/ImageBox/ui.py
index 5894631e..c78039eb 100644
--- a/app/ImageBox/ui.py
+++ b/app/ImageBox/ui.py
@@ -31,7 +31,7 @@ def set_image(self, img_path):
# print(img_size)
img_size = self.scaled_img.size()
x = min(500, max((1000 - img_size.width()) // 2, 0))
- y = min(300, max((600 - img_size.height()) // 2-60, 0))
+ y = min(300, max((600 - img_size.height()) // 2 - 60, 0))
# print(x,y)
self.point = QPoint(x, y)
@@ -97,7 +97,7 @@ def __init__(self):
self.setWindowTitle("Image Viewer")
self.setFixedSize(1000, 600)
- self.setWindowIcon(QIcon('./app/data/icon.png'))
+ self.setWindowIcon(QIcon('./app/data/icons/logo.svg'))
self.zoom_in = QPushButton("")
self.zoom_in.clicked.connect(self.large_click)
self.zoom_in.setFixedSize(30, 30)
diff --git a/app/Ui/Icon.py b/app/Ui/Icon.py
index 2bda4c8f..896fb6dd 100644
--- a/app/Ui/Icon.py
+++ b/app/Ui/Icon.py
@@ -7,3 +7,6 @@ class Icon:
Default_avatar = QIcon(Default_avatar_path)
Output = QIcon('./app/data/icons/output.svg')
Back = QIcon('./app/data/icons/back.svg')
+ ToDocx = QIcon('app/data/icons/word.svg')
+ ToCSV = QIcon('app/data/icons/csv.svg')
+ ToHTML = QIcon('app/data/icons/html.svg')
diff --git a/app/Ui/MyComponents/Button_Contact.py b/app/Ui/MyComponents/Button_Contact.py
index c9a5f971..7c9bc459 100644
--- a/app/Ui/MyComponents/Button_Contact.py
+++ b/app/Ui/MyComponents/Button_Contact.py
@@ -48,6 +48,7 @@ def init_ui(self, Ui):
self.gridLayout1.setObjectName("gridLayout1")
self.label_time = QtWidgets.QLabel(self.layoutWidget)
font = QtGui.QFont()
+ font.setFamily("微软雅黑")
font.setPointSize(8)
self.label_time.setFont(font)
self.label_time.setLayoutDirection(QtCore.Qt.RightToLeft)
@@ -56,13 +57,15 @@ def init_ui(self, Ui):
self.gridLayout1.addWidget(self.label_time, 0, 2, 1, 1)
self.label_remark = QtWidgets.QLabel(self.layoutWidget)
font = QtGui.QFont()
- font.setFamily("Adobe 黑体 Std R")
+ font.setFamily("微软雅黑")
font.setPointSize(10)
+ font.setBold(True)
self.label_remark.setFont(font)
self.label_remark.setObjectName("label_remark")
self.gridLayout1.addWidget(self.label_remark, 0, 1, 1, 1)
self.label_msg = QtWidgets.QLabel(self.layoutWidget)
font = QtGui.QFont()
+ font.setFamily("微软雅黑")
font.setPointSize(8)
self.label_msg.setFont(font)
self.label_msg.setObjectName("label_msg")
diff --git a/app/Ui/chat/chatUi.py b/app/Ui/chat/chatUi.py
index 65748744..6566cf61 100644
--- a/app/Ui/chat/chatUi.py
+++ b/app/Ui/chat/chatUi.py
@@ -23,7 +23,7 @@ def setupUi(self, Form):
self.scrollArea_2.setEnabled(True)
self.scrollArea_2.setMaximumSize(QtCore.QSize(325, 150000))
self.scrollArea_2.setAutoFillBackground(False)
- self.scrollArea_2.setFrameShape(QtWidgets.QFrame.WinPanel)
+ self.scrollArea_2.setFrameShape(QtWidgets.QFrame.NoFrame)
self.scrollArea_2.setFrameShadow(QtWidgets.QFrame.Raised)
self.scrollArea_2.setMidLineWidth(0)
self.scrollArea_2.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
@@ -151,5 +151,7 @@ def retranslateUi(self, Form):
"p, li { white-space: pre-wrap; }\n"
"
\n"
"
\n"
- "