diff --git a/app/Ui/chat/chatUi.py b/app/Ui/chat/chatUi.py index dc01f31..6574874 100644 --- a/app/Ui/chat/chatUi.py +++ b/app/Ui/chat/chatUi.py @@ -16,6 +16,8 @@ class Ui_Form(object): Form.setObjectName("Form") Form.resize(878, 720) self.horizontalLayout = QtWidgets.QHBoxLayout(Form) + self.horizontalLayout.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout.setSpacing(0) self.horizontalLayout.setObjectName("horizontalLayout") self.scrollArea_2 = QtWidgets.QScrollArea(Form) self.scrollArea_2.setEnabled(True) @@ -51,7 +53,8 @@ class Ui_Form(object): self.frame_2.setFrameShadow(QtWidgets.QFrame.Raised) self.frame_2.setObjectName("frame_2") self.verticalLayout = QtWidgets.QVBoxLayout(self.frame_2) - self.verticalLayout.setContentsMargins(0, 5, 0, 0) + self.verticalLayout.setContentsMargins(0, 0, 0, 0) + self.verticalLayout.setSpacing(0) self.verticalLayout.setObjectName("verticalLayout") self.horizontalLayout_3 = QtWidgets.QHBoxLayout() self.horizontalLayout_3.setObjectName("horizontalLayout_3") @@ -112,11 +115,12 @@ class Ui_Form(object): self.btn_sendMsg_2.setMouseTracking(False) self.btn_sendMsg_2.setAutoFillBackground(False) self.btn_sendMsg_2.setStyleSheet("QPushButton {\n" - "background-color:rgb(233,233,233);\n" - "padding: 10px;\n" - "color:rgb(5,180,104);}\n" - "QPushButton:hover{\n" - "background-color:rgb(198,198,198)}") + " background-color:rgb(233,233,233);\n" + " padding: 10px;\n" + " color:rgb(5,180,104);}\n" + " QPushButton:hover{\n" + " background-color:rgb(198,198,198)}\n" + " ") self.btn_sendMsg_2.setIconSize(QtCore.QSize(40, 40)) self.btn_sendMsg_2.setCheckable(False) self.btn_sendMsg_2.setAutoDefault(True) @@ -146,5 +150,6 @@ class Ui_Form(object): "\n" - "


")) + "

\n" + "

