From 5275a6aa91e44cb4011449bb87be80e524f7cd49 Mon Sep 17 00:00:00 2001
From: shuaikangzhou <863909694@qq.com>
Date: Wed, 1 Nov 2023 22:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8stackedWidget=E5=AE=9E=E7=8E=B0?=
=?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 22 +++++++++++------
app/Ui/mainview.py | 35 +++++++-------------------
app/Ui/mainwindow.py | 34 ++++++++++++++++++-------
app/Ui/mainwindow.ui | 59 ++++++++++++++++++++++++++++----------------
main.spec | 3 +++
5 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c13bec5..806862d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,12 @@
-
+
-
-
-
-
+
+
+
+
@@ -445,7 +445,14 @@
1698681328723
-
+
+ 1698765961025
+
+
+
+ 1698765961025
+
+
@@ -500,7 +507,8 @@
-
+
+
diff --git a/app/Ui/mainview.py b/app/Ui/mainview.py
index a8bcc1e..a40e3f0 100644
--- a/app/Ui/mainview.py
+++ b/app/Ui/mainview.py
@@ -33,21 +33,15 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
self.setAttribute(Qt.WA_AttributeCount)
self.chatView = chat.ChatController(self.Me, parent=None)
- self.chatView.setVisible(False)
- # self.chatView.setLayout()
self.lay = QHBoxLayout()
- self.frame_main.setLayout(self.lay)
+ self.page_chat.setLayout(self.lay)
self.lay.addWidget(self.chatView)
- # self.frame_main.setLayout(self.chatView)
- # self.frame_main.setLayout()
- self.contactView = contact.ContactController(self.Me, parent=None)
- self.contactView.setVisible(False)
- self.lay0 = QHBoxLayout()
- self.frame_main.setLayout(self.lay0)
- self.lay.addWidget(self.contactView)
- # self.myinfoView = userinfo.MyinfoController(self.Me, parent=self.frame_main)
- # self.myinfoView.setVisible(False)
+ self.contactView = contact.ContactController(self.Me, parent=None)
+ self.lay0 = QHBoxLayout()
+ self.page_contact.setLayout(self.lay0)
+ self.lay0.addWidget(self.contactView)
+
self.btn_chat.clicked.connect(self.chat_view) # 聊天按钮
self.btn_contact.clicked.connect(self.contact_view)
# self.btn_myinfo.clicked.connect(self.myInfo)
@@ -58,7 +52,6 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
self.last_btn = None
self.lastView = None
self.show_avatar()
-
# 创建右键菜单函数
def create_rightmenu(self):
@@ -82,7 +75,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
avatar = data.get_avator(self.Me.username)
if not os.path.exists(avatar):
avatar = './app/data/icons/default_avatar.svg'
- pixmap = QPixmap(avatar).scaled(80, 80) # 按指定路径找到图片
+ pixmap = QPixmap(avatar).scaled(60, 60) # 按指定路径找到图片
self.myavatar.setPixmap(pixmap) # 在label上显示图片
def chat_view(self):
@@ -96,7 +89,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
self.last_btn.setStyleSheet("QPushButton {background-color: rgb(240,240,240);}"
"QPushButton:hover{background-color: rgb(209,209,209);}\n")
self.last_btn = self.btn_chat
- self.setviewVisible(self.chatView)
+ self.stackedWidget.setCurrentIndex(0)
self.chatView.showChat()
def contact_view(self):
@@ -110,7 +103,7 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
self.last_btn.setStyleSheet("QPushButton {background-color: rgb(240,240,240);}"
"QPushButton:hover{background-color: rgb(209,209,209);}\n")
self.last_btn = self.btn_contact
- self.setviewVisible(self.contactView)
+ self.stackedWidget.setCurrentIndex(1)
self.contactView.showContact()
def myInfo(self):
@@ -124,7 +117,6 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
self.last_btn.setStyleSheet("QPushButton {background-color: rgb(240,240,240);}"
"QPushButton:hover{background-color: rgb(209,209,209);}\n")
self.last_btn = self.now_btn
- self.setviewVisible(self.myinfoView)
def about(self):
"""
@@ -133,12 +125,3 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
QMessageBox.about(self, "关于",
"关于作者\n姓名：周帅康\n邮箱：lc863854@mail.nwpu.edu.cn"
)
-
- def setviewVisible(self, view):
- """
- 设置窗口可见性
- """
- view.setVisible(True)
- if view != self.lastView and self.lastView:
- self.lastView.setVisible(False)
- self.lastView = view
diff --git a/app/Ui/mainwindow.py b/app/Ui/mainwindow.py
index d978cde..002f91d 100644
--- a/app/Ui/mainwindow.py
+++ b/app/Ui/mainwindow.py
@@ -29,7 +29,7 @@ class Ui_MainWindow(object):
self.frame_info.setFrameShadow(QtWidgets.QFrame.Sunken)
self.frame_info.setObjectName("frame_info")
self.verticalLayoutWidget = QtWidgets.QWidget(self.frame_info)
- self.verticalLayoutWidget.setGeometry(QtCore.QRect(10, 190, 61, 271))
+ self.verticalLayoutWidget.setGeometry(QtCore.QRect(0, 190, 77, 271))
self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
@@ -68,16 +68,30 @@ class Ui_MainWindow(object):
self.verticalLayout_2.setStretch(2, 1)
self.verticalLayout_2.setStretch(3, 1)
self.myavatar = QtWidgets.QLabel(self.frame_info)
- self.myavatar.setGeometry(QtCore.QRect(5, 40, 70, 70))
+ self.myavatar.setGeometry(QtCore.QRect(10, 40, 60, 60))
self.myavatar.setObjectName("myavatar")
self.horizontalLayout.addWidget(self.frame_info)
- self.frame_main = QtWidgets.QFrame(self.centralwidget)
- self.frame_main.setMinimumSize(QtCore.QSize(1120, 720))
- self.frame_main.setLayoutDirection(QtCore.Qt.LeftToRight)
- self.frame_main.setFrameShape(QtWidgets.QFrame.Box)
- self.frame_main.setFrameShadow(QtWidgets.QFrame.Raised)
- self.frame_main.setObjectName("frame_main")
- self.horizontalLayout.addWidget(self.frame_main)
+ self.stackedWidget = QtWidgets.QStackedWidget(self.centralwidget)
+ self.stackedWidget.setObjectName("stackedWidget")
+ self.page_chat = QtWidgets.QWidget()
+ self.page_chat.setObjectName("page_chat")
+ self.pushButton = QtWidgets.QPushButton(self.page_chat)
+ self.pushButton.setGeometry(QtCore.QRect(250, 150, 75, 23))
+ self.pushButton.setObjectName("pushButton")
+ self.stackedWidget.addWidget(self.page_chat)
+ self.page_contact = QtWidgets.QWidget()
+ self.page_contact.setObjectName("page_contact")
+ self.toolButton = QtWidgets.QToolButton(self.page_contact)
+ self.toolButton.setGeometry(QtCore.QRect(340, 250, 37, 18))
+ self.toolButton.setObjectName("toolButton")
+ self.stackedWidget.addWidget(self.page_contact)
+ self.page_myinfo = QtWidgets.QWidget()
+ self.page_myinfo.setObjectName("page_myinfo")
+ self.stackedWidget.addWidget(self.page_myinfo)
+ self.page_2 = QtWidgets.QWidget()
+ self.page_2.setObjectName("page_2")
+ self.stackedWidget.addWidget(self.page_2)
+ self.horizontalLayout.addWidget(self.stackedWidget)
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 1280, 23))
@@ -118,6 +132,8 @@ class Ui_MainWindow(object):
self.btn_myinfo.setText(_translate("MainWindow", "我的"))
self.btn_about.setText(_translate("MainWindow", "关于"))
self.myavatar.setText(_translate("MainWindow", "avatar"))
+ self.pushButton.setText(_translate("MainWindow", "PushButton"))
+ self.toolButton.setText(_translate("MainWindow", "..."))
self.menu_F.setTitle(_translate("MainWindow", "文件(F)"))
self.menu.setTitle(_translate("MainWindow", "编辑"))
self.menu_2.setTitle(_translate("MainWindow", "帮助"))
diff --git a/app/Ui/mainwindow.ui b/app/Ui/mainwindow.ui
index ca4698b..c0006f5 100644
--- a/app/Ui/mainwindow.ui
+++ b/app/Ui/mainwindow.ui
@@ -56,9 +56,9 @@
- 10
+ 0
190
- 61
+ 77
271
@@ -143,10 +143,10 @@
- 5
+ 10
40
- 70
- 70
+ 60
+ 60
@@ -156,22 +156,39 @@
-
-
-
-
- 1120
- 720
-
-
-
- Qt::LeftToRight
-
-
- QFrame::Box
-
-
- QFrame::Raised
-
+
+
+
+
+
+ 250
+ 150
+ 75
+ 23
+
+
+
+ PushButton
+
+
+
+
+
+
+
+ 340
+ 250
+ 37
+ 18
+
+
+
+ ...
+
+
+
+
+
diff --git a/main.spec b/main.spec
index 1b7fce7..4dd8cd8 100644
--- a/main.spec
+++ b/main.spec
@@ -26,6 +26,9 @@ a = Analysis(
'./app/Ui/contact/userinfo/userinfoUi.py',
'./app/Ui/decrypt/decrypt.py','./app/Ui/decrypt/decryptUi.py',
'./app/Ui/userinfo/userinfo.py','./app/Ui/userinfo/userinfoUi.py',
+ './app/person.py',
+ './app/Ui/ICON.py',
+ './app/Ui/MyComponents/Contact.py'
],
pathex=[],
binaries=[],