From 97c4e99f63611e5d733ecdc7f779574fa92a3a42 Mon Sep 17 00:00:00 2001 From: RedDeadDepresso <94017243+RedDeadDepresso@users.noreply.github.com> Date: Fri, 26 Jul 2024 00:19:27 +0100 Subject: [PATCH] fix: adjust logo position --- app/components/navigation_logo.py | 20 ++++---------------- app/view/main_window.py | 14 ++++++++------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/app/components/navigation_logo.py b/app/components/navigation_logo.py index e6c042e..ff05839 100644 --- a/app/components/navigation_logo.py +++ b/app/components/navigation_logo.py @@ -1,21 +1,9 @@ # coding:utf-8 -import os -import subprocess -from typing import Union, List +from PySide6.QtCore import Qt, QSize +from PySide6.QtGui import QPixmap +from PySide6.QtWidgets import QLabel, QVBoxLayout -from PySide6.QtCore import (Qt, Signal, QRect, QRectF, QPropertyAnimation, Property, QMargins, - QEasingCurve, QPoint, QEvent, QSize) -from PySide6.QtGui import QColor, QPainter, QPen, QIcon, QCursor, QFont, QBrush, QPixmap, QImage, QMouseEvent -from PySide6.QtWidgets import QHBoxLayout, QVBoxLayout, QLabel, QWidget, QStyle, QStyleOptionButton -from collections import deque - -from qfluentwidgets import BodyLabel, FlyoutAnimationType, Flyout, FlyoutView, PushButton, ToolButton, CheckBox -from qfluentwidgets.common.config import isDarkTheme -from qfluentwidgets.common.style_sheet import themeColor -from qfluentwidgets.common.icon import drawIcon, toQIcon -from qfluentwidgets.common.icon import FluentIcon as FIF -from qfluentwidgets.common.font import setFont -from qfluentwidgets.components.navigation import NavigationAvatarWidget, NavigationWidget +from qfluentwidgets.components.navigation import NavigationWidget class NavigationLogoWidget(NavigationWidget): diff --git a/app/view/main_window.py b/app/view/main_window.py index 80f8175..2dc2188 100644 --- a/app/view/main_window.py +++ b/app/view/main_window.py @@ -1,11 +1,11 @@ # coding: utf-8 from typing import List -from PySide6.QtCore import Qt, Signal, QEasingCurve, QUrl, QSize -from PySide6.QtGui import QIcon, QDesktopServices, QColor -from PySide6.QtWidgets import QApplication, QHBoxLayout, QFrame, QWidget +from PySide6.QtCore import Qt, QUrl, QSize +from PySide6.QtGui import QIcon, QDesktopServices +from PySide6.QtWidgets import QApplication -from qfluentwidgets import (NavigationAvatarWidget, NavigationItemPosition, MessageBox, FluentWindow, - SplashScreen, PushButton) +from qfluentwidgets import (NavigationItemPosition, FluentWindow, + SplashScreen) from qfluentwidgets import FluentIcon as FIF from .logger_interface import LoggerInterface @@ -31,6 +31,7 @@ class MainWindow(FluentWindow): # enable acrylic effect self.navigationInterface.setAcrylicEnabled(True) + self.navigationInterface.setReturnButtonVisible(False) self.navigationInterface.setMenuButtonVisible(False) self.navigationInterface.setCollapsible(False) @@ -48,6 +49,7 @@ class MainWindow(FluentWindow): def initNavigation(self): # add navigation items + self.navigationInterface.panel.topLayout.addSpacing(40) self.navigationInterface.addWidget( 'Logo', NavigationLogoWidget(':/gallery/images/logo.png', QSize(160, 160)), @@ -77,7 +79,7 @@ class MainWindow(FluentWindow): # create splash screen self.splashScreen = SplashScreen(self.windowIcon(), self) - self.splashScreen.setIconSize(QSize(106, 106)) + self.splashScreen.setIconSize(QSize(160, 160)) self.splashScreen.raise_() desktop = QApplication.screens()[0].availableGeometry()