From 315b686aeced7e4a3ce8fe3fd2dd72efbc299fea Mon Sep 17 00:00:00 2001
From: tanjing <tanjing@kylinos.cn>
Date: Wed, 2 Mar 2022 17:47:19 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=90=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/mainwindow.cpp   |  68 +++++++++++++++-----------
 tools/mainwindow.h     |   5 +-
 tools/myiconlabel.cpp  | 106 ++---------------------------------------
 tools/myiconlabel.h    |  11 +----
 tools/mypushbutton.cpp |  18 ++-----
 tools/mypushbutton.h   |   6 +--
 6 files changed, 58 insertions(+), 156 deletions(-)

diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
index 4dadfc4..f4e53e6 100644
--- a/tools/mainwindow.cpp
+++ b/tools/mainwindow.cpp
@@ -192,9 +192,9 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
 
     initialMessageWidget();
 
-    int hideNum = 3;
+    int hideNum = 7;
     //Make a hash-map to store tableNum-to-lastWidget
-    if (m_power->canAction(UkuiPower::PowerHibernate)) {//m_power->canAction(UkuiPower::PowerHibernate)
+    if (m_power->canAction(UkuiPower::PowerHibernate)) {
         isHibernateHide = false;
         hideNum--;
     }
@@ -204,7 +204,22 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
         hideNum--;
     }
 
