fix: [vault] the finish UI show error

1. change the label postion. 2. change the space of label and button. Log: fix issue Bug: https://pms.uniontech.com/bug-view-245915.html
linuxdeepin · Mar 27, 2024 · e1140a2 · e1140a2
1 parent 12e5408
commit e1140a2
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivefinishedview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/createvaultview/vaultactivefinishedview.cpp
@@ -69,7 +69,7 @@ void VaultActiveFinishedView::initUi()
 
     // 加密完成完成图片
     encryptFinishedImageLabel = new DLabel(this);
-    encryptFinishedImageLabel->setPixmap(QIcon::fromTheme("dialog-ok").pixmap(128, 128));
+    encryptFinishedImageLabel->setPixmap(QIcon::fromTheme("dialog-ok").pixmap(100, 100));
     encryptFinishedImageLabel->setAlignment(Qt::AlignHCenter);
     // 加密完成提示
     tipsThree = new DLabel(tr("The setup is complete"), this);
@@ -103,11 +103,10 @@ void VaultActiveFinishedView::initUi()
     QVBoxLayout *m_pLay = new QVBoxLayout(this);
     m_pLay->setMargin(0);
     m_pLay->addWidget(titleLabel);
-    m_pLay->addSpacing(10);
     m_pLay->addWidget(widgetOne);
     m_pLay->addWidget(widgetTow, 0, Qt::AlignHCenter);
     m_pLay->addWidget(widgetThree);
-    m_pLay->addStretch();
+    m_pLay->addSpacing(40);
     m_pLay->addWidget(finishedBtn, 0, Qt::AlignCenter);
 
     widgetTow->setVisible(false);

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremoveprogressview.cpp b/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremoveprogressview.cpp
@@ -31,22 +31,31 @@ using namespace dfmplugin_utils;
 
 VaultRemoveProgressView::VaultRemoveProgressView(QWidget *parent)
     : QWidget(parent)
-    , vaultRmProgressBar(new DWaterProgress(this))
-    , deleteFinishedImageLabel(new DLabel(this))
     , layout(new QVBoxLayout())
 {
-    hintLabel = new DLabel(tr("Removing..."), this);
-
+    deletingWidget = new QWidget(this);
+    QVBoxLayout *deletingLay = new QVBoxLayout;
+    vaultRmProgressBar = new DWaterProgress(deletingWidget);
     vaultRmProgressBar->setFixedSize(80, 80);
-
-    deleteFinishedImageLabel->setPixmap(QIcon::fromTheme("dialog-ok").pixmap(90, 90));
+    hintLabel = new DLabel(tr("Removing..."), deletingWidget);
+    deletingLay->addWidget(vaultRmProgressBar, 0, Qt::AlignHCenter);
+    deletingLay->addWidget(hintLabel, 0, Qt::AlignHCenter);
+    deletingWidget->setLayout(deletingLay);
+
+    deletedWidget = new QWidget(this);
+    QVBoxLayout *deletedLay = new QVBoxLayout;
+    deleteFinishedImageLabel = new DLabel(deletedWidget);
+    deleteFinishedImageLabel->setPixmap(QIcon::fromTheme("dialog-ok").pixmap(100, 100));
     deleteFinishedImageLabel->setAlignment(Qt::AlignHCenter);
-    deleteFinishedImageLabel->hide();
+    finishedLabel = new DLabel(tr("Deleted successfully"), deletedWidget);
+    deletedLay->addWidget(deleteFinishedImageLabel, 0, Qt::AlignHCenter);
+    deletedLay->addWidget(finishedLabel, 0, Qt::AlignHCenter);
+    deletedWidget->setLayout(deletedLay);
+    deletedWidget->setHidden(true);
+
 
     layout->setMargin(0);
-    layout->addSpacing(10);
-    layout->addWidget(hintLabel, 1, Qt::AlignHCenter);
-    layout->addWidget(vaultRmProgressBar, 1, Qt::AlignCenter);
+    layout->addWidget(deletingWidget, 0, Qt::AlignCenter);
     this->setLayout(layout);
 
     connect(OperatorCenter::getInstance(), &OperatorCenter::fileRemovedProgress,
@@ -98,10 +107,10 @@ void VaultRemoveProgressView::handleVaultRemovedProgress(int value)
     if (value == 100) {
         if (!isExecuted) {
             vaultRmProgressBar->setValue(value);
-            layout->removeWidget(vaultRmProgressBar);
-            vaultRmProgressBar->hide();
-            layout->addWidget(deleteFinishedImageLabel);
-            deleteFinishedImageLabel->show();
+            layout->removeWidget(deletingWidget);
+            deletingWidget->setHidden(true);
+            layout->addWidget(deletedWidget, 0, Qt::AlignCenter);
+            deletedWidget->setHidden(false);
 
             Settings setting(kVaultTimeConfigFile);
             setting.removeGroup(QString("VaultTime"));
@@ -112,7 +121,6 @@ void VaultRemoveProgressView::handleVaultRemovedProgress(int value)
             QVariantMap data;
             data.insert("mode", VaultReportData::kDeleted);
             dpfSignalDispatcher->publish("dfmplugin_vault", "signal_ReportLog_Commit", QString("Vault"), data);
-            hintLabel->setText(tr("Deleted successfully"));
 
             isExecuted = true;
             emit setBtnEnable(0, true);

diff --git a/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremoveprogressview.h b/src/plugins/filemanager/dfmplugin-vault/views/removevaultview/vaultremoveprogressview.h
@@ -38,10 +38,16 @@ private Q_SLOTS:
     void handleVaultRemovedProgress(int value);
 
 private:
-    DTK_WIDGET_NAMESPACE::DWaterProgress *vaultRmProgressBar { nullptr };
-    DTK_WIDGET_NAMESPACE::DLabel *deleteFinishedImageLabel { nullptr };
-    QVBoxLayout *layout { nullptr };
+    QWidget *deletingWidget { Q_NULLPTR };
+    DTK_WIDGET_NAMESPACE::DWaterProgress *vaultRmProgressBar { Q_NULLPTR };
     DTK_WIDGET_NAMESPACE::DLabel *hintLabel { Q_NULLPTR };
+
+    QWidget *deletedWidget { nullptr };
+    DTK_WIDGET_NAMESPACE::DLabel *deleteFinishedImageLabel { Q_NULLPTR };
+    DTK_WIDGET_NAMESPACE::DLabel *finishedLabel { Q_NULLPTR };
+
+    QVBoxLayout *layout { Q_NULLPTR };
+
     bool isExecuted { false };
 };
 }