chore: dialog set fix size

- dialog set fix size to avoid resize(in treeland) - translation tweak - right margin tweak
linuxdeepin · Dec 25, 2024 · e609653 · e609653
1 parent 6c9c6ce
commit e609653
Show file tree

Hide file tree

Showing 33 changed files with 87 additions and 305 deletions.
diff --git a/src/dde-control-center/frame/dccrepeater.cpp b/src/dde-control-center/frame/dccrepeater.cpp
@@ -200,7 +200,7 @@ void DccRepeater::initItem(int index, QObject *object)
                 if (!d->delegateValidated) {
                     d->delegateValidated = true;
                     QObject* delegate = this->delegate();
-                    qmlWarning(delegate ? delegate : this) << tr("Delegate must be of `DccObject` type");
+                    qmlWarning(delegate ? delegate : this) << "Delegate must be of `DccObject` type";
                 }
             }
             return;

diff --git a/src/plugin-accounts/qml/AvatarSettingsDialog.qml b/src/plugin-accounts/qml/AvatarSettingsDialog.qml
@@ -16,6 +16,10 @@ D.DialogWindow {
     property string currentAvatar: dccData.avatar()
     width: 640
     height: 500
+    minimumWidth: 640
+    minimumHeight: 500
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
     icon: "preferences-system"
     modality: Qt.WindowModal
     D.DWindow.enableSystemMove: !cropper.dragActived

diff --git a/src/plugin-accounts/qml/ComfirmDeleteDialog.qml b/src/plugin-accounts/qml/ComfirmDeleteDialog.qml
@@ -11,10 +11,15 @@ D.DialogWindow {
     id: dialog
     icon: "preferences-system"
     width: 400
+    height: 170
+    minimumWidth: 400
+    minimumHeight: 170
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
 
     signal requestDelete(bool deleteHome)
     ColumnLayout {
-        // width: 400
+        width: dialog.width - 20
         Label {
             Layout.alignment: Qt.AlignHCenter
             font: D.DTK.fontManager.t5
@@ -33,7 +38,7 @@ D.DialogWindow {
             Layout.fillWidth: true
             Button {
                 text: qsTr("Cancel")
-                Layout.preferredWidth: 175
+                Layout.preferredWidth: 180
                 onClicked: {
                     close()
                 }
@@ -43,7 +48,7 @@ D.DialogWindow {
             }
             D.WarningButton {
                 text: qsTr("Delete")
-                Layout.preferredWidth: 175
+                Layout.preferredWidth: 180
                 Layout.alignment: Qt.AlignRight
                 onClicked: {
                     requestDelete(deleteHomeCheckbox.checked)

diff --git a/src/plugin-accounts/qml/ComfirmSafePage.qml b/src/plugin-accounts/qml/ComfirmSafePage.qml
@@ -4,24 +4,29 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
-import org.deepin.dcc 1.0
 import org.deepin.dtk 1.0 as D
 
 D.DialogWindow {
     id: dialog
     icon: "preferences-system"
     width: 600
+    height: 180
+    minimumWidth: 600
+    minimumHeight: 180
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
     property string msg
 
     signal requestShowSafePage()
     ColumnLayout {
-        // width: 400
         Label {
             Layout.alignment: Qt.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
             font: D.DTK.fontManager.t5
             text: msg
             wrapMode: Text.WordWrap
             Layout.preferredWidth: dialog.width - 10
+            Layout.preferredHeight: 60
             leftPadding: 10
             rightPadding: 10
         }

diff --git a/src/plugin-accounts/qml/CreateAccountDialog.qml b/src/plugin-accounts/qml/CreateAccountDialog.qml
@@ -14,6 +14,10 @@ D.DialogWindow {
     id: dialog
     width: 450
     height: 500
+    minimumWidth: 450
+    minimumHeight: 500
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
     icon: "preferences-system"
     modality: Qt.WindowModal
     title: qsTr("Create a new account")
@@ -162,6 +166,7 @@ D.DialogWindow {
         PasswordLayout {
             id: pwdLayout
             currentPwdVisible: false
+            Layout.fillWidth: true
             name:  {
                 let nameEdit = namesContainter.eidtItems[0]
                 if (nameEdit === undefined)
@@ -175,6 +180,8 @@ D.DialogWindow {
             spacing: 10
             Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
             Layout.bottomMargin: 10
+            Layout.leftMargin: 10
+            Layout.rightMargin: 10
 
             Button {
                 Layout.fillWidth: true

diff --git a/src/plugin-accounts/qml/PasswordLayout.qml b/src/plugin-accounts/qml/PasswordLayout.qml
@@ -12,7 +12,6 @@ ColumnLayout {
     property string userId
     property string name: dccData.userName(pwdLayout.userId)
     property bool currentPwdVisible: true
-    // property alas pwdContainter: pwdContainter
     Layout.fillWidth: true
 
     signal requestClose();
@@ -47,8 +46,8 @@ ColumnLayout {
         visible: pwdLayout.currentPwdVisible
         label.text: qsTr("Current password")
         edit.placeholderText: qsTr("Required")
-        Layout.leftMargin: 10
-        Layout.rightMargin: 20
+        Layout.leftMargin: 0
+        Layout.rightMargin: 16
         Layout.bottomMargin: 10
 
         Loader {
@@ -106,8 +105,8 @@ ColumnLayout {
     RowLayout {
         id: pwdIndicator
         spacing: 4
-        Layout.alignment: Qt.AlignRight
-        Layout.rightMargin: 30
+        Layout.alignment: Qt.AlignRight | Qt.AlignBottom
+        Layout.rightMargin: pwdLayout.currentPwdVisible ? 30 : 20
         Label {
             id: pwdStrengthHintText
             text: ""
@@ -182,7 +181,7 @@ ColumnLayout {
         radius: 8
         Layout.fillWidth: true
         Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
-        Layout.rightMargin: 10
+        Layout.rightMargin: pwdLayout.currentPwdVisible ? 10 : 0
         Layout.bottomMargin: 30
         implicitHeight: 150
         color: "transparent"
@@ -261,7 +260,7 @@ ColumnLayout {
                     backgroundVisible: false
                     checkable: false
                     implicitHeight: 50
-                    leftPadding: 10
+                    leftPadding: pwdLayout.currentPwdVisible ? 0 : 10
                     rightPadding: 10
 
                     contentItem: PasswordItem {
@@ -297,7 +296,7 @@ ColumnLayout {
                 Layout.preferredWidth: pwdLayout.minWidth(font, text, dialog.width - 20)
                 Layout.alignment: Qt.AlignRight
                 Layout.rightMargin: 10
-                Layout.leftMargin: 10
+                Layout.leftMargin: 0
             }
         }
     }

diff --git a/src/plugin-accounts/qml/PasswordModifyDialog.qml b/src/plugin-accounts/qml/PasswordModifyDialog.qml
@@ -14,7 +14,10 @@ D.DialogWindow {
     id: dialog
     property string userId
     width: 520
-    height: 480
+    minimumWidth: width
+    minimumHeight: height
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
     icon: "preferences-system"
     modality: Qt.WindowModal
     title: isCurrent() ? qsTr("Modify password") : qsTr("Reset password")
@@ -24,14 +27,13 @@ D.DialogWindow {
     }
 
     ColumnLayout {
-        anchors.fill: parent
-
         Label {
             text: dialog.title
             font.bold: true
             Layout.alignment: Qt.AlignTop | Qt.AlignHCenter
         }
         Label {
+            id: descLable
             text: {
                 if (dialog.isCurrent())
                     return qsTr("Password length should be at least 8 characters, and the password should contain a combination of at least 3 of the following: uppercase letters, lowercase letters, numbers, and symbols. This type of password is more secure.")
@@ -49,6 +51,7 @@ D.DialogWindow {
         PasswordLayout {
             id: pwdLayout
             userId: dialog.userId
+            Layout.leftMargin: 10
             onRequestClose: {
                 // no error, close dialog
                 close()
@@ -59,6 +62,7 @@ D.DialogWindow {
             spacing: 10
             Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
             Layout.bottomMargin: 10
+            Layout.leftMargin: 10
             Layout.rightMargin: 20
 
             Button {

diff --git a/src/plugin-datetime/qml/DateTimeSettingDialog.qml b/src/plugin-datetime/qml/DateTimeSettingDialog.qml
@@ -8,9 +8,13 @@ import QtQuick.Layouts 1.15
 import org.deepin.dtk 1.0 as D
 
 D.DialogWindow {
-id: ddialog
+    id: ddialog
     width: 400
     height: 220
+    minimumWidth: 400
+    minimumHeight: 220
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
     icon: "preferences-system"
     modality: Qt.WindowModal
     property date currentDate: new Date()

diff --git a/src/plugin-datetime/qml/LangsChooserDialog.qml b/src/plugin-datetime/qml/LangsChooserDialog.qml
@@ -16,6 +16,10 @@ Loader {
         id: ddialog
         width: 420
         height: 550
+        minimumWidth: width
+        minimumHeight: height
+        maximumWidth: minimumWidth
+        maximumHeight: minimumHeight
         icon: "preferences-system"
         modality: Qt.WindowModal
         ColumnLayout {

diff --git a/src/plugin-datetime/qml/RegionFormatDialog.qml b/src/plugin-datetime/qml/RegionFormatDialog.qml
@@ -25,6 +25,10 @@ Loader {
         id: ddialog
         width: 640
         height: 680
+        minimumWidth: width
+        minimumHeight: height
+        maximumWidth: minimumWidth
+        maximumHeight: minimumHeight
         icon: "preferences-system"
         // DWindow.enableBlurWindow: true
         modality: Qt.WindowModal

diff --git a/src/plugin-datetime/qml/RegionsChooserWindow.qml b/src/plugin-datetime/qml/RegionsChooserWindow.qml
@@ -25,6 +25,10 @@ Loader {
         id: searchWindow
         width: 200
         height: 500
+        minimumWidth: width
+        minimumHeight: height
+        maximumWidth: minimumWidth
+        maximumHeight: minimumHeight
         DWindow.enabled: true
         DWindow.enableSystemResize: false
         DWindow.enableBlurWindow: true

diff --git a/src/plugin-datetime/qml/SearchableListViewPopup.qml b/src/plugin-datetime/qml/SearchableListViewPopup.qml
@@ -23,7 +23,7 @@ Popup {
             Layout.fillWidth: true
             Layout.leftMargin: 10
             Layout.rightMargin: 10
-            placeholder: qsTr("搜索")
+            placeholder: qsTr("Search")
             onVisibleChanged: {
                 clear() // clear seach text
             }

diff --git a/src/plugin-datetime/qml/TimezoneDialog.qml b/src/plugin-datetime/qml/TimezoneDialog.qml
@@ -18,6 +18,10 @@ D.DialogWindow {
     visible: true
     width: 1080
     height: 730
+    minimumWidth: width
+    minimumHeight: height
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
     color: "#66000000"
     modality: Qt.WindowModal
 

diff --git a/src/plugin-keyboard/qml/ShortcutSettingDialog.qml b/src/plugin-keyboard/qml/ShortcutSettingDialog.qml
@@ -13,6 +13,10 @@ D.DialogWindow {
     id: ddialog
     width: 400
     height: 360
+    minimumWidth: 400
+    minimumHeight: 360
+    maximumWidth: minimumWidth
+    maximumHeight: minimumHeight
     visible: true
     icon: "preferences-system"
     modality: Qt.WindowModal

diff --git a/translations/dde-control-center.ts b/translations/dde-control-center.ts
@@ -2970,13 +2970,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DccRepeater</name>
-    <message>
-        <source>Delegate must be of `DccObject` type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DccWindow</name>
     <message>
@@ -4764,7 +4757,7 @@ Sign in to %1 ID to get personalized features and services of Browser, App Store
 <context>
     <name>SearchableListViewPopup</name>
     <message>
-        <source>搜索</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6391,13 +6384,6 @@ Sign in to %1 ID to get personalized features and services of Browser, App Store
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dccV25::DccRepeater</name>
-    <message>
-        <source>Delegate must be of `DccObject` type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>dccV25::KeyboardController</name>
     <message>

diff --git a/translations/dde-control-center_az.ts b/translations/dde-control-center_az.ts
@@ -2970,13 +2970,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DccRepeater</name>
-    <message>
-        <source>Delegate must be of `DccObject` type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DccWindow</name>
     <message>
@@ -4764,7 +4757,7 @@ Sign in to %1 ID to get personalized features and services of Browser, App Store
 <context>
     <name>SearchableListViewPopup</name>
     <message>
-        <source>搜索</source>
+        <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6391,13 +6384,6 @@ Sign in to %1 ID to get personalized features and services of Browser, App Store
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dccV25::DccRepeater</name>
-    <message>
-        <source>Delegate must be of `DccObject` type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>dccV25::KeyboardController</name>
     <message>