-    if (LockChecker::getCachedUsers() > 1) {
+    if (m_power->canAction(UkuiPower::PowerLogout)) {
+        isLogoutHide = false;
+        hideNum--;
+    }
+
+    if (m_power->canAction(UkuiPower::PowerReboot)) {
+        isRebootHide = false;
+        hideNum--;
+    }
+
+    if (m_power->canAction(UkuiPower::PowerShutdown)) {
+        isPowerOffHide = false;
+        hideNum--;
+    }
+
+    if (LockChecker::getCachedUsers() > 1 && m_power->canAction(UkuiPower::PowerSwitchUser)) {
         isSwitchuserHide = false;
         hideNum--;
     }
@@ -373,13 +388,13 @@ void MainWindow::initialSystemMonitor()
 
 void MainWindow::initialBtn()
 {
-    m_switchUserBtn = new MyPushButton(m_btnImagesPath+"/switchuser.svg", QApplication::tr("Switch User"), "switchuser", m_scrollArea, !m_IsRoundBtn);
-    m_hibernateBtn = new MyPushButton(m_btnImagesPath+"/hibernate.svg", QApplication::tr("Hibernate"), "hibernate", m_scrollArea, !m_IsRoundBtn);
-    m_suspendBtn = new MyPushButton(m_btnImagesPath+"/suspend.svg", QApplication::tr("Suspend"), "suspend", m_scrollArea, !m_IsRoundBtn);
-    m_logoutBtn = new MyPushButton(m_btnImagesPath+"/logout.svg", QApplication::tr("Logout"), "logout", m_scrollArea, !m_IsRoundBtn);
-    m_rebootBtn = new MyPushButton(m_btnImagesPath+"/reboot.svg", QApplication::tr("Reboot"), "reboot", m_scrollArea, !m_IsRoundBtn);
-    m_shutDownBtn = new MyPushButton(m_btnImagesPath+"/shutdown.svg", QApplication::tr("Shut Down"), "shutdown", m_scrollArea, !m_IsRoundBtn);
-    m_lockScreenBtn = new MyPushButton(m_btnImagesPath+"/lockscreen.svg", QApplication::tr("Lock Screen"), "lockscreen", m_scrollArea, !m_IsRoundBtn);
+    m_switchUserBtn = new MyPushButton(m_btnImagesPath+"/switchuser.svg", QApplication::tr("Switch User"), "switchuser", m_scrollArea);
+    m_hibernateBtn = new MyPushButton(m_btnImagesPath+"/hibernate.svg", QApplication::tr("Hibernate"), "hibernate", m_scrollArea);
+    m_suspendBtn = new MyPushButton(m_btnImagesPath+"/suspend.svg", QApplication::tr("Suspend"), "suspend", m_scrollArea);
+    m_logoutBtn = new MyPushButton(m_btnImagesPath+"/logout.svg", QApplication::tr("Logout"), "logout", m_scrollArea);
+    m_rebootBtn = new MyPushButton(m_btnImagesPath+"/reboot.svg", QApplication::tr("Reboot"), "reboot", m_scrollArea);
+    m_shutDownBtn = new MyPushButton(m_btnImagesPath+"/shutdown.svg", QApplication::tr("Shut Down"), "shutdown", m_scrollArea);
+    m_lockScreenBtn = new MyPushButton(m_btnImagesPath+"/lockscreen.svg", QApplication::tr("Lock Screen"), "lockscreen", m_scrollArea);
 
     //ui->setupUi(this);
     m_switchUserBtn->installEventFilter(this);
@@ -400,12 +415,6 @@ void MainWindow::initialBtn()
 
 void MainWindow::initialJudgeWidget()
 {
-    int margins = 0;
-    if (m_screen.width() > 1088) {
-        margins = (m_screen.width() - 60 * 6 - 140 * 7) / 2;
-    } else {
-        margins = (m_screen.width() - 60 * 2 - 140 * 3) / 2;
-    }
 //    QStringList userlist = getLoginedUsers();
     QStringList userlist = LockChecker::getLoginedUsers();
     if (userlist.count() > 1) {
@@ -416,7 +425,7 @@ void MainWindow::initialJudgeWidget()
     m_judgeLabel->setText(tips);
     m_judgeLabel->setStyleSheet("color:white;font:12pt;");
     m_judgeLabel->setObjectName("label");
-    m_judgeLabel->setGeometry(0,0,m_screen.width() - 2 * margins,50);
+    m_judgeLabel->setGeometry(0,0,m_screen.width() - 160,50);
     //m_judgeLabel->setFixedHeight(60);
 
     qDebug() << "m_judgeLabel width:" << m_judgeLabel->width() << m_judgeLabel->height();
@@ -606,15 +615,18 @@ void MainWindow::initialBtnCfg()
     m_btnCfgSetting->setValue("btn/SwitchUserBtnHide", isSwitchuserHide);
     m_btnCfgSetting->setValue("btn/HibernateBtnHide", isHibernateHide);
     m_btnCfgSetting->setValue("btn/SuspendBtnHide", isSuspendHide);
+    m_btnCfgSetting->setValue("btn/LogoutBtnHide", isLogoutHide);
+    m_btnCfgSetting->setValue("btn/RebootBtnHide", isRebootHide);
+    m_btnCfgSetting->setValue("btn/ShutDownBtnHide", isPowerOffHide);
 
     qDebug() << "isHibernateHide..." << isHibernateHide;
     m_btnHideMap.insert(m_switchUserBtn, isSwitchuserHide);
     m_btnHideMap.insert(m_hibernateBtn, isHibernateHide);
     m_btnHideMap.insert(m_suspendBtn, isSuspendHide);
     m_btnHideMap.insert(m_lockScreenBtn, m_btnCfgSetting->value("btn/LockScreenBtnHide").toBool());
-    m_btnHideMap.insert(m_logoutBtn, m_btnCfgSetting->value("btn/LogoutBtnHide").toBool());
-    m_btnHideMap.insert(m_rebootBtn, m_btnCfgSetting->value("btn/RebootBtnHide").toBool());
-    m_btnHideMap.insert(m_shutDownBtn, m_btnCfgSetting->value("btn/ShutDownBtnHide").toBool());
+    m_btnHideMap.insert(m_logoutBtn, isLogoutHide);
+    m_btnHideMap.insert(m_rebootBtn, isRebootHide);
+    m_btnHideMap.insert(m_shutDownBtn, isPowerOffHide);
 }
 
 void MainWindow::setLayoutWidgetVisible(QLayout* layout, bool show)
@@ -723,7 +735,7 @@ void MainWindow::showNormalBtnWidget(int hideNum)
     m_scrollArea->verticalScrollBar()->setVisible(false);
     m_scrollArea->verticalScrollBar()->setDisabled(true);
 
-    m_buttonHLayout->setContentsMargins(0,0,0,160);
+    m_buttonHLayout->setContentsMargins(0,0,0,260);
 
     for (int i = 0;i < m_buttonHLayout->count(); i++) {
         QLayoutItem*item = m_buttonHLayout->layout()->itemAt(i);
@@ -830,16 +842,15 @@ void MainWindow::ResizeEvent()
     }
 
     // Move the widget to the direction where they should be
-    int recWidth;
-    if (m_IsRoundBtn) {
-        recWidth = 128;
-    } else {
-        recWidth = 140;
-    }
     for (int i = 0; i <= 6; i++) {
-        if (m_btnHideMap.value(map.value(i))) {
+        if (m_btnHideMap.value(map.value(i)))
+        {
             map[i]->hide();
         }
+        else
+        {
+            map[i]->show();
+        }
     }
     if((m_screen.width() -160 - 128 * (7 - hideNum))/(6-hideNum) >= 16)
     {
@@ -1302,6 +1313,7 @@ void MainWindow::drawWarningWindow(QRect &rect)
 
     vBoxLayout->addWidget(tips);
     vBoxLayout->addWidget(applist, 0, Qt::AlignHCenter);
+    vBoxLayout->addSpacing(isEnoughBig ? 32 : 0);
     vBoxLayout->addLayout(hBoxLayout, Qt::AlignHCenter);
 
     //移动整个区域到指定的相对位置
diff --git a/tools/mainwindow.h b/tools/mainwindow.h
index fc82c61..a2e418a 100644
--- a/tools/mainwindow.h
+++ b/tools/mainwindow.h
@@ -151,6 +151,10 @@ private:
     bool isSwitchuserHide = true;
     bool isHibernateHide = true;
     bool isSuspendHide = true;
+    bool isLogoutHide = true;
+    bool isRebootHide = true;
+    bool isPowerOffHide = true;
+
     bool lockfile = false;
     bool lockuser = false;
     bool click_blank_space_need_to_exit = true;
@@ -161,7 +165,6 @@ private:
 
     QHash<MyPushButton*, bool> m_btnHideMap;
 
-    bool m_IsRoundBtn = true;//是否是圆形按钮
     QString m_btnImagesPath = "/usr/share/ukui/ukui-session-manager/images";
     MyPushButton *m_switchUserBtn = nullptr;
     MyPushButton *m_hibernateBtn = nullptr;
diff --git a/tools/myiconlabel.cpp b/tools/myiconlabel.cpp
index d1024ec..5e9e00f 100644
--- a/tools/myiconlabel.cpp
+++ b/tools/myiconlabel.cpp
@@ -27,8 +27,7 @@
 #include <QPoint>
 #include <QMouseEvent>
 
-MyIconLabel::MyIconLabel(int labelWidth, int iconWidth, QString path, bool showBackColor, QWidget *parent)
-    :m_showBackColor(showBackColor)
+MyIconLabel::MyIconLabel(int labelWidth, int iconWidth, QString path, QWidget *parent)
 {
     this->setFixedSize(labelWidth, labelWidth);
     this->setObjectName("iconlabel");
@@ -44,13 +43,10 @@ MyIconLabel::MyIconLabel(int labelWidth, int iconWidth, QString path, bool showB
     m_btnIcon->setChecked(false);
     m_btnIcon->setGeometry(QRect((width() - iconWidth)/2, (width() - iconWidth)/2, iconWidth, iconWidth));
     m_btnIcon->setAttribute(Qt::WA_TransparentForMouseEvents,true);
-    if (m_showBackColor) {
-        //mask不要与控件一样大  锯齿明显  稍微大一点
-        this->setMask(QRegion(this->x() - 1, this->y() - 1, this->width() + 2, this->height() + 2,QRegion::Ellipse));
-        this->setStyleSheet("QLabel#"+ this->objectName() + "{background-color: rgb(255,255,255,40);border-radius:" + QString::number(this->width()/2) + "px;}");
-    } else {
-        this->setStyleSheet("QLabel#"+ this->objectName() + "{background-color: transparent;}");
-    }
+
+    //mask不要与控件一样大  锯齿明显  稍微大一点
+    this->setMask(QRegion(this->x() - 1, this->y() - 1, this->width() + 2, this->height() + 2,QRegion::Ellipse));
+    this->setStyleSheet("QLabel#"+ this->objectName() + "{background-color: rgb(255,255,255,40);border-radius:" + QString::number(this->width()/2) + "px;}");
 
     //this->setPixmap(m_pixMap);
     this->setAlignment(Qt::AlignCenter);
@@ -62,44 +58,6 @@ MyIconLabel::~MyIconLabel()
 {
 }
 
-/*
-void MyIconLabel::paintEvent(QPaintEvent *event)
-{
-    return;
-    QPainter painter(this);
-    QColor color;
-    if(m_isNormal)
-        color = QColor(255,255,255,40);
-    else if(m_isHover)
-        color = QColor(255,255,255,80);
-    else if(m_isClicked)
-        color = QColor(255,255,255,100);
-    painter.setPen(QPen(color,0));
-    painter.setBrush(color);
-    painter.drawEllipse(QRect(0,0,width(),height()));
-    painter.drawPixmap(QRect((width() - m_btnIcon.width())/2, (height() - m_btnIcon.height())/2, m_btnIcon.width(), m_btnIcon.height()), m_btnIcon);
-}
-*/
-void MyIconLabel::enterEvent(QEvent *event)
-{
-    if (!m_showBackColor) return;
-    emit mouseEventSignals(event);
-
-    QString str = "QLabel{background-color: rgb(255,255,255,80);border-radius: " + QString::number(this->width()/2) + "px;}";
-
-    this->setStyleSheet(str);
-    this->setAttribute(Qt::WA_StyledBackground);
-}
-
-void MyIconLabel::leaveEvent(QEvent *event)
-{
-    return;
-    if (!m_showBackColor) return;
-    QString str = "QLabel{background-color: rgb(255,255,255,40);border-radius: " + QString::number(this->width()/2) + "px;}";
-    this->setStyleSheet(str);
-    this->setAttribute(Qt::WA_StyledBackground);
-}
-
 bool MyIconLabel::event(QEvent *event)
 {
 //    qDebug() << m_showBackColor << "event..." << event->type();
@@ -121,31 +79,6 @@ bool MyIconLabel::event(QEvent *event)
     return QWidget::event(event);
 }
 
-/*
-void MyIconLabel::mouseMoveEvent(QMouseEvent *event)
-{
-    return;
-//    m_point = event->pos();
-//    qDebug() << "MyIconLabel mouseMoveEvent..." << m_point;
-
-//    if(!m_showBackColor)
-//        return;
-//    QRegion region(this->x(), this->y(), this->width(), this->height(),QRegion::Ellipse);
-//    qDebug() << "MyIconLabel mouseMoveEvent..." << m_point << region;
-
-//    QString str;
-
-//    if(!region.contains(m_point))
-//        str = "QLabel{background-color: rgb(255,255,255,40);border-radius: " + QString::number(this->width()/2) + "px;}";
-//    else
-//        str = "QLabel{background-color: rgb(255,255,255,80);border-radius: " + QString::number(this->width()/2) + "px;}";
-
-//    this->setStyleSheet(str);
-//    this->setAttribute(Qt::WA_StyledBackground);
-
-}
-*/
-
 bool MyIconLabel::containsPoint(QPoint p)
 {
     QPainterPath path;
@@ -153,32 +86,3 @@ bool MyIconLabel::containsPoint(QPoint p)
     //qDebug() << "containsPoint..." << width() << height() << p << QRect(0,0,width(),height());
     return path.contains(p);
 }
-
-/*
-void MyIconLabel::paintEvent(QPaintEvent *)
-{
-    QPainter painter(this);
-    painter.setPen(QPen(QColor(0,0,0),2));
-    painter.setBrush(QColor(10,10,10));
-    QPainterPath path;
-    QRect rect(10,50,100,48);
-    const qreal radius = 24;
-    path.moveTo(rect.topRight() - QPointF(radius, 0));
-    path.lineTo(rect.topLeft() + QPointF(radius, 0));
-    path.quadTo(rect.topLeft(), rect.topLeft() + QPointF(0, radius));
-    path.lineTo(rect.bottomLeft() + QPointF(0, -radius));
-    path.quadTo(rect.bottomLeft(), rect.bottomLeft() + QPointF(radius, 0));
-    path.lineTo(rect.bottomRight() - QPointF(radius, 0));
-    path.quadTo(rect.bottomRight(), rect.bottomRight() + QPointF(0, -radius));
-    path.lineTo(rect.topRight() + QPointF(0, radius));
-    path.quadTo(rect.topRight(), rect.topRight() + QPointF(-radius, -0));
-    painter.drawPath(path);
-    qDebug() << "1111" << path.contains(QPoint(11,51));
-}
-
-
-void MyIconLabel::mousePressEvent(QMouseEvent* event)
-{
-    qDebug() << "mousePressEvent..." << event->pos();
-}
-*/
diff --git a/tools/myiconlabel.h b/tools/myiconlabel.h
index 9546291..ad8b45d 100644
--- a/tools/myiconlabel.h
+++ b/tools/myiconlabel.h
@@ -36,24 +36,17 @@ class MyIconLabel : public QLabel
     Q_OBJECT
 
 public:
-    MyIconLabel(int labelWidth, int iconWidth, QString path, bool showBackClor, QWidget *parent = nullptr);
+    MyIconLabel(int labelWidth, int iconWidth, QString path, QWidget *parent = nullptr);
     ~MyIconLabel();
 
     bool containsPoint(QPoint p);
 protected:
-    void enterEvent(QEvent *event);
-    void leaveEvent(QEvent *event);
     bool event(QEvent *);
-    //void paintEvent(QPaintEvent *event);
-    //void mouseMoveEvent(QMouseEvent *event);
-    //void mousePressEvent(QMouseEvent* event);
+
 private:
     PushButton *m_btnIcon = nullptr;
     bool m_showBackColor = false;
     QPoint m_point;
-//    bool m_isNormal = true;
-//    bool m_isHover = false;
-//    bool m_isClicked = false;
 protected:
 
 public:
diff --git a/tools/mypushbutton.cpp b/tools/mypushbutton.cpp
index e54163f..72c9994 100644
--- a/tools/mypushbutton.cpp
+++ b/tools/mypushbutton.cpp
@@ -22,20 +22,16 @@
 #include <QVBoxLayout>
 #include <QDebug>
 #include <QEvent>
-MyPushButton::MyPushButton(QString iconPath, QString buttonLable, QString objName, QWidget *parent, bool isRecBtn, int x, int y,
+MyPushButton::MyPushButton(QString iconPath, QString buttonLable, QString objName, QWidget *parent, int x, int y,
                            int width, int height, int iconWidth, int labelWidth)
-    : m_isRecBtn(isRecBtn)
-    , QWidget(parent)
+    : QWidget(parent)
 {
-    if (m_isRecBtn) {
-        this->setFixedSize(width, width);
-    } else {
-        this->setFixedSize(labelWidth, height);
-    }
+    this->setFixedSize(labelWidth, height);
+
     this->setObjectName(objName);
     QVBoxLayout *vBoxLayout = new QVBoxLayout();
     vBoxLayout->setContentsMargins(0, 0, 0, 10);
-    m_iconLabel = new MyIconLabel(labelWidth, iconWidth, iconPath, !isRecBtn);
+    m_iconLabel = new MyIconLabel(labelWidth, iconWidth, iconPath);
     m_iconLabel->setObjectName(objName + "_button");
     m_iconLabel->installEventFilter(this);
 
@@ -46,10 +42,6 @@ MyPushButton::MyPushButton(QString iconPath, QString buttonLable, QString objNam
     m_buttonLabel->setStyleSheet("color: white; font: 12pt");
     m_buttonLabel->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
 
-    if (m_isRecBtn) {
-        this->setStyleSheet("QWidget#" + this->objectName() + "{background-color: transparent;border-radius: 6px;}");
-        this->setAttribute(Qt::WA_StyledBackground);
-    }
     vBoxLayout->addWidget(m_iconLabel, 0, Qt::AlignHCenter);
     vBoxLayout->addWidget(m_buttonLabel, 0, Qt::AlignHCenter);
     this->setLayout(vBoxLayout);
diff --git a/tools/mypushbutton.h b/tools/mypushbutton.h
index 640c28b..988208d 100644
--- a/tools/mypushbutton.h
+++ b/tools/mypushbutton.h
@@ -35,9 +35,8 @@ class MyPushButton : public QWidget
     Q_OBJECT
 
 public:
-    MyPushButton(QString iconPath, QString buttonLable, QString objName, QWidget *parent = nullptr, bool isRecBtn=true, int x = 0, int y = 0,
-                 int width = 140, int height = 180, int iconWidth = 48,
-                 int labelWidth = 128);
+    MyPushButton(QString iconPath, QString buttonLable, QString objName, QWidget *parent = nullptr, int x = 0, int y = 0,
+                 int width = 140, int height = 180, int iconWidth = 48, int labelWidth = 128);
     ~MyPushButton();
 
     void changeIconBackColor(bool isChoose = true, bool isKeySelect = false);
@@ -60,7 +59,6 @@ private:
     QFont m_buttonLabelFont;
     QPixmap m_pixMap;
     MyIconLabel *m_iconLabel = nullptr;
-    bool m_isRecBtn=true;//true 背景为整体  false表示背景只在ICON区域
     bool m_isKeySelect = false;//是否通过键盘选中
     bool m_isMouseSelect = false;//是否鼠标选中
 protected:

From 38b3f3aa33baac4501371fc28162593aa85e3a80 Mon Sep 17 00:00:00 2001
From: tanjing <tanjing@kylinos.cn>
Date: Tue, 8 Mar 2022 11:23:37 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt       |   2 +-
 tools/mainwindow.cpp |  14 +++--
 tools/mainwindow.h   | 123 +++++++++++++++++++++++++++++++++++++++----
 3 files changed, 119 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 601f64d..e5f8a94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ if (NOT DEFINED UPDATE_TRANSLATIONS)
     set(UPDATE_TRANSLATIONS "No")
 endif()
 
-# To create a new ts file: lupdate -recursive . -target-language en_US -ts translations/en_US.ts
+# To create a new ts file: lupdate -recursive . -target-language en_US -ts translations/en_US.ts -no-ui-lines
 file(GLOB TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
 
 # cmake -DUPDATE_TRANSLATIONS=yes
diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
index f4e53e6..134d76a 100644
--- a/tools/mainwindow.cpp
+++ b/tools/mainwindow.cpp
@@ -185,7 +185,6 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
         inhibitShutdown = true;
     }
 
-
     user     = getenv("USER");
     lockfile = a;
     lockuser = b;
@@ -246,7 +245,7 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
     m_vBoxLayout->addLayout(m_dateTimeLayout, 60);
     m_vBoxLayout->addStretch();
     m_vBoxLayout->addLayout(m_judgeWidgetVLayout, 140);
-    m_vBoxLayout->addWidget(m_scrollArea,632);
+    m_vBoxLayout->addWidget(m_scrollArea, 632);
     m_vBoxLayout->addStretch(174);
     m_vBoxLayout->addLayout(m_messageVLayout, 80);
     //m_vBoxLayout->addWidget(m_systemMonitorBtn,48,Qt::AlignHCenter);
@@ -257,8 +256,8 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
     qDebug() << "width..........." << m_judgeLabel->width() << m_scrollArea->width() << m_messageLabel1->width() << m_messageLabel2->width();
     //根据屏幕分辨率与鼠标位置重设界面
     //m_screen = QApplication::desktop()->screenGeometry(QCursor::pos());
-    setFixedSize(QApplication::primaryScreen()->virtualSize());
-
+    //setFixedSize(QApplication::primaryScreen()->virtualSize());
+    setGeometry(0, 0, QApplication::primaryScreen()->virtualSize().width(), QApplication::primaryScreen()->virtualSize().height());
     move(0, 0);//设置初始位置的值
 
     //设置窗体无边框，不可拖动拖拽拉伸;为顶层窗口，无法被切屏;不使用窗口管理器
@@ -668,7 +667,7 @@ void MainWindow::mouseReleaseSlots(QEvent *event, QString objName)
 {
     for (auto iter = map.begin(); iter != map.end(); iter++) {
         if (iter.value()->getIconLabel()->objectName() == objName) {
-            changePoint(iter.value(), event, iter.key());
+            changePoint(iter.value(), event);
             if (event->type() == QEvent::MouseButtonRelease) {
                 qDebug() << "mouseReleaseSlots..." << objName;
                 doEvent(objName, iter.key());
@@ -825,6 +824,7 @@ void MainWindow::showHasScrollBarBtnWidget(int hideNum)
 void MainWindow::ResizeEvent()
 {
     m_screen = QApplication::desktop()->screenGeometry(QCursor::pos());
+    setGeometry(0, 0, QApplication::primaryScreen()->virtualSize().width(), QApplication::primaryScreen()->virtualSize().height());
 
     if(m_showWarningMesg)
     {
@@ -946,7 +946,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event)
     return QWidget::eventFilter(obj, event);
 }
 
-void MainWindow::changePoint(QWidget *widget, QEvent *event, int i)
+void MainWindow::changePoint(QWidget *widget, QEvent *event)
 {
     if (event->type() == QEvent::Enter) {
         changeBtnState(widget->objectName());
@@ -1366,8 +1366,6 @@ void MainWindow::judgeboxShow()
     }
     m_scrollArea->verticalScrollBar()->setVisible(false);
 
-    int xx = m_screen.x();
-    int yy = m_screen.y();   //取得当前鼠标所在屏幕的最左，上坐标
     setLayoutWidgetVisible(m_dateTimeLayout, false);
     setLayoutWidgetVisible(m_judgeWidgetVLayout, true);
     setLayoutWidgetVisible(m_judgeBtnHLayout, true);
diff --git a/tools/mainwindow.h b/tools/mainwindow.h
index a2e418a..b981919 100644
--- a/tools/mainwindow.h
+++ b/tools/mainwindow.h
@@ -47,10 +47,33 @@ public:
     MainWindow(bool a , bool b ,QWidget *parent = nullptr);
     ~MainWindow();
 
+    /**
+     * @brief 响应按钮事件
+     * @param test2 按钮名字
+     * @param i 按钮序号
+     */
     void doEvent(QString test2,int i);
-    void changePoint(QWidget *widget ,QEvent *event ,int i);
+
+    /**
+     * @brief 响应鼠标事件后改变按钮状态
+     * @param widget 指定按钮对象
+     * @param widget 鼠标事件
+     */
+    void changePoint(QWidget *widget ,QEvent *event);
+
+    /**
+     * @brief 调整界面显示的控件
+     */
     void judgeboxShow();
+
+    /**
+     * @brief 模拟按键
+     */
     void keyPressEmulate();
+
+    /**
+     * @brief 消息过滤
+     */
     virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) override;
     //void closeEvent(QCloseEvent *event);
 
@@ -97,28 +120,104 @@ public:
     void changeBtnState(QString btnName, bool isEnterKey = false);
 
 private:
-    QString getAppLocalName(QString desktopfp);//获取应用名
-    void ResizeEvent();
-    void showInhibitWarning();//当有inhibitor存在时显示提醒界面
-    void drawWarningWindow(QRect &rect);//画出提醒界面
-    QMap<QString, QString> findNameAndIcon(QString &basename);//根据inhibitor的名称获取对应desktop文件中的应用名和icon路径
+    /**
+     * @brief 获取应用名
+     */
+    QString getAppLocalName(QString desktopfp);
 
-    void calculateBtnSpan(int allNum, int lineMaxNum, MyPushButton*, int& row, int& colum);
+    /**
+     * @brief 重新计算界面大小及控件位置布局
+     */
+    void ResizeEvent();
+
+    /**
+     * @brief 当有inhibitor存在时显示提醒界面
+     */
+    void showInhibitWarning();
+
+    /**
+     * @brief 画出提醒界面
+     */
+    void drawWarningWindow(QRect &rect);
+
+    /**
+     * @brief 根据inhibitor的名称获取对应desktop文件中的应用名和icon路径
+     */
+    QMap<QString, QString> findNameAndIcon(QString &basename);
+
+    /**
+     * @brief 根据inhibitor的名称获取对应desktop文件中的应用名和icon路径
+     * @param allNum 共显示的按钮数
+     * @param lineMaxNum 一行最多显示的按钮数
+     * @param btn 指定按钮
+     */
+    void calculateBtnSpan(int allNum, int lineMaxNum, MyPushButton* btn, int& row, int& colum);
+
+    /**
+     * @brief 计算键盘左右键对应的按钮
+     * @param key 按键名字
+     */
     void calculateKeyBtn(const QString &key);
+
+    /**
+     * @brief 按钮是否可用
+     * @param index 按钮序号
+     */
     bool judgeBtnIsEnable(int index);
+
+    /**
+     * @brief 打开监视器
+     */
     //void doSystemMonitor();
 
+    /**
+     * @brief 显示常规的按钮界面
+     * @param hideBtnNum 隐藏的按钮数
+     */
     void showNormalBtnWidget(int hideBtnNum);
+
+    /**
+     * @brief 显示需要换行的按钮界面
+     * @param hideBtnNum 隐藏的按钮数
+     */
     void showHasScrollBarBtnWidget(int hideBtnNum);
 Q_SIGNALS:
+    /**
+     * @brief 按钮点击后的事件信号
+     */
     void signalTostart();
+
+    /**
+     * @brief 点击提示界面的确认按钮信号
+     */
     void confirmButtonclicked();
 
 private Q_SLOTS:
+    /**
+     * @brief 退出
+     */
     bool exitt();
+
+    /**
+     * @brief 按键按下事件
+     * @param key 键名
+     */
     void onGlobalKeyPress(const QString &key);
+
+    /**
+     * @brief 按键弹起事件
+     * @param key 键名
+     */
     void onGlobalkeyRelease(const QString &key);
+
+    /**
+     * @brief 屏幕变化
+     */
     void screenCountChanged();
+
+    /**
+     * @brief 点击按钮事件
+     */
     void mouseReleaseSlots(QEvent *event, QString objName);
 
 protected:
@@ -148,6 +247,8 @@ private:
     XEventMonitor *xEventMonitor;
     int tableNum;
     bool flag = false;
+
+    /// 各按钮是否隐藏 默认隐藏
     bool isSwitchuserHide = true;
     bool isHibernateHide = true;
     bool isSuspendHide = true;
@@ -162,7 +263,6 @@ private:
     bool inhibitSleep = false;
     bool inhibitShutdown = false;
 
-
     QHash<MyPushButton*, bool> m_btnHideMap;
 
     QString m_btnImagesPath = "/usr/share/ukui/ukui-session-manager/images";
@@ -202,6 +302,7 @@ private:
     //QLabel *m_systemMonitorLabel = nullptr;
     //QPixmap m_systemMonitorIcon;
 
+    /// 计算各按钮的行列位置
     int m_switchRow = 0, m_switchColumn = 0;
     int m_hibernateRow = 0, m_hibernateColumn = 0;
     int m_suspendRow = 0, m_suspendColumn = 0;
@@ -213,8 +314,8 @@ private:
 
     QSettings *m_btnCfgSetting = nullptr;
     QRect m_screen;
-    QWidget *m_showWarningArea = nullptr;
-    bool m_btnWidgetNeedScrollbar = false;
-    bool m_showWarningMesg = false;
+    QWidget *m_showWarningArea = nullptr; /// 阻止列表
+    bool m_btnWidgetNeedScrollbar = false; /// 是否需要滑动条显示
+    bool m_showWarningMesg = false; /// 是否显示阻止列表
 };
 #endif // MAINWINDOW_H

From 88cfb8a01510cd221079e6847c98448734a0993a Mon Sep 17 00:00:00 2001
From: tanjing <tanjing@kylinos.cn>
Date: Tue, 15 Mar 2022 09:59:46 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=8C=E5=B1=8F?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/mainwindow.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
index 5291062..0e20b7a 100644
--- a/tools/mainwindow.cpp
+++ b/tools/mainwindow.cpp
@@ -680,11 +680,12 @@ void MainWindow::mouseReleaseSlots(QEvent *event, QString objName)
 void MainWindow::screenCountChanged()
 {
     QDesktopWidget *desktop = QApplication::desktop();
-    qDebug() << "inside screenCountChanged,screenCount = " << desktop->screenCount();
+    qDebug() << "inside screenCountChanged,screenCount = " << desktop->screenCount() << QApplication::desktop()->screenGeometry(QCursor::pos()).width() << QApplication::desktop()->screenGeometry(QCursor::pos()).height();
     //setGeometry(desktop->geometry());
     //updateGeometry();
     //move(0,0);
-    setFixedSize(QApplication::primaryScreen()->virtualSize());
+    //setFixedSize(QApplication::primaryScreen()->virtualSize());
+    setGeometry(0, 0, QApplication::primaryScreen()->virtualSize().width(), QApplication::primaryScreen()->virtualSize().height());
     ResizeEvent();
     update();
 }
@@ -712,7 +713,7 @@ void MainWindow::showNormalBtnWidget(int hideNum)
     int margins = 0;
 
     margins = (m_screen.width() -160 - 128 * (7 - hideNum))/(6-hideNum);
-    qDebug() << "margins:" << margins;
+    qDebug() << "showNormalBtnWidget hideNum:" << hideNum << "margins:" << margins;
     int btnWidgetWidth = 0;
     if(margins > 60)
     {
@@ -734,7 +735,7 @@ void MainWindow::showNormalBtnWidget(int hideNum)
     m_scrollArea->verticalScrollBar()->setVisible(false);
     m_scrollArea->verticalScrollBar()->setDisabled(true);
 
-    m_buttonHLayout->setContentsMargins(0,0,0,260);
+    m_buttonHLayout->setContentsMargins(0,0,0,340);
 
     for (int i = 0;i < m_buttonHLayout->count(); i++) {
         QLayoutItem*item = m_buttonHLayout->layout()->itemAt(i);
@@ -762,7 +763,7 @@ void MainWindow::showHasScrollBarBtnWidget(int hideNum)
     int needHeight = (m_lineNum * 171 + (m_lineNum - 1) * 32);
     int btnWidgetHeight = 632;
 
-    qDebug() << "lineWidth:" << lineWidth << "lineMaxBtnNum:" << lineMaxBtnNum << "needHeight:" << needHeight << "lineNum:" << m_lineNum<< allBtnNum/lineMaxBtnNum << allBtnNum%lineMaxBtnNum;
+    qDebug() << "showHasScrollBarBtnWidget lineWidth:" << lineWidth << "lineMaxBtnNum:" << lineMaxBtnNum << "needHeight:" << needHeight << "lineNum:" << m_lineNum<< allBtnNum/lineMaxBtnNum << allBtnNum%lineMaxBtnNum;
 
     calculateBtnSpan(allBtnNum, lineMaxBtnNum, m_switchUserBtn, m_switchRow, m_switchColumn);
     calculateBtnSpan(allBtnNum, lineMaxBtnNum, m_hibernateBtn, m_hibernateRow, m_hibernateColumn);
@@ -793,11 +794,11 @@ void MainWindow::showHasScrollBarBtnWidget(int hideNum)
         qDebug() << "set bar pos...";
         //m_scrollArea->verticalScrollBar()->setGeometry(QRect(lineWidth + 20, 0, 6, 100));
         m_scrollArea->setContentsMargins(0,0,0,0);
-        m_scrollArea->setGeometry(QRect(0,0,128 * lineMaxBtnNum + 60 * (lineMaxBtnNum-1)  +6,btnWidgetHeight));
+        m_scrollArea->setGeometry(QRect(0,0,128 * lineMaxBtnNum + 60 * (lineMaxBtnNum-1) + 6, btnWidgetHeight * m_screen.height()/1080));
 
         m_buttonHLayout->setContentsMargins(0,0,0,0);// (needHeight > 632 ? 0 : (632 - needHeight)) * m_screen.height()/1080);
 
-        m_btnWidget->setGeometry(QRect(0,0,128 * lineMaxBtnNum + 60 * (lineMaxBtnNum-1),needHeight));
+        m_btnWidget->setGeometry(QRect(0,0,128 * lineMaxBtnNum + 60 * (lineMaxBtnNum-1), needHeight));
         m_btnWidget->setContentsMargins(6,0,12,0);
         qDebug() << "m_btnWidget FixedHeight:" << needHeight << btnWidgetHeight << m_btnWidget->width() << m_scrollArea->width();
         qDebug() << "isSwitchuserHide:" << isSwitchuserHide << "isHibernateHide:" << isHibernateHide << "isSuspendHide:" << isSuspendHide;
@@ -867,6 +868,11 @@ void MainWindow::ResizeEvent()
     m_scrollArea->setWidget(m_btnWidget);
     m_scrollArea->setStyleSheet("QScrollArea#scrollArea{background-color: transparent;}");
     m_scrollArea->setAlignment(Qt::AlignHCenter);
+    qDebug() << "m_scrollArea geometry:" << m_scrollArea->geometry();
+    qDebug() << "m_btnWidget geometry:" << m_btnWidget->geometry();
+
+    m_vBoxLayout->setContentsMargins((m_screen.width() - m_scrollArea->width() - 20)/2,0,(m_screen.width() - m_scrollArea->width() - 20)/2,0);
+
     //m_scrollArea->adjustSize();
     //m_scrollArea->setWidgetResizable(true);
     m_toolWidget->setGeometry(m_screen);

From 090499a1e166e45d2f39c314273c5dd5d6fd7609 Mon Sep 17 00:00:00 2001
From: tanjing <tanjing@kylinos.cn>
Date: Tue, 15 Mar 2022 17:09:47 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/images/hibernate.png  | Bin 902 -> 0 bytes
 data/images/hibernate.svg  |   2 +-
 data/images/lockscreen.png | Bin 502 -> 0 bytes
 data/images/lockscreen.svg |   2 +-
 data/images/logout.png     | Bin 562 -> 0 bytes
 data/images/logout.svg     |   2 +-
 data/images/reboot.png     | Bin 639 -> 0 bytes
 data/images/reboot.svg     |   2 +-
 data/images/shutdown.png   | Bin 684 -> 0 bytes
 data/images/shutdown.svg   |   2 +-
 data/images/suspend.png    | Bin 817 -> 0 bytes
 data/images/suspend.svg    |  11 +----------
 data/images/switchuser.png | Bin 630 -> 0 bytes
 data/images/switchuser.svg |   2 +-
 14 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 data/images/hibernate.png
 delete mode 100644 data/images/lockscreen.png
 delete mode 100644 data/images/logout.png
 delete mode 100644 data/images/reboot.png
 delete mode 100644 data/images/shutdown.png
 delete mode 100644 data/images/suspend.png
 delete mode 100644 data/images/switchuser.png

diff --git a/data/images/hibernate.png b/data/images/hibernate.png
deleted file mode 100644
index a6338b182d17cbe633cdafa67297d95851d29f23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 902
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIoCO|{#S9GGLLkg|>2BR0
z1_ovePZ!6KjK;H(-G#Recvy>N4=86eS2XXEULkztuESh~cPx^QHxJx%c*jzvw!wUY
zxkI03#X&~_R<BJycb*n?dVFL&@|>~Bl10$GV~6t*HbMOxQ~&C)Yktao<Hj$=P{-)N
z$*{Wd>GhQk>B5`J7DxPC6!G7sD~++{X{;k-tYT7QNA$;>>5OmwH+85gZDaZ|&Gz|&
zzq`IRE7o%=?c*w#S`o)JU9zkFDT`n><2r!{+-1hO=N@G9%5Xnhb9dRh$isj4UAkuD
z(&GQUG2ZZcW)ai*+Fj-ftzS16&7JT(T5>~DtVTrnVvdteqGcDB?>%~RmytTFliN<7
zHMd)%qxkMNaJ<e>UOjVBR)f7u#JT>c`633IyH;#CBYgJx6uah>!$v!Qe@T<uS>{-?
zN6*vJmeFCulbe>){U0ZatUpj5Rdr5qLGil>9t;oI8ScEe`15oA>i>tEV>;%ZUHxC&
z+k?|fP`^7copIkZ{>ht8U5fO`4Bc77RyZO0Pw3oI?}<As^p^E<3Mkj8DXCXwYEIrM
zvY&Ca|Nq7JQ^j<jbVz92kTagUK<nO#y^DT#cUDFF=VYZ7DQcCm|N4BCOO8QGYu3Hx
z^;XaC_3UE5m|xAa+b3l`>(ksVX8%i~)h|o-+@HUOtKo%w(#8o=N3IyO_N|vKc`ITh
ze)GFkJ5v%<h0*uhnk7ze9y403v|k{pZS>(A&-6<dI%+S4yNjAzx=4R!Dh|-9ep+F;
z(!$qw@gLV^%l4(ekNUCers(sK114df0ZH>GiKGd>PS9S|vSyp^(wCl7ntOKlr|#Zx
z!6eE=CZh9phGxLokB$*q6IHA>Yb?+C($2E%=d(G#ZG$?SR<unM>FW`Rd#Nt6CVi3V
zEcObnqJV$*Eo%z)%v;2<bK<w3rmi91U*2J`-jR0g^O4v6#piB)`J&}KtuF0Jp|8tZ
zAD8#X@>JGHKIc58zHE1S;*_&H?)yt8YRUh6_wDDDm|pgJo7XCPEPl-_ZTp_@+M^O)
za$3>#eEYk*CuUs~zvIce!MsD6JzvAtYhK;bFF)jFep;*9VD2^ROZ9)N=Y1<@xN(La
zuWESD@2OF+INj%@`2tSH5B7EEUg_R`&a^P&r&8IRoLq(<3}@$rcL(0{1!XJ-Pgg&e
IbxsLQ09QPl%K!iX

diff --git a/data/images/hibernate.svg b/data/images/hibernate.svg
index 1693a24..6cfad35 100644
--- a/data/images/hibernate.svg
+++ b/data/images/hibernate.svg
@@ -1 +1 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style></defs><title>画板 6</title><path class="cls-1" d="M25.73,5.22a22.84,22.84,0,0,0-9.68,20.25A23.08,23.08,0,0,0,37,46.92c.65,0,1.32.08,2,.08a23,23,0,0,0,7-1.11A24,24,0,1,1,25.73,5.22M29,3a25.62,25.62,0,0,0-2.61.13A26,26,0,1,0,50.3,43.91,1,1,0,0,0,49,42.47,20.89,20.89,0,0,1,39,45c-.6,0-1.2,0-1.81-.08a21,21,0,0,1-6.95-40A1,1,0,0,0,29.87,3Z"/><polyline class="cls-2" points="39 32 48 32 39 40 48 40"/><polyline class="cls-2" points="48 24 54 24 48 29 54 29"/><polyline class="cls-2" points="30 30 36 30 30 35 36 35"/></svg>
\ No newline at end of file
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M41.06,31.53A18.5,18.5,0,0,1,16,6.44a1.51,1.51,0,0,0-2-2A21.5,21.5,0,1,0,43.1,33.57a1.51,1.51,0,0,0-2-2ZM24.22,41.78A18.5,18.5,0,0,1,11.39,10a21.27,21.27,0,0,0-.67,5.33,21.52,21.52,0,0,0,21.5,21.5,21.27,21.27,0,0,0,5.33-.67A18.49,18.49,0,0,1,24.22,41.78Z" fill="#fff"/><path d="M26,31h6.8a1,1,0,0,0,0-2H28.41l4.3-4.29a1,1,0,0,0,.21-1.09A1,1,0,0,0,32,23H26.4a1,1,0,0,0,0,2h3.19l-4.3,4.29a1,1,0,0,0-.21,1.09A1,1,0,0,0,26,31Z" fill="#fff"/><path d="M29,20h6.8a1,1,0,0,0,0-2H31.41l4.3-4.29a1,1,0,0,0,.21-1.09A1,1,0,0,0,35,12H29.4a1,1,0,0,0,0,2h3.19l-4.3,4.29a1,1,0,0,0-.21,1.09A1,1,0,0,0,29,20Z" fill="#fff"/><path d="M43.8,27H39.41l4.3-4.29a1,1,0,0,0,.21-1.09A1,1,0,0,0,43,21H37.4a1,1,0,0,0,0,2h3.19l-4.3,4.29a1,1,0,0,0-.21,1.09A1,1,0,0,0,37,29h6.8a1,1,0,0,0,0-2Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/images/lockscreen.png b/data/images/lockscreen.png
deleted file mode 100644
index 7985bba3cdae1deef8614f156d02743caa23f93c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 502
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIoCO|{#S9GGLLkg|>2BR0
z1_s6zo-U3d8I5meKAhNOAkaE_^#LJ`#-KM3bXr$82<bSkXY$&>@}}YSgS!QrcUCsD
zaH#27{QPI3eDYm&n((BIB&G!{0n8a6Je1F$TH%?@@PK21tl-<l`PFxtJ}@_McfMhm
zb2Py5E!WR?I=M2n_nVjfknUVLtz%-H=-1tQ?;LTc*}iOD>b?>!wG}yGoy#q99tnjn
zwSPIW?f*+rS09T@{y9;(t2zwt&dEqV`bAZ1WyzweYtF39JG-Ke<=L+(=T~q2roLgl
zcxS2XlL(g;jNf0^92fH6G2`XED<(I)SkF2qi|bXqxiLp2v&r<Mvv)@Ep7o3?PtGcz
z`9+6Q`D64=hPJbo49i25=0DitR<n3#{`6dK`MzboAA+v&-#tC$oI>i857UKBbIca~
zm6z(QS~YR@hF{0`GH&7imjC09gl6WPRG;{|iJ6mmGbSH7@Zi=F!M7ZzZa6;LFPXP?
zYq9L|4{K94J}R0M<8&*98H$z|ec1Y8_l_r@8<=i3nB}KG$a})(;NB;Hsbqdu$os!>
z8TZYL)83aazEZe<`{k5J5C1c={<^cb?c*lHV}F?Xd5=B{*SA{Az`(%Z>FVdQ&MBb@
E0L@tJf&c&j

diff --git a/data/images/lockscreen.svg b/data/images/lockscreen.svg
index 7c0ab9a..1f910ee 100644
--- a/data/images/lockscreen.svg
+++ b/data/images/lockscreen.svg
@@ -1 +1 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2px;}.cls-2{fill:#fff;}</style></defs><title>画板 5</title><g id="锁定"><rect class="cls-1" x="7" y="20" width="44" height="34" rx="6"/><path class="cls-1" d="M16,20V17A13,13,0,0,1,29,4h0A13,13,0,0,1,42,17v3"/><rect class="cls-2" x="26" y="31" width="6" height="12" rx="2"/></g></svg>
\ No newline at end of file
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M36.34,16H34V10.9C34,6,29.51,2,24,2S14,6,14,10.9V16H11.66A6.67,6.67,0,0,0,5,22.66V39.34A6.67,6.67,0,0,0,11.66,46H36.34A6.67,6.67,0,0,0,43,39.34V22.66A6.67,6.67,0,0,0,36.34,16ZM17,10.9C17,7.65,20.14,5,24,5s7,2.65,7,5.9V16H17ZM40,39.34A3.66,3.66,0,0,1,36.34,43H11.66A3.66,3.66,0,0,1,8,39.34V22.66A3.66,3.66,0,0,1,11.66,19H36.34A3.66,3.66,0,0,1,40,22.66Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/images/logout.png b/data/images/logout.png
deleted file mode 100644
index cec5de0a1a3764dd6bfba15b1c42f40df9df2ccb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 562
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIoCO|{#S9GGLLkg|>2BR0
z1_s6_o-U3d8I5<Nx(g2(@YJ4T={dl5md)4v1&8E9<qeMR2`p|La~sN<HZbNan797Z
z!c}bR`h*tk*?niC@x}9-bWZXaFbJ+?G+~&>xaO#G;gjdW2gDm{IUZ&l+|Lo1p>#_i
z(EsU+nQdWZB?q@lPP7(Vrnt!JbL`n<>3{2wm4&!=WE?%S^+K+U_LA#qQ*KVVu>1I$
zuysN+&Dy?5FZGx|`)JUkwF)&#i^7EuRmSxig;-BnP%?Aw&nwR=*Ubobnt5=_hv;I@
z_n+(apRK)<cEg0v;bPC{rrH@#*&F}r>n@tB{qW=M_x`~;5y2n$taF~)M>I~6D=`*$
zULSDH{C1*x^M~5{YsdSUG(XwsJbQk?`qRTShroBnt4}ENRPUN~r!%&^?A_sGws(RS
zF?~3)-+r0+N3$JIY91PyRJnh5=bYGn-t1RFn?m}ciOna^=WumQTrgz^%bYJ}=?_&y
zZ11(H)NmYJa&(fwTGoU&k+$K=#uD=PVlxE0Z<I=`-4W0EF83VYoO>lQ0_O^oxfS0m
zEn64N`TwNMp5>P#JRBeIUefY?k(_tN>I2ou+};_whpLOs50+NP*1Y-N;4JX5`iKh0
zFWV==Eq~=UbE(zw?-EU(AI`f@BdPG_<J^u1*RJO#%{Ps*kKH+O!~Q(x2hy%nI6Mze
T;R<J9U|{fc^>bP0l+XkK*qi;I

diff --git a/data/images/logout.svg b/data/images/logout.svg
index 156f396..9659657 100644
--- a/data/images/logout.svg
+++ b/data/images/logout.svg
@@ -1 +1 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2px;}</style></defs><title>画板 1</title><g id="注销"><path class="cls-1" d="M46,47.33a25,25,0,1,1,0-36.66"/><line class="cls-1" x1="53.68" y1="29" x2="28.68" y2="29"/><path class="cls-1" d="M46.46,21.5l7.22,6.77a1,1,0,0,1,0,1.46L46.46,36.5"/></g></svg>
\ No newline at end of file
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M34.34,35.14A16.58,16.58,0,0,1,21.71,41a17,17,0,0,1,0-34,16.59,16.59,0,0,1,12.65,5.88,1.5,1.5,0,1,0,2.28-2A19.61,19.61,0,0,0,21.71,4,19.88,19.88,0,0,0,2,24,19.88,19.88,0,0,0,21.71,44a19.6,19.6,0,0,0,14.91-6.91,1.5,1.5,0,0,0-2.28-2Z" fill="#fff"/><path d="M40.14,22H21.5a1.5,1.5,0,0,0,0,3H40.14v4.36L46,23.5l-5.86-5.86Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/images/reboot.png b/data/images/reboot.png
deleted file mode 100644
index a78262e2deaec2880dd14a4a11fbf401b69db01c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 639
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIoCO|{#S9GGLLkg|>2BR0
z1_mZWPZ!6KjK-@`-Gzq?c%~N1E>KQs-oz-`$U95W%E{~nhm5cRQwdW-(+0-74z|Ia
zTvydP3m^Ts`}9GF?tb+r^K+O58#+`OLKrr%Gz8fQrC0Sa6fiaHHGC$s_^(35rH&g4
zN!<@KPPU1?W>J!RBi#JsmSd%Rik3@^#Vg$xb9FbDUWqT~eAu+`Nc_q|-(B0@Grhf<
z;=JhNO>QxVd)cBNvo<L1|Let>Y5V_C0pk<ZW2}PV8#}CTt(vkp>ucQ%22rEi69Oc;
zxO8v2&r)FQ`cswjsPCKo){c8jAvdnf6?JQRcF~)m^hV0O@(&aLA4z5uslU^?ZL(1<
zgKd6=ch`>nJ{J>1Z?nJ6l&@j)3as0*u*ipTkIfBV-+!4J@7-r7E*H6w^1Aki=mBN_
zO@{UoS~Y62l}QU0%oVx7_tM&(G5^b7ZNupb5sZ7@-Ah0Aw~OhY+5MZX=SAnf?w<Kr
zHT=<>xdv})lYOShTntIL=jyj4RzoA2ZJo}67{wj)@|hSEmPgLmd5`l%rs%1d{?-|d
z(>XbLS&MB`x6fEyYrXi1{N_l%?k`^4NfLK2Jg>IO+IvvOd^^|998JygDtWs{Pv4k-
zRciig|8Sbs+DojbPrj~oJ9Xrm@`V${ig~@;GuT!h-FA7SvCq3xpLf)~-nw(y_4Y8o
z+5?KV@B4rADQ~t);xe^(s(9b4$L!;wa=qhg&YMm8v%s25Dc1DDl8xs>n+;oz?0EC>
uBhSYh*K>2`U9FnG{*K3y{dvp`_7-MtNvqdRT*tt`z~JfX=d#Wzp$Pyp=Nwr8

diff --git a/data/images/reboot.svg b/data/images/reboot.svg
index d5dcb5d..4f55d46 100644
--- a/data/images/reboot.svg
+++ b/data/images/reboot.svg
@@ -1 +1 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2px;}</style></defs><title>画板 3</title><g id="重启"><path class="cls-1" d="M54,29a25,25,0,1,1-4-13.53"/><polyline class="cls-1" points="50 5 50 16 40 16"/></g></svg>
\ No newline at end of file
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M42.44,21.88A1.5,1.5,0,0,0,41,23.43,17,17,0,0,1,12,36,17,17,0,0,1,34.91,11L32,13.91h8.29V5.62L37,8.84a20,20,0,1,0,7,14.49A1.46,1.46,0,0,0,42.44,21.88Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/images/shutdown.png b/data/images/shutdown.png
deleted file mode 100644
index 4b07a8b452ac3bd464633cb27be89dfbcf9ccd5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 684
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIoCO|{#S9GGLLkg|>2BR0
z1_q`$PZ!6KjK;T--G$8tJfbrdlvA2hnvI;yHIz$O%uaB`sGZ<gBCImEA;-Zy;C$~9
z&9;IY9uBwm?T+c|U-~^KavM(squ}|9!#B@xGN`mMZ77_il2#WM*0%i6eSwA!X_qr^
zUYh(fdLDdPB3b;xI>!b3=Vn-~yDVTReyp!CcQH%A?Zp}M+P9@EPx@oGsCElO*8YC6
zhpoO>4EjU`&K~YQ_+XxRnHzV*H;*sp9bICSlSG9-%Wex{Iq-K*!JTWh`p=r<WS)ft
zH@vy=?x(}fc@woPLWLc^1to6U>!y(8$nUM%zKZEYnx`7~|HiEM&2t;x1qy6jf9ZFE
z3d1{h#p&jiO)K7(uX)9|(JZ9Kx$XRlGsdhM%BG1=$`;FfUasP~Z<=0%#k?0rrA*sO
zJ{l^o4=}jCR`|f_&z{G>sU)nkR&Tg`@zG)ThMjpre#O&Tx3kXpULR<0Uf0^79iV7z
zKQ~bzW_>RML&P5~odYrNSysGpQfDgOyXMHMZ=YP4X1soWIse&@WxvX9as4Zsb@@f(
zzx&hl913hq%5}WFxW9;fyXCrfV#B*da<>+Lu;M-}XW_?RJzufwca^7Pr;-0%t!MIk
zRupYn(Rt9l`-0t_+~c>tJmEf=exuI!aYZci;))7+3pIJp_0L21U6NTo<Aw?U@%kho
zwx<TyrfE(KO4a@IvPIwbjhBR;X?RXlqIcr{ApH#)8L1u{C+MhcIT80v(EU@Q_^K^Q
z;y2tp&s|=3Z*ic{OWFA*lYHm)-)3|w(%<6r@YcS5#dSq9Tv_hSDR{nS-S@j&{ZCC@
q_pbcs$|ZU2Cu7bXV`SLJSQIjS)iSF!9~c-I7(8A5T-G@yGywqF^ff8~

diff --git a/data/images/shutdown.svg b/data/images/shutdown.svg
index 8b8e659..d46725a 100644
--- a/data/images/shutdown.svg
+++ b/data/images/shutdown.svg
@@ -1 +1 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2px;}.cls-2{fill:#fff;}</style></defs><title>画板 2</title><g id="关机"><path class="cls-1" d="M44,9A25,25,0,1,1,14,9"/><rect class="cls-2" x="27" y="3" width="4" height="22" rx="2"/></g></svg>
\ No newline at end of file
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M37.09,11.38a1.5,1.5,0,0,0-2,2.28A16.58,16.58,0,0,1,41,26.29a17,17,0,0,1-34,0,16.59,16.59,0,0,1,5.88-12.65,1.5,1.5,0,1,0-2-2.28A19.61,19.61,0,0,0,4,26.29,19.88,19.88,0,0,0,24,46,19.88,19.88,0,0,0,44,26.29,19.6,19.6,0,0,0,37.09,11.38Z" fill="#fff"/><rect x="22" y="2" width="4" height="24" rx="1.92" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/images/suspend.png b/data/images/suspend.png
deleted file mode 100644
index 63f2a32b7da50b62050547fa0f9045c9da874e85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 817
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIoCO|{#S9GGLLkg|>2BR0
z1_q|bo-U3d8I5NndkbF~@Jy?gRZ!l*m=oaUp{|kNT+(!W_JZr2mv~>WeNfYw%V6eV
ze!+Ts(R?kD|1B!t%8wsZ6`GdvH?qyJu_N2%j?yDJLH~-*yDPYv4!qr3pU}$Iz|OFO
zaRJwa`RilzO(typ-Zj;~>+5}wi%Kl(*Jx`vnRo1PIMQ3OUDx4_zCu!O$6SG$!}p3G
z>fY7beBys&hriPfw>|4yPq#cuv{OjZZi(*r&b`ez_T-`MvkG)(beGNE*53BJcJalO
z#t$#;9%?_c`aP-Tx!qmq35R~U?(94Lc`i?c<8!WSFLVzj1hn%0+OpMR@oMj&1F2Jj
z8}eS4W!k-D61aB%$BLPYvKrDEPydX2J((%6>m1j#$~`~lTw3mI7^_x3|K1tp%;%E>
zj`LQ((y25#Hl_FjM}u~O`~BmOmV9Z@exUWTI#7u1fM~&6r%QZK^5*6%W#}dJSZ+v<
ztX|;H+9GPNR4E%<$EtKpQR<G~ouwOlyZu>RZuNvd)33d5`8XkfM<DLz`#*OzUcX)3
z-}>f`z?-?tnC>$^cRSs(b>7SBiF;Qj|NR@SbpQKL#cW@X%x5+={+GQZ#ne{K4g2xq
zhw6Oor7{^T@vfJ-+ii~OKJ{4n;nc^Zc~_*WSG<21+xhbApUJy!Z0u@}*V^dq$+cLa
zY{S#QMMB%nWtYBOeMv{MT>MPg#>GcFSfw{g%c^$0_@NLfHBn_>df>6c8RCV?hsBf6
ztZ($XA^V4yAu7mX!?F)P^5tgnL95qQ9@uO6EVQz2V@1K9d5bu9PAvO7t4aRd<=xCV
z52r=GXJwG<HQd-fFD~`OCGRqYs6g%dC5JDu-xhQ?J|jFud)Y~D(NyDi->>%?O!eM(
za-ILls}&#mFDJLIi**0-zqe!JM{O(C#bp=w%0?LfYO-F%z}9?Y^M_fN7R$Vwr)j&d
zI?YF$>%rDZYP#>`4R_7t3z3a}7`3v1Rj=}rZ3Vl@1cq<P?z-1D)#^Rynx>o7e()Mw
aL%mVH#<%?RT7L!x1_n=8KbLh*2~7Z*ntY=G

diff --git a/data/images/suspend.svg b/data/images/suspend.svg
index 0f2bbac..a83bdfa 100644
--- a/data/images/suspend.svg
+++ b/data/images/suspend.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 58 58" enable-background="new 0 0 58 58" xml:space="preserve">
-<path fill="#FFFFFF" d="M25.7,5.2C19.2,9.8,15.5,17.5,16,25.5c0.8,11.3,9.6,20.4,21,21.4c0.7,0,1.3,0.1,2,0.1c2.4,0,4.7-0.4,7-1.1
-	c-9.3,9.4-24.5,9.5-33.9,0.2s-9.5-24.5-0.2-33.9C15.6,8.4,20.5,5.9,25.7,5.2 M29,3c-0.9,0-1.7,0-2.6,0.1C12.1,4.6,1.7,17.3,3.1,31.6
-	s14.2,24.7,28.5,23.3c7.5-0.8,14.3-4.8,18.7-11c0.3-0.5,0.2-1.1-0.3-1.4c-0.3-0.2-0.7-0.2-1-0.1c-3.1,1.7-6.5,2.5-10,2.5
-	c-0.6,0-1.2,0-1.8-0.1c-11.6-1-20.1-11.2-19.1-22.7c0.7-7.5,5.3-14.1,12.1-17.3c0.5-0.2,0.7-0.8,0.5-1.3C30.6,3.2,30.3,3,29.9,3H29z
-	"/>
-</svg>
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M42.06,30.53A18.5,18.5,0,0,1,17,5.44a1.51,1.51,0,0,0-2-2A21.5,21.5,0,1,0,44.1,32.57a1.51,1.51,0,0,0-2-2ZM25.22,40.78A18.5,18.5,0,0,1,12.39,9a21.27,21.27,0,0,0-.67,5.33,21.52,21.52,0,0,0,21.5,21.5,21.27,21.27,0,0,0,5.33-.67A18.49,18.49,0,0,1,25.22,40.78Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/images/switchuser.png b/data/images/switchuser.png
deleted file mode 100644
index 7c402569892d20d0a2975472e7ee638071b96d74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 630
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIoCO|{#S9GGLLkg|>2BR0
z1_mY#PZ!6KjK;SS7Yh#=@NAu_plslDLqYn2phTnKjfU4OCCxnnW(%ZScn`6?YV}%R
z<)<SkUE_Ywf5(%XRYsFkZ=ad*k%_^9kwKba1>=HN>s|Mw!vh=QA8&u8Id6fX-l3xh
zALcXHyz@E#^Ts3oGYQR)yuQ`0d@}vVy2L%r+2*Z3=1!82i7Zj+6_zk-=?(IkV4tAw
zXOYMh#N!<{@AFlq8J}~f97$V!X~_fr8#zn<-*Ym!FExL@)9<K#{3c~<rJpf!w;Qq6
zA4u~|6gk|e9rSVet*I>m*CtpL92A|{)-vrrvvf6Qp(>xu$4Jh%*+1<r+*q79gFPqy
zT#@utpJiG;H${yu=kqpgoExfrQ0=-|`cISMXL3@e#zlujqx*VJE}xs`R^G^b>fXcW
z#S0P_afy6;D>&)<#G+$8<p&%N-QDKzKdJBI@<-EN99(+5b|<HVjbWYYgX1pgr|+v+
zrS2*1_G|EW&DyZSwkyxif8+1}`5TmF628jZom}|z=pT<h5x>;+Kiog96Z3QXvnBO@
z{_Hs!FIZcfR@7eolzcezx;b|pZ_-*`xrcHO+*xn!iQm1UpyJlnlOY@C<mx=Q+Pd``
zmu$dCVXMNcAH}X~MJAU$xcWlIV)p(eKLoNaep=jo)9&-BYp;!JU!2=>q&`v6dSRQb
zskg4MX_e}Vr|x3$h9BRqtvqr_;MLPgY2Am*UA$Yr%sO)ImVEM=QxczD4ei+4|DP#)
m)MOUEBJo&{r@^s5Oocz{jC=F4cQG(9FnGH9xvX<aXaWE*Ng=`j

diff --git a/data/images/switchuser.svg b/data/images/switchuser.svg
index 5d5f797..2d6bfae 100644
--- a/data/images/switchuser.svg
+++ b/data/images/switchuser.svg
@@ -1 +1 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 58 58"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-miterlimit:10;stroke-width:2px;}.cls-1{stroke-linecap:round;}</style></defs><title>画板 4</title><g id="用户切换"><path class="cls-1" d="M14.09,34H10.55A9.56,9.56,0,0,0,1,43.55v3.81A5.66,5.66,0,0,0,6.73,53H12"/><path class="cls-1" d="M24,5.19A10.33,10.33,0,0,0,22,5a11,11,0,1,0,2,21.82"/><path class="cls-2" d="M47.45,34H24.55A9.53,9.53,0,0,0,15,43.5v3.8A5.72,5.72,0,0,0,20.73,53H51.27A5.72,5.72,0,0,0,57,47.3V43.5A9.53,9.53,0,0,0,47.45,34Z"/><circle class="cls-2" cx="36" cy="16" r="11"/></g></svg>
\ No newline at end of file
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M27.73,8h.19A6.25,6.25,0,0,1,29.2,20.37a9.44,9.44,0,0,1-1.38,2,8.61,8.61,0,0,1-1.08,1A9.24,9.24,0,1,0,27.92,5a9.08,9.08,0,0,0-3.5.71c.17.07.34.13.5.21A9.21,9.21,0,0,1,27.73,8Z" fill="#fff"/><path d="M18.92,24.5a9.25,9.25,0,1,0-9.25-9.25A9.22,9.22,0,0,0,18.92,24.5Zm0-15.5a6.62,6.62,0,0,1,1.1.1,6.25,6.25,0,0,1,0,12.3,6.52,6.52,0,0,1-1.1.1,6.25,6.25,0,0,1,0-12.5Z" fill="#fff"/><path d="M37.75,25.81H33.08A8.28,8.28,0,0,1,36,28.34c.12.15.22.31.33.47h1.4A5.08,5.08,0,0,1,38.24,39,8,8,0,0,1,37,41a8.41,8.41,0,0,1-1,1h1.71a8.1,8.1,0,0,0,0-16.19Z" fill="#fff"/><path d="M35,29.81a8.09,8.09,0,0,0-6.27-3H9.09A8.1,8.1,0,0,0,9.09,43H28.75A8.08,8.08,0,0,0,35,29.81ZM28.75,40H9.09a5.1,5.1,0,0,1,0-10.19H28.75a5.1,5.1,0,0,1,0,10.19Z" fill="#fff"/></svg>
\ No newline at end of file

From 4b21e8ce9f025ac4d0603f372f70c9a569deef53 Mon Sep 17 00:00:00 2001
From: tanjing <tanjing@kylinos.cn>
Date: Fri, 18 Mar 2022 13:45:38 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=8D=E5=90=8C=E5=88=86=E8=BE=A8=E7=8E=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/mainwindow.cpp | 70 +++++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
index 0e20b7a..9b6f5d2 100644
--- a/tools/mainwindow.cpp
+++ b/tools/mainwindow.cpp
@@ -241,16 +241,33 @@ MainWindow::MainWindow(bool a, bool b, QWidget *parent) : QMainWindow(parent)
 
     ResizeEvent();
 
+    //使按钮控件上下比例均衡
+    QVBoxLayout *spaceLayout = new QVBoxLayout();
+    QLabel spaceLabel1;
+    QLabel spaceLabel2;
+    spaceLabel1.setFont(QFont("Noto Sans CJK SC", 28, 50));
+    spaceLabel2.setFont(QFont("Noto Sans CJK SC", 12, 50));
+    spaceLabel1.setStyleSheet("color: white; font: 28pt");
+    spaceLabel2.setStyleSheet("color: white; font: 12pt");
+    spaceLabel1.setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+    spaceLabel2.setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    spaceLabel1.setObjectName("date_label");
+    spaceLabel2.setObjectName("time_lable");
+    spaceLayout->addStretch();
+    spaceLayout->addWidget(&spaceLabel1);
+    spaceLayout->addSpacing(10);
+    spaceLayout->addWidget(&spaceLabel2);
+    setLayoutWidgetVisible(spaceLayout, false);
+
     m_vBoxLayout->addStretch(20);
-    m_vBoxLayout->addLayout(m_dateTimeLayout, 60);
-    m_vBoxLayout->addStretch();
-    m_vBoxLayout->addLayout(m_judgeWidgetVLayout, 140);
-    m_vBoxLayout->addWidget(m_scrollArea, 632);
-    m_vBoxLayout->addStretch(174);
-    m_vBoxLayout->addLayout(m_messageVLayout, 80);
-    //m_vBoxLayout->addWidget(m_systemMonitorBtn,48,Qt::AlignHCenter);
-    m_vBoxLayout->addStretch(58);
-    //m_vBoxLayout->setContentsMargins(0,0,0,0);
+    m_vBoxLayout->addLayout(m_dateTimeLayout, 80);
+    m_vBoxLayout->addLayout(m_judgeWidgetVLayout, 120);
+    m_vBoxLayout->addWidget(m_scrollArea, 640);
+    m_vBoxLayout->addLayout(m_messageVLayout, 120);
+    m_vBoxLayout->addLayout(spaceLayout, 80);
+    m_vBoxLayout->addStretch(20);
+    m_vBoxLayout->setSpacing(0);
+
     m_vBoxLayout->setContentsMargins((m_screen.width() - m_scrollArea->width() - 20)/2,0,(m_screen.width() - m_scrollArea->width() - 20)/2,0);
 
     qDebug() << "width..........." << m_judgeLabel->width() << m_scrollArea->width() << m_messageLabel1->width() << m_messageLabel2->width();
@@ -424,11 +441,11 @@ void MainWindow::initialJudgeWidget()
     m_judgeLabel->setText(tips);
     m_judgeLabel->setStyleSheet("color:white;font:12pt;");
     m_judgeLabel->setObjectName("label");
-    m_judgeLabel->setGeometry(0,0,m_screen.width() - 160,50);
+    //m_judgeLabel->setGeometry(0,0,m_screen.width(),50);
     //m_judgeLabel->setFixedHeight(60);
 
     qDebug() << "m_judgeLabel width:" << m_judgeLabel->width() << m_judgeLabel->height();
-    m_judgeLabel->setAlignment(Qt::AlignHCenter| Qt::AlignBottom);
+    m_judgeLabel->setAlignment(Qt::AlignCenter);
     m_judgeLabel->setWordWrap(true);
 
     m_cancelBtn = new QPushButton(QApplication::tr("cancel"));
@@ -446,7 +463,7 @@ void MainWindow::initialJudgeWidget()
 
     m_judgeWidgetVLayout->addStretch();
     m_judgeWidgetVLayout->addWidget(m_judgeLabel);
-    m_judgeWidgetVLayout->addSpacing(0);
+    m_judgeWidgetVLayout->addSpacing(10);
     m_judgeWidgetVLayout->addLayout(m_judgeBtnHLayout);
     m_judgeWidgetVLayout->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
 
@@ -466,8 +483,8 @@ void MainWindow::initialMessageWidget()
         margins = (m_screen.width() - 60 * 2 - 140 * 3) / 2;
     }
 
-    m_messageLabel1->setGeometry(QRect(0, 0, 700, 40));
-    m_messageLabel2->setGeometry(QRect(0, 0, 700, 40));
+    m_messageLabel1->setGeometry(0, 0, m_screen.width() - 160, 40);
+    m_messageLabel2->setGeometry(0, 0, m_screen.width() - 160, 40);
     m_messageLabel1->setStyleSheet("color:white;font:12pt;");
     m_messageLabel2->setStyleSheet("color:white;font:12pt;");
     m_messageLabel1->setObjectName("messagelabel1");
@@ -476,16 +493,19 @@ void MainWindow::initialMessageWidget()
 //    m_messageLabel2->setFixedWidth(m_screen.width() - 20);
     m_messageLabel1->setWordWrap(true);
     m_messageLabel2->setWordWrap(true);
-    m_messageLabel2->setAlignment(Qt::AlignCenter);
-    m_messageLabel1->setAlignment(Qt::AlignCenter);
+    m_messageLabel2->setAlignment(Qt::AlignHCenter);
+    m_messageLabel1->setAlignment(Qt::AlignHCenter);
     m_messageLabel1->setMargin(0);
     m_messageLabel2->setMargin(0);
+    m_messageLabel1->setWordWrap(true);
+    m_messageLabel2->setWordWrap(true);
 
+    m_messageVLayout->addStretch();
     m_messageVLayout->addWidget(m_messageLabel1);
     m_messageVLayout->addSpacing(10);
     m_messageVLayout->addWidget(m_messageLabel2);
     //m_messageVLayout->setAlignment(Qt::AlignHCenter);
-    m_messageVLayout->setContentsMargins(0,0,0,0);
+    //m_messageVLayout->setContentsMargins(0,0,0,0);
 
     if (lockfile) {
         QFile   file_update("/tmp/lock/kylin-update.lock");
@@ -572,10 +592,12 @@ void MainWindow::initialDateTimeWidget()
     m_dateLabel->setObjectName("date_label");
     m_timeLabel->setObjectName("time_lable");
 
+    m_dateTimeLayout->addStretch();
     m_dateTimeLayout->addWidget(m_timeLabel);
-    m_dateTimeLayout->setStretch(0,1);
+    m_messageVLayout->addSpacing(10);
+    //m_dateTimeLayout->setStretch(0,1);
     m_dateTimeLayout->addWidget(m_dateLabel);
-    m_dateTimeLayout->setStretch(1,2);
+    //m_dateTimeLayout->setStretch(1,2);
 }
 
 void MainWindow::initialBtnCfg()
@@ -726,16 +748,16 @@ void MainWindow::showNormalBtnWidget(int hideNum)
         btnWidgetWidth = 128 * (7 - hideNum) + margins * (6 - hideNum);
         m_buttonHLayout->setHorizontalSpacing(margins);
     }
-    m_btnWidget->setGeometry(QRect(0,0,btnWidgetWidth+ 24, 632));
-    m_btnWidget->setContentsMargins(0,0,0,0);
+    m_btnWidget->setGeometry(QRect(0,0,btnWidgetWidth+ 24, 632 * m_screen.height()/1080));
+    m_btnWidget->setContentsMargins(0,0,0,100);
 
-    m_scrollArea->setGeometry(QRect(0,0,btnWidgetWidth + 24, 632));
+    m_scrollArea->setGeometry(QRect(0,0,btnWidgetWidth + 24, 632 * m_screen.height()/1080));
 
     m_scrollArea->setContentsMargins(0,0,0,0);
     m_scrollArea->verticalScrollBar()->setVisible(false);
     m_scrollArea->verticalScrollBar()->setDisabled(true);
 
-    m_buttonHLayout->setContentsMargins(0,0,0,340);
+    //m_buttonHLayout->setContentsMargins(0,0,0,(m_scrollArea->height() - m_switchUserBtn->height()) * 3/5);
 
     for (int i = 0;i < m_buttonHLayout->count(); i++) {
         QLayoutItem*item = m_buttonHLayout->layout()->itemAt(i);
@@ -863,6 +885,7 @@ void MainWindow::ResizeEvent()
     }
     m_btnWidget->setStyleSheet("QWidget#btnWidget{background-color: transparent;}");
     m_btnWidget->setLayout(m_buttonHLayout);
+
     m_scrollArea->horizontalScrollBar()->setVisible(false);
     m_scrollArea->horizontalScrollBar()->setDisabled(true);
     m_scrollArea->setWidget(m_btnWidget);
@@ -870,6 +893,7 @@ void MainWindow::ResizeEvent()
     m_scrollArea->setAlignment(Qt::AlignHCenter);
     qDebug() << "m_scrollArea geometry:" << m_scrollArea->geometry();
     qDebug() << "m_btnWidget geometry:" << m_btnWidget->geometry();
+    qDebug() << "m_buttonHLayout geometry:" << m_buttonHLayout->geometry();
 
     m_vBoxLayout->setContentsMargins((m_screen.width() - m_scrollArea->width() - 20)/2,0,(m_screen.width() - m_scrollArea->width() - 20)/2,0);
 

From 59cf2246dfc49dfda3992686ffeda8cb5468feac Mon Sep 17 00:00:00 2001
From: tanjing <tanjing@kylinos.cn>
Date: Mon, 21 Mar 2022 10:25:06 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=97=B4=E8=B7=9D?=
 =?UTF-8?q?=E4=B9=98=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mainwindow.cpp b/tools/mainwindow.cpp
index 9b6f5d2..9bdf665 100644
--- a/tools/mainwindow.cpp
+++ b/tools/mainwindow.cpp
@@ -749,7 +749,7 @@ void MainWindow::showNormalBtnWidget(int hideNum)
         m_buttonHLayout->setHorizontalSpacing(margins);
     }
     m_btnWidget->setGeometry(QRect(0,0,btnWidgetWidth+ 24, 632 * m_screen.height()/1080));
-    m_btnWidget->setContentsMargins(0,0,0,100);
+    m_btnWidget->setContentsMargins(0,0,0,100 * m_screen.height()/1080);
 
     m_scrollArea->setGeometry(QRect(0,0,btnWidgetWidth + 24, 632 * m_screen.height()/1080));