From 0f65ef220a92e09e5a09f734d481d57f11a275aa Mon Sep 17 00:00:00 2001
From: taynpg <taynpg@163.com>
Date: Sat, 14 Sep 2024 10:13:13 +0800
Subject: [PATCH] =?UTF-8?q?pro=EF=BC=9A=E4=BC=98=E5=8C=96=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=96=E7=BD=AE=E9=87=8D=E6=8E=92=E5=BA=8F=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E8=87=AA=E5=8A=A8=E5=A4=87=E4=BB=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWidget.cpp |  9 +++++++++
 MainWidget.ui  | 22 ++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/MainWidget.cpp b/MainWidget.cpp
index 173452c..9de37bd 100644
--- a/MainWidget.cpp
+++ b/MainWidget.cpp
@@ -49,6 +49,8 @@ MainWidget::MainWidget(QWidget* parent)
     ui->btnSave->setFixedWidth(100);
     ui->btnExit->setFixedWidth(100);
     ui->btnSearch->setFixedWidth(120);
+    ui->btnBackup->setEnabled(false);
+    ui->btnResort->setEnabled(false);
 
     connect(ui->btnSelectFile, &QPushButton::clicked, this, [&]() {
         QString file = CUtil::select_file(this, u8"请选择xml文件",
@@ -129,6 +131,11 @@ MainWidget::MainWidget(QWidget* parent)
         if (tab_widget_ == nullptr) {
             return;
         }
+
+        if (!CUtil::affirm(this, u8"提示", u8"确认重新排序吗？")) {
+            return;
+        }
+
         sort_by_repeat(vec_);
         std::vector<Element_t*> nvec{};
         xml_.copy_and_del(vec_, nvec);
@@ -382,6 +389,8 @@ bool MainWidget::read(const QString& file_path)
     ui->btnImport->setEnabled(true);
     ui->btnExport->setEnabled(true);
     ui->btnBackup->setEnabled(true);
+    ui->btnBackup->setEnabled(true);
+    ui->btnResort->setEnabled(true);
 
     ui->cbConfig->setEnabled(false);
     ui->btnSet->setEnabled(false);
diff --git a/MainWidget.ui b/MainWidget.ui
index e9a62e6..5712eae 100644
--- a/MainWidget.ui
+++ b/MainWidget.ui
@@ -34,6 +34,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="btnFormat">
+        <property name="text">
+         <string>重排版（单独）</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QCustomQLineEdit" name="edStatus"/>
       </item>
@@ -54,13 +61,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QPushButton" name="btnFormat">
-        <property name="text">
-         <string>重排版</string>
-        </property>
-       </widget>
-      </item>
       <item>
        <widget class="QPushButton" name="btnResort">
         <property name="text">
@@ -226,7 +226,10 @@
       <widget class="QComboBox" name="cbUnit"/>
      </item>
      <item>
-      <spacer name="horizontalSpacer_2">
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
@@ -244,6 +247,9 @@
      </item>
      <item>
       <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>