")) self.btn_sendMsg_2.setText(_translate("Form", "发送")) diff --git a/app/Ui/chat/chatUi.ui b/app/Ui/chat/chatUi.ui index c7c2d3b..c02a6a7 100644 --- a/app/Ui/chat/chatUi.ui +++ b/app/Ui/chat/chatUi.ui @@ -14,6 +14,21 @@ Form + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + @@ -117,11 +132,14 @@ QFrame::Raised + + 0 + 0 - 5 + 0 0 @@ -212,9 +230,10 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'SimSun'; font-size:15pt; font-weight:400; font-style:normal;"> - <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; - margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br - /></p></body></html> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; + margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p> + <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; + margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p></body></html> diff --git a/app/Ui/contact/analysis/analysis.py b/app/Ui/contact/analysis/analysis.py index a9db83b..2eb8746 100644 --- a/app/Ui/contact/analysis/analysis.py +++ b/app/Ui/contact/analysis/analysis.py @@ -50,22 +50,33 @@ class AnalysisController(QWidget): def initUI(self): self.label.setVisible(False) - self.setStyleSheet('''QWidget{background-color:rgb(244, 244, 244);}''') + self.setStyleSheet('''QWidget{background-color:rgb(240, 240, 240);}''') main_box = QVBoxLayout(self) + main_box.setContentsMargins(0, 0, 0, 0) + main_box.setSpacing(0) self.browser1 = QWebEngineView() self.browser1.load(QUrl('file:///data/聊天统计/title.html')) + self.browser1.setMinimumSize(810, 60) + self.browser1.setStyleSheet('''QWidget{background-color:rgb(240, 240, 240);}''') self.browser2 = QWebEngineView() self.browser2.load(QUrl('file:///data/聊天统计/wordcloud.html')) + self.browser2.setStyleSheet('''QWidget{background-color:rgb(240, 240, 240);}''') + # self.browser2.setMinimumWidth(810) + self.browser2.setMinimumSize(810, 810) self.browser3 = QWebEngineView() self.browser3.load(QUrl('file:///data/聊天统计/time.html')) - # self.browser3.resize(800, 600) + self.browser3.setMaximumSize(810, 100) + self.browser3.adjustSize() self.browser4 = QWebEngineView() self.browser4.load(QUrl('http://www.baidu.com')) - # self.browser4.resize(800, 600) + self.browser4.resize(800, 600) self.browser5 = QWebEngineView() self.browser5.load(QUrl('file:///data/聊天统计/chat_session.html')) + # self.browser5.adjustSize() + + # self.browser5.resize(800, 600) self.browser6 = QWebEngineView() self.browser6.load(QUrl('file:///data/聊天统计/sports.html')) self.browser7 = QWebEngineView() @@ -80,95 +91,34 @@ class AnalysisController(QWidget): # self.browser10. main_box.addWidget(self.browser1) - self.scrollArea = QScrollArea(self) + self.scrollArea = QScrollArea() self.scrollArea.setEnabled(True) self.scrollArea.adjustSize() - self.scrollArea.setWidgetResizable(False) + scrollAreaContent = QWidget(self.scrollArea) - Vlayout2 = QVBoxLayout(scrollAreaContent) + scrollAreaContent.setStyleSheet('''QWidget{background-color:rgb(240, 240, 240);}''') - # splitter2 = QSplitter(Qt.Vertical) - # splitter2.addWidget(self.browser2) - # # splitter2.resize(800, 600) - # Vlayout2.addWidget(splitter2) - # - # splitter3 = QSplitter(Qt.Vertical) - # splitter3.addWidget(self.browser3) - # Vlayout2.addWidget(splitter3) - # - # splitter4 = QSplitter(Qt.Vertical) - # splitter4.addWidget(self.browser4) - # Vlayout2.addWidget(splitter4) - # - # splitter5 = QSplitter(Qt.Vertical) - # splitter5.addWidget(self.browser6) - # Vlayout2.addWidget(splitter5) + Vlayout2 = QVBoxLayout() + Vlayout2.setContentsMargins(0, 0, 0, 0) + Vlayout2.setSpacing(0) - # Vlayout2.addWidget(self.browser3, stretch=1) - # Vlayout2.addWidget(self.browser6, stretch=2) - # Vlayout2.addWidget(self.browser5, stretch=3) - # Vlayout2.addWidget(self.browser7, stretch=4) - # Vlayout2.addWidget(self.browser8, stretch=5) - # Vlayout2.addWidget(self.browser9, stretch=6) - Vlayout2.addWidget(self.browser10, stretch=7) + Vlayout2.addWidget(self.browser3) + Vlayout2.addWidget(self.browser2) - # Vlayout2.setStretch(0, 1) - # Vlayout2.setStretch(1, 10) + Vlayout2.addWidget(self.browser8) + Vlayout2.addWidget(self.browser6) + Vlayout2.addWidget(self.browser5) + Vlayout2.addWidget(self.browser7) + Vlayout2.addWidget(self.browser9) + Vlayout2.addWidget(self.browser10) scrollAreaContent.setLayout(Vlayout2) - # self.scrollArea.setWidget(scrollAreaContent) - self.scrollArea.setWidget(self.browser9) - main_box.addWidget(self.browser10) + + self.scrollArea.setWidget(scrollAreaContent) main_box.addWidget(self.scrollArea) main_box.setStretch(0, 1) main_box.setStretch(1, 10) - ''' - splitter1 = QSplitter(Qt.Vertical) - splitter2 = QSplitter(Qt.Horizontal) - splitter3 = QSplitter(Qt.Horizontal) - splitter4 = QSplitter(Qt.Vertical) - splitter5 = QSplitter(Qt.Horizontal) - splitter6 = QSplitter(Qt.Vertical) - splitter7 = QSplitter(Qt.Vertical) - splitter8 = QSplitter(Qt.Vertical) - splitter9 = QSplitter(Qt.Vertical) - - splitter1.addWidget(self.browser1) - splitter1.addWidget(splitter2) - splitter1.setSizes([1, 13]) - - splitter2.addWidget(splitter6) - splitter2.addWidget(splitter3) - splitter2.setSizes([1, 3]) - - splitter3.addWidget(splitter4) - splitter3.addWidget(splitter8) - splitter3.setSizes([2, 1]) - - splitter4.addWidget(splitter5) - splitter4.addWidget(self.browser2) - splitter4.setSizes([2, 13]) - - splitter5.addWidget(self.browser3) - # splitter5.addWidget(self.browser4) - - splitter6.addWidget(self.browser5) - splitter6.addWidget(splitter7) - splitter6.setSizes([1, 2]) - - splitter7.addWidget(self.browser6) - splitter7.addWidget(self.browser7) - - splitter8.addWidget(self.browser8) - splitter8.addWidget(splitter9) - splitter8.setSizes([1, 2]) - - splitter9.addWidget(self.browser9) - splitter9.addWidget(self.browser10) -''' - # main_box.addWidget(splitter1) self.setLayout(main_box) - # self.setLayout(Vlayout1) def setBackground(self): palette = QPalette() diff --git a/app/Ui/contact/analysis/charts.py b/app/Ui/contact/analysis/charts.py index 6067c12..6dd983d 100644 --- a/app/Ui/contact/analysis/charts.py +++ b/app/Ui/contact/analysis/charts.py @@ -32,10 +32,10 @@ Type = { '436207665': '发红包', '49': '分享链接' } -charts_width = 1000 -charts_height = 500 -wordcloud_width = 1000 -wordcloud_height = 500 +charts_width = 800 +charts_height = 450 +wordcloud_width = 780 +wordcloud_height = 780 def send_recv_rate(username): @@ -44,7 +44,11 @@ def send_recv_rate(username): total_num = send_num + recv_num print(send_num, recv_num) c = ( - Pie(init_opts=opts.InitOpts(width=f"{charts_width}px", height=f"{charts_height}px")) + Pie(init_opts=opts.InitOpts( + bg_color='rgb(240,240,240)', + width=f"{charts_width}px", + height=f"{charts_height}px") + ) .add( "", [ diff --git a/app/Ui/contact/contact.py b/app/Ui/contact/contact.py index f1d6aa7..405f546 100644 --- a/app/Ui/contact/contact.py +++ b/app/Ui/contact/contact.py @@ -75,7 +75,7 @@ class ContactController(QWidget, Ui_Dialog): self.lay0 = QVBoxLayout() # self.widget.setLayout(self.lay0) # self.widget.setStyleSheet('''QWidget{background-color:rgb(255, 255, 255);}''') - self.stackedWidget.setStyleSheet('''QWidget{background-color:rgb(255, 255, 255);}''') + self.stackedWidget.setStyleSheet('''QWidget{background-color:rgb(240, 240, 240);}''') self.frame = QtWidgets.QFrame() self.frame.setObjectName("frame") self.userinfo = userinfoUi.Ui_Frame() # 联系人信息界面 diff --git a/app/Ui/contact/userinfo/userinfoUi.py b/app/Ui/contact/userinfo/userinfoUi.py index f9cf218..8154cf6 100644 --- a/app/Ui/contact/userinfo/userinfoUi.py +++ b/app/Ui/contact/userinfo/userinfoUi.py @@ -18,13 +18,20 @@ class Ui_Frame(object): Frame.setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor)) Frame.setMouseTracking(True) Frame.setTabletTracking(True) - self.layoutWidget = QtWidgets.QWidget(Frame) - self.layoutWidget.setGeometry(QtCore.QRect(210, 100, 429, 82)) - self.layoutWidget.setObjectName("layoutWidget") - self.gridLayout = QtWidgets.QGridLayout(self.layoutWidget) - self.gridLayout.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout_3 = QtWidgets.QHBoxLayout(Frame) + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.horizontalLayout_2 = QtWidgets.QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_2.addItem(spacerItem) + self.verticalLayout = QtWidgets.QVBoxLayout() + self.verticalLayout.setObjectName("verticalLayout") + spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout.addItem(spacerItem1) + self.gridLayout = QtWidgets.QGridLayout() + self.gridLayout.setHorizontalSpacing(6) self.gridLayout.setObjectName("gridLayout") - self.l_avatar = QtWidgets.QLabel(self.layoutWidget) + self.l_avatar = QtWidgets.QLabel(Frame) self.l_avatar.setMinimumSize(QtCore.QSize(80, 80)) self.l_avatar.setMaximumSize(QtCore.QSize(80, 80)) self.l_avatar.setText("") @@ -32,25 +39,33 @@ class Ui_Frame(object): self.l_avatar.setScaledContents(True) self.l_avatar.setObjectName("l_avatar") self.gridLayout.addWidget(self.l_avatar, 0, 0, 3, 1) - self.l_remark = QtWidgets.QLabel(self.layoutWidget) + self.l_remark = QtWidgets.QLabel(Frame) + self.l_remark.setMinimumSize(QtCore.QSize(0, 30)) + self.l_remark.setMaximumSize(QtCore.QSize(16777215, 30)) font = QtGui.QFont() font.setPointSize(15) self.l_remark.setFont(font) self.l_remark.setObjectName("l_remark") self.gridLayout.addWidget(self.l_remark, 0, 1, 1, 1) - self.l_nickname = QtWidgets.QLabel(self.layoutWidget) + self.l_nickname = QtWidgets.QLabel(Frame) + self.l_nickname.setMinimumSize(QtCore.QSize(0, 30)) + self.l_nickname.setMaximumSize(QtCore.QSize(16777215, 30)) self.l_nickname.setObjectName("l_nickname") self.gridLayout.addWidget(self.l_nickname, 1, 1, 1, 1) - self.l_username = QtWidgets.QLabel(self.layoutWidget) + self.l_username = QtWidgets.QLabel(Frame) + self.l_username.setMinimumSize(QtCore.QSize(0, 20)) + self.l_username.setMaximumSize(QtCore.QSize(16777215, 20)) self.l_username.setObjectName("l_username") self.gridLayout.addWidget(self.l_username, 2, 1, 1, 1) - self.horizontalLayoutWidget = QtWidgets.QWidget(Frame) - self.horizontalLayoutWidget.setGeometry(QtCore.QRect(210, 210, 429, 71)) - self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget") - self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget) - self.horizontalLayout.setContentsMargins(0, 0, 0, 0) + self.gridLayout.setRowStretch(0, 1) + self.gridLayout.setRowStretch(1, 1) + self.gridLayout.setRowStretch(2, 1) + self.verticalLayout.addLayout(self.gridLayout) + spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout.addItem(spacerItem2) + self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") - self.label = QtWidgets.QLabel(self.horizontalLayoutWidget) + self.label = QtWidgets.QLabel(Frame) self.label.setMinimumSize(QtCore.QSize(80, 0)) self.label.setMaximumSize(QtCore.QSize(80, 16777215)) font = QtGui.QFont() @@ -58,7 +73,7 @@ class Ui_Frame(object): self.label.setFont(font) self.label.setObjectName("label") self.horizontalLayout.addWidget(self.label) - self.lineEdit = QtWidgets.QLineEdit(self.horizontalLayoutWidget) + self.lineEdit = QtWidgets.QLineEdit(Frame) self.lineEdit.setMinimumSize(QtCore.QSize(0, 25)) self.lineEdit.setMaximumSize(QtCore.QSize(16777215, 25)) font = QtGui.QFont() @@ -69,22 +84,29 @@ class Ui_Frame(object): self.lineEdit.setStyleSheet("background:transparent;border-width:0;border-style:outset") self.lineEdit.setObjectName("lineEdit") self.horizontalLayout.addWidget(self.lineEdit) - self.horizontalLayoutWidget_2 = QtWidgets.QWidget(Frame) - self.horizontalLayoutWidget_2.setGeometry(QtCore.QRect(210, 350, 431, 80)) - self.horizontalLayoutWidget_2.setObjectName("horizontalLayoutWidget_2") - self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget_2) - self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0) - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - self.btn_outbut = QtWidgets.QPushButton(self.horizontalLayoutWidget_2) - self.btn_outbut.setObjectName("btn_outbut") - self.horizontalLayout_2.addWidget(self.btn_outbut) - self.btn_analysis = QtWidgets.QPushButton(self.horizontalLayoutWidget_2) - self.btn_analysis.setObjectName("btn_analysis") - self.horizontalLayout_2.addWidget(self.btn_analysis) + self.verticalLayout.addLayout(self.horizontalLayout) + spacerItem3 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout.addItem(spacerItem3) self.progressBar = QtWidgets.QProgressBar(Frame) - self.progressBar.setGeometry(QtCore.QRect(210, 480, 451, 23)) self.progressBar.setProperty("value", 24) self.progressBar.setObjectName("progressBar") + self.verticalLayout.addWidget(self.progressBar) + spacerItem4 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) + self.verticalLayout.addItem(spacerItem4) + self.verticalLayout.setStretch(0, 2) + self.verticalLayout.setStretch(1, 3) + self.verticalLayout.setStretch(2, 4) + self.verticalLayout.setStretch(3, 1) + self.verticalLayout.setStretch(4, 4) + self.verticalLayout.setStretch(5, 1) + self.verticalLayout.setStretch(6, 2) + self.horizontalLayout_2.addLayout(self.verticalLayout) + spacerItem5 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) + self.horizontalLayout_2.addItem(spacerItem5) + self.horizontalLayout_2.setStretch(0, 1) + self.horizontalLayout_2.setStretch(1, 2) + self.horizontalLayout_2.setStretch(2, 1) + self.horizontalLayout_3.addLayout(self.horizontalLayout_2) self.retranslateUi(Frame) QtCore.QMetaObject.connectSlotsByName(Frame) @@ -97,5 +119,3 @@ class Ui_Frame(object): self.l_username.setText(_translate("Frame", "账号：TextLabel")) self.label.setText(_translate("Frame", "备注名")) self.lineEdit.setText(_translate("Frame", "曹雨萱")) - self.btn_outbut.setText(_translate("Frame", "导出聊天记录")) - self.btn_analysis.setText(_translate("Frame", "聊天统计")) diff --git a/app/Ui/contact/userinfo/userinfoUi.ui b/app/Ui/contact/userinfo/userinfoUi.ui index 2709e88..3bba2de 100644 --- a/app/Ui/contact/userinfo/userinfoUi.ui +++ b/app/Ui/contact/userinfo/userinfoUi.ui @@ -1,199 +1,280 @@ - Frame - - - - 0 - 0 - 800 - 720 - - - - IBeamCursor - - - true - - - true - - - Frame - - - - - 210 - 100 - 429 - 82 - - - - - - - - 80 - 80 - - - - - 80 - 80 - - - - - - - ../../../a_img/be0fa6c0c4707fb5f7b37b660de826d3.jpg - - - true - - - - - - - - 15 - - - - 曹雨萱 - - - - - - - 昵称：997 - - - - - - - 账号：TextLabel - - - - - - - - - 210 - 210 - 429 - 71 - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - - 15 - - - - 备注名 - - - - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - - 15 - - - - ArrowCursor - - - false - - - background:transparent;border-width:0;border-style:outset - - - 曹雨萱 - - - - - - - - - 210 - 350 - 431 - 80 - - - - - - - 导出聊天记录 - - - - - - - 聊天统计 - - - - - - - - - 210 - 480 - 451 - 23 - - - - 24 - - - - - + Frame + + + + 0 + 0 + 800 + 720 + + + + IBeamCursor + + + true + + + true + + + Frame + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + 6 + + + + + + 80 + 80 + + + + + 80 + 80 + + + + + + + ../../../a_img/be0fa6c0c4707fb5f7b37b660de826d3.jpg + + + true + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + + 15 + + + + 曹雨萱 + + + + + + + + 0 + 30 + + + + + 16777215 + 30 + + + + 昵称：997 + + + + + + + + 0 + 20 + + + + + 16777215 + 20 + + + + 账号：TextLabel + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + 80 + 0 + + + + + 80 + 16777215 + + + + + 15 + + + + 备注名 + + + + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + + 15 + + + + ArrowCursor + + + false + + + + background:transparent;border-width:0;border-style:outset + + + + 曹雨萱 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + 24 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + +