diff --git a/debian/changelog b/debian/changelog index 825a552d2e210d51f61c970c73e407b8eacb6b32..1a1d61d979d5376623003bae55655ddd943ebd0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gxde-hardware-viewer (2.5.0-1) UNRELEASED; urgency=medium +gxde-hardware-viewer (2.5.1) UNRELEASED; urgency=medium [ gfdgd_xi ] * 新增英语支持 diff --git a/debian/control b/debian/control index efc0cc784661b371a723be5fbd5fc26041e22db6..ed264b365140a2c5fdac12deb8a305b011803dbe 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: gxde-hardware-viewer Section: utils Priority: optional -Maintainer: ocean +Maintainer: zeqi Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), diff --git a/gxde-hardware-viewer.py b/gxde-hardware-viewer.py index 51097df124a002630fd2ab877b73ca51e865fd1f..31349ec04c16ed372aa956d7d48c103aa2f154f0 100644 --- a/gxde-hardware-viewer.py +++ b/gxde-hardware-viewer.py @@ -18,7 +18,7 @@ from PyQt6.QtWidgets import (QApplication, QMainWindow, QWidget, QVBoxLayout, from PyQt6.QtCore import Qt, QTimer, QTranslator, QCoreApplication, QLocale, QPoint from PyQt6.QtGui import QIcon, QFont, QPixmap -version = "2.5.0" +version = "2.5.1" class GXDETitleBar(QWidget): def __init__(self, parent=None): @@ -67,9 +67,9 @@ class GXDETitleBar(QWidget): background-color: grey; }} QPushButton:pressed {{ - background-color: #103857; + background-color: #FBD6E2; }} - """) + """)# background-color: #103857; self.layout.addWidget(self.menu_button) # 4. 右侧:窗口控制按钮 @@ -120,9 +120,9 @@ class GXDETitleBar(QWidget): background-color: grey; }} QPushButton:pressed {{ - background-color: #103857; + background-color: #FBD6E2; }} - """) + """)# background-color: #103857; return btn def toggle_maximize(self): @@ -250,8 +250,8 @@ class HardwareManager(QMainWindow): self.sidebar.setFixedWidth(self.scaled(180)) self.sidebar.setStyleSheet(f""" QListWidget {{ - border-right: 1px solid #2CA7F8; - padding-top: {self.scaled(10)}px; + border-right: none; + border-top: none; }} QListWidgetItem {{ height: {self.scaled(36)}px; @@ -259,10 +259,12 @@ class HardwareManager(QMainWindow): font-size: {self.scaled(14)}px; }} QListWidget::item:selected {{ - color: #2CA7F8; - border-left: 3px solid #2CA7F8; + color: #E6004C; + selection-background-color: #F380A6; + border-left: 3px solid #E6004C; }} - """) + """)#color: #2CA7F8 + #border-left: 3px solid #2CA7F8 # 4. 添加侧边栏项目 self.add_sidebar_item(self.tr("System"), "system") @@ -727,11 +729,8 @@ class HardwareManager(QMainWindow): def create_cpu_page(self): """创建CPU信息页面""" - widget = QScrollArea() - widget.setWidgetResizable(True) - - content = QWidget() - layout = QVBoxLayout(content) + widget = QWidget() + layout = QVBoxLayout(widget) layout.setContentsMargins(self.scaled(15), self.scaled(15), self.scaled(15), self.scaled(15)) layout.setSpacing(self.scaled(10)) @@ -785,7 +784,6 @@ class HardwareManager(QMainWindow): layout.addWidget(self.create_group_box(self.tr("CPU Driver Information"), driver_widget)) layout.addStretch() - widget.setWidget(content) return widget def create_memory_page(self): @@ -876,11 +874,8 @@ class HardwareManager(QMainWindow): def create_storage_page(self): """创建存储信息页面""" - widget = QScrollArea() - widget.setWidgetResizable(True) - - content = QWidget() - layout = QVBoxLayout(content) + widget = QWidget() + layout = QVBoxLayout(widget) layout.setContentsMargins(self.scaled(15), self.scaled(15), self.scaled(15), self.scaled(15)) layout.setSpacing(self.scaled(10)) @@ -977,16 +972,12 @@ class HardwareManager(QMainWindow): layout.addWidget(self.create_group_box(self.tr("Disk I/O Statistics"), self.disk_io_widget)) layout.addStretch() - widget.setWidget(content) return widget def create_network_page(self): """创建网络信息页面""" - widget = QScrollArea() - widget.setWidgetResizable(True) - - content = QWidget() - layout = QVBoxLayout(content) + widget = QWidget() + layout = QVBoxLayout(widget) layout.setContentsMargins(self.scaled(15), self.scaled(15), self.scaled(15), self.scaled(15)) layout.setSpacing(self.scaled(10)) @@ -1089,7 +1080,6 @@ class HardwareManager(QMainWindow): layout.addWidget(self.create_group_box(self.tr("Network Traffic Statistics"), self.net_io_widget)) layout.addStretch() - widget.setWidget(content) return widget def create_display_page(self):