From 175b01a6dd3595034b4ce60a54335b31feff46fa Mon Sep 17 00:00:00 2001
From: houchengqiu <houchengqiu@uniontech.com>
Date: Mon, 22 Jul 2024 15:21:07 +0800
Subject: [PATCH] fix: [UI] Modify pop-up window style

   Modify pop-up window style, include delete photo and create album

Log: [UI] Modify pop-up window style
Bug: https://pms.uniontech.com/bug-view-193023.html, https://pms.uniontech.com/bug-view-168193.html
---
 src/qml/Control/DeleteDialog.qml      | 15 ++++++++-------
 src/qml/Control/NewAlbumDialog.qml    | 19 ++++++++++---------
 src/qml/Control/RemoveAlbumDialog.qml | 11 +++++------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/qml/Control/DeleteDialog.qml b/src/qml/Control/DeleteDialog.qml
index 80fbde01..c591028f 100644
--- a/src/qml/Control/DeleteDialog.qml
+++ b/src/qml/Control/DeleteDialog.qml
@@ -22,11 +22,11 @@ DialogWindow {
 
     minimumWidth: 400
     maximumWidth: 400
-    minimumHeight: 190
-    maximumHeight: 190
+    minimumHeight: 160
+    maximumHeight: 160
 
     width: 400
-    height: 190
+    height: 160
 
     icon : "deepin-album"
 
@@ -67,7 +67,7 @@ DialogWindow {
             top: parent.top
             horizontalCenter: parent.horizontalCenter
         }
-        font: DTK.fontManager.t6
+        font: DTK.fontManager.t5
         verticalAlignment: Text.AlignBottom
         horizontalAlignment: Text.AlignHCenter
     }
@@ -88,14 +88,14 @@ DialogWindow {
         id: cancelbtn
         anchors {
             top: deleteTips.bottom
-            topMargin: 30
+            topMargin: 15
             left: parent.left
             leftMargin: 0
         }
         text: qsTr("Cancel")
         width: 185
         height: 36
-        font.pixelSize: 16
+        font: DTK.fontManager.t6
         onClicked: {
             deleteDialog.visible = false
         }
@@ -105,13 +105,14 @@ DialogWindow {
         id: enterbtn
         anchors {
             top: deleteTips.bottom
-            topMargin: 30
+            topMargin: 15
             left: cancelbtn.right
             leftMargin: 10
         }
         text: qsTr("Delete")
         width: 185
         height: 36
+        font: DTK.fontManager.t6
 
         onClicked: {
             deleteDialog.visible = false
diff --git a/src/qml/Control/NewAlbumDialog.qml b/src/qml/Control/NewAlbumDialog.qml
index 95b81389..cee9b4de 100644
--- a/src/qml/Control/NewAlbumDialog.qml
+++ b/src/qml/Control/NewAlbumDialog.qml
@@ -50,7 +50,7 @@ DialogWindow {
             leftMargin: 46
             top: parent.top
         }
-        font.pixelSize: 16
+        font: DTK.fontManager.t5
         text: qsTr("New Album")
         verticalAlignment: Text.AlignBottom
         horizontalAlignment: Text.AlignHCenter
@@ -58,14 +58,15 @@ DialogWindow {
     Label{
         id:nameLabel
         width:42
-        height: 20
-        font.pixelSize: 14
+        height: 36
+        font: DTK.fontManager.t6
         anchors {
             left: parent.left
             leftMargin: 0
             top: nameedit.top
-            topMargin:5
+            topMargin:0
         }
+        verticalAlignment: Text.AlignVCenter
         text:qsTr("Name:")
     }
     LineEdit {
@@ -78,7 +79,7 @@ DialogWindow {
         }
         width: 328
         height: 36
-        font: DTK.fontManager.t5
+        font: DTK.fontManager.t6
         focus: true
         maximumLength: 255
         validator: RegExpValidator {regExp: /^[^\\.\\\\/\':\\*\\?\"<>|%&][^\\\\/\':\\*\\?\"<>|%&]*/ }
@@ -93,7 +94,7 @@ DialogWindow {
         id: cancelbtn
         anchors {
             top: nameedit.bottom
-            topMargin: 20
+            topMargin: 15
             left: parent.left
             leftMargin: 0
         }
@@ -106,18 +107,18 @@ DialogWindow {
         }
     }
 
-    Button {
+    RecommandButton {
         id: enterbtn
         anchors {
             top: nameedit.bottom
-            topMargin: 20
+            topMargin: 14
             left: cancelbtn.right
             leftMargin: 10
         }
         text: qsTr("Confirm")
         enabled: nameedit.text !== "" ? true : false
         width: 185
-        height: 36
+        height: 38
 
         onClicked: {
             albumControl.createAlbum(nameedit.text )
diff --git a/src/qml/Control/RemoveAlbumDialog.qml b/src/qml/Control/RemoveAlbumDialog.qml
index d29318ab..d142f910 100644
--- a/src/qml/Control/RemoveAlbumDialog.qml
+++ b/src/qml/Control/RemoveAlbumDialog.qml
@@ -19,11 +19,11 @@ DialogWindow {
 
     minimumWidth: 400
     maximumWidth: 400
-    minimumHeight: 190
-    maximumHeight: 190
+    minimumHeight: 140
+    maximumHeight: 140
 
     width: 400
-    height: 190
+    height: 140
 
     icon : "deepin-album"
 
@@ -35,7 +35,6 @@ DialogWindow {
         id: deleteTitle
         anchors {
             top: parent.top
-            topMargin: 20
             horizontalCenter: parent.horizontalCenter
         }
         font: DTK.fontManager.t5
@@ -48,7 +47,7 @@ DialogWindow {
         id: cancelbtn
         anchors {
             top: deleteTitle.bottom
-            topMargin: 50
+            topMargin: 15
             left: parent.left
             leftMargin: 0
         }
@@ -65,7 +64,7 @@ DialogWindow {
         id: enterbtn
         anchors {
             top: deleteTitle.bottom
-            topMargin: 50
+            topMargin: 15
             left: cancelbtn.right
             leftMargin: 10
         }