Skip to content

Commit

Permalink
修改UI
Browse files Browse the repository at this point in the history
  • Loading branch information
LC044 committed Nov 15, 2023
1 parent a126658 commit 37870f1
Show file tree
Hide file tree
Showing 26 changed files with 1,403 additions and 372 deletions.
71 changes: 58 additions & 13 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions app/Ui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
# 文件__init__.py
# from login import login
from app.Ui.decrypt import decrypt
from app.Ui.pc_decrypt import pc_decrypt

__all__ = ["decrypt", 'mainview', 'chat', 'pc_decrypt']
__all__ = ["decrypt", 'mainview', 'chat']
2 changes: 1 addition & 1 deletion app/Ui/chat/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *

from app.Ui.MyComponents.Button_Contact import ContactUi
from app.components.Button_Contact import ContactUi
from app.log import logger, log
from .chatUi import *
from ...DataBase import data
Expand Down
2 changes: 1 addition & 1 deletion app/Ui/contact/contact.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from PyQt5.QtCore import *
from PyQt5.QtWidgets import *

import app.Ui.MyComponents.Button_Contact as MyLabel
import app.components.Button_Contact as MyLabel
from app import person
from app.DataBase import data
from app.Ui.contact.contactInfo import ContactInfo
Expand Down
13 changes: 3 additions & 10 deletions app/Ui/mainview.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *

from app import person, config
from app.DataBase import *
from app import config
from app.Ui import mainwindow
from app.Ui.Icon import Icon
from app.Ui.MyComponents.prompt_bar import PromptBar
from app.Ui.chat import chat
from app.Ui.contact import contact
from app.components.prompt_bar import PromptBar


class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
Expand All @@ -28,7 +27,7 @@ def __init__(self, username, parent=None):
super(MainWinController, self).__init__(parent)
self.setupUi(self)
self.setWindowIcon(Icon.MainWindow_Icon)
self.Me = person.Me(data.get_myinfo())

self.setAttribute(Qt.WA_AttributeCount)

self.chatView = chat.ChatController(self.Me, parent=None)
Expand Down Expand Up @@ -60,12 +59,6 @@ def __init__(self, username, parent=None):
self.statusbar.setVisible(False)
self.prompt_bar = PromptBar(self)
self.chat_view()
# self.state_lable = QLabel(self)
# self.state_lable.raise_()
# pixmap = QPixmap('./app/data/icons/default_avatar.svg').scaled(32, 32) # 按指定路径找到图片
# self.state_lable.setPixmap(pixmap)
# self.state_lable.setText("T")
# 创建右键菜单函数

def init_ui(self):
# self.setWindowFlags(QtCore.Qt.FramelessWindowHint)
Expand Down
Empty file removed app/Ui/pc_decrypt/__init__.py
Empty file.
120 changes: 0 additions & 120 deletions app/Ui/pc_decrypt/decryptUi.py

This file was deleted.

Loading

0 comments on commit 37870f1

Please sign in to comment.