From b64a92d7ac8867548d176c293cfa8c3f0ab26af5 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Thu, 1 Dec 2022 17:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=9B=BA=E4=BB=B6=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=B8=AE=E5=8A=A9=E6=8C=89=E9=92=AE=EF=BC=8C=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/fwupgrade/FWUpgrade_zh_CN.qm | Bin 4138 -> 4138 bytes
 app/fwupgrade/FWUpgrade_zh_CN.ts |   2 +-
 app/fwupgrade/logindialog.cpp    |   2 ++
 app/fwupgrade/logindialog.ui     |  36 ++++++++++++++++++++++++++-----
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/fwupgrade/FWUpgrade_zh_CN.qm b/app/fwupgrade/FWUpgrade_zh_CN.qm
index 1d303da4d6df9e90554cb009ba5ebfa999ff2900..7679fe5bc4bf78f7e635a600c1ea2b2d9b9300f0 100644
GIT binary patch
delta 29
icmZ3buu5UWV?Kc*k93{vEAhcWz95#r-{#MJ=8OQXunPGA

delta 29
lcmZ3buu5UWV?F^t-s~&!!9l)79_c!1Us5-0{>*322mrA;3)uhw

diff --git a/app/fwupgrade/FWUpgrade_zh_CN.ts b/app/fwupgrade/FWUpgrade_zh_CN.ts
index 9469ee2d..f67cd884 100644
--- a/app/fwupgrade/FWUpgrade_zh_CN.ts
+++ b/app/fwupgrade/FWUpgrade_zh_CN.ts
@@ -308,7 +308,7 @@
         <location filename="mainwindow.cpp" line="373"/>
         <location filename="mainwindow.cpp" line="409"/>
         <source>the selected firmware is not newer than the current version</source>
-        <translation>选择的固件不比当前版本更新</translation>
+        <translation>选择的固件版本比当前版本低</translation>
     </message>
     <message>
         <source>firmware file mismatch</source>
diff --git a/app/fwupgrade/logindialog.cpp b/app/fwupgrade/logindialog.cpp
index 7f07b723..9936b484 100644
--- a/app/fwupgrade/logindialog.cpp
+++ b/app/fwupgrade/logindialog.cpp
@@ -13,6 +13,8 @@ LoginDialog::LoginDialog(const QString &account, const QString &password, QWidge
 
     ui->editAccount->setText(m_account);
     ui->editPassword->setEchoMode(QLineEdit::EchoMode::Password);
+
+    ui->btnHelp->setVisible(false);
 }
 
 LoginDialog::~LoginDialog()
diff --git a/app/fwupgrade/logindialog.ui b/app/fwupgrade/logindialog.ui
index 7e9ea54c..6aab73bd 100644
--- a/app/fwupgrade/logindialog.ui
+++ b/app/fwupgrade/logindialog.ui
@@ -121,16 +121,29 @@
     </item>
    </layout>
   </widget>
-  <widget class="QWidget" name="horizontalLayoutWidget_3">
+  <widget class="QWidget" name="">
    <property name="geometry">
     <rect>
-     <x>40</x>
-     <y>210</y>
-     <width>401</width>
-     <height>61</height>
+     <x>80</x>
+     <y>220</y>
+     <width>331</width>
+     <height>25</height>
     </rect>
    </property>
    <layout class="QHBoxLayout" name="horizontalLayout_3">
+    <item>
+     <spacer name="horizontalSpacer_5">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
     <item>
      <widget class="QPushButton" name="btnLogin">
       <property name="text">
@@ -152,6 +165,19 @@
       </property>
      </widget>
     </item>
+    <item>
+     <spacer name="horizontalSpacer_6">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>40</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
    </layout>
   </widget>
  </widget>