fix: Fix text color issue after change theme

re2zero · deepin-bot[bot] · commit bc5e4727fab0 · 2025-03-17T12:47:07.000Z
After change the theme, the text color is not changed to highlight. Log: Fix dialog text color issue after change theme. Bug: https://pms.uniontech.com/bug-view-307703.html https://pms.uniontech.com/bug-view-300269.html
diff --git a/src/qml/Control/DeleteDialog.qml b/src/qml/Control/DeleteDialog.qml
@@ -74,12 +74,7 @@ DialogWindow {
             horizontalCenter: parent.horizontalCenter
         }
 
-        property Palette textColor: Palette {
-            normal: ("black")
-            normalDark: ("white")
-        }
-
-        color: ColorSelector.textColor
+        color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"
         font: DTK.fontManager.t5
         verticalAlignment: Text.AlignBottom
         horizontalAlignment: Text.AlignHCenter
diff --git a/src/qml/Control/ExportDialog.qml b/src/qml/Control/ExportDialog.qml
@@ -51,6 +51,7 @@ DialogWindow {
             leftMargin: 46
             top: parent.top
         }
+        color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"
         font: DTK.fontManager.t5
         text: qsTr("Export")
         verticalAlignment: Text.AlignBottom
diff --git a/src/qml/Control/NewAlbumDialog.qml b/src/qml/Control/NewAlbumDialog.qml
@@ -51,6 +51,7 @@ DialogWindow {
             leftMargin: 46
             top: parent.top
         }
+        color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"
         font: DTK.fontManager.t5
         text: qsTr("New Album")
         verticalAlignment: Text.AlignBottom
diff --git a/src/qml/Control/RemoveAlbumDialog.qml b/src/qml/Control/RemoveAlbumDialog.qml
@@ -37,6 +37,7 @@ DialogWindow {
             top: parent.top
             horizontalCenter: parent.horizontalCenter
         }
+        color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"
         font: DTK.fontManager.t5
         text: qsTr("Are you sure you want to delete this album?")
         verticalAlignment: Text.AlignBottom
diff --git a/src/qml/PopProgress/StandardProgressDialog.qml b/src/qml/PopProgress/StandardProgressDialog.qml
@@ -39,7 +39,7 @@ FloatingPanel {
             height: 24
             font: DTK.fontManager.t5
             text: ""
-            color: Qt.rgba(0,0,0)
+            color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"
         }
 
         Rectangle {
diff --git a/src/qml/PreviewImageViewer/Dialog/RemoveDialog.qml b/src/qml/PreviewImageViewer/Dialog/RemoveDialog.qml
@@ -58,14 +58,9 @@ DialogWindow {
             Label {
                 id: notifyText
 
-                property Palette textColor: Palette {
-                    normal: ("black")
-                    normalDark: ("white")
-                }
-
                 Layout.alignment: Qt.AlignCenter
                 Layout.fillWidth: true
-                color: ColorSelector.textColor
+                color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"
                 font: DTK.fontManager.t5
                 horizontalAlignment: Text.AlignHCenter
                 text: qsTr("Cannot move \"%1\" to the trash. Do you want to permanently delete it?").arg(textMetics.elidedText)
diff --git a/src/qml/PreviewImageViewer/ReName.qml b/src/qml/PreviewImageViewer/ReName.qml
@@ -58,12 +58,8 @@ DialogWindow {
     Text {
         id: renametitle
 
-        property Palette textColor: Palette {
-            normal: ("black")
-            normalDark: ("white")
-        }
 
-        color: ColorSelector.textColor
+        color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"
         font.pixelSize: 16
         height: 24
         horizontalAlignment: Text.AlignHCenter

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ DialogWindow {`
`51`	`51`	`leftMargin: 46`
`52`	`52`	`top: parent.top`
`53`	`53`	`}`
	`54`	`+ color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"`
`54`	`55`	`font: DTK.fontManager.t5`
`55`	`56`	`text: qsTr("Export")`
`56`	`57`	`verticalAlignment: Text.AlignBottom`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ DialogWindow {`
`37`	`37`	`top: parent.top`
`38`	`38`	`horizontalCenter: parent.horizontalCenter`
`39`	`39`	`}`
	`40`	`+ color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"`
`40`	`41`	`font: DTK.fontManager.t5`
`41`	`42`	`text: qsTr("Are you sure you want to delete this album?")`
`42`	`43`	`verticalAlignment: Text.AlignBottom`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ FloatingPanel {`
`39`	`39`	`height: 24`
`40`	`40`	`font: DTK.fontManager.t5`
`41`	`41`	`text: ""`
`42`		`- color: Qt.rgba(0,0,0)`
	`42`	`+ color: DTK.themeType === ApplicationHelper.LightType ? "black" : "white"`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`Rectangle {`