diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_big_108px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_big_108px.svg new file mode 100644 index 0000000000..2b8d0acffb --- /dev/null +++ b/src/plugin-personalization/operation/qrc/dark/icons/corner_big_108px.svg @@ -0,0 +1,45 @@ + + + dark_big + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_big_84px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_big_84px.svg deleted file mode 100644 index 6a70db9f87..0000000000 --- a/src/plugin-personalization/operation/qrc/dark/icons/corner_big_84px.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - dark_big - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_middle_108px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_middle_108px.svg new file mode 100644 index 0000000000..5f49841087 --- /dev/null +++ b/src/plugin-personalization/operation/qrc/dark/icons/corner_middle_108px.svg @@ -0,0 +1,45 @@ + + + dark_middle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_middle_84px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_middle_84px.svg deleted file mode 100644 index 5f5000ebf0..0000000000 --- a/src/plugin-personalization/operation/qrc/dark/icons/corner_middle_84px.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - dark_middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_none_108px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_none_108px.svg new file mode 100644 index 0000000000..d67ffc2e6f --- /dev/null +++ b/src/plugin-personalization/operation/qrc/dark/icons/corner_none_108px.svg @@ -0,0 +1,45 @@ + + + dark_none + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_none_84px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_none_84px.svg deleted file mode 100644 index fba911e495..0000000000 --- a/src/plugin-personalization/operation/qrc/dark/icons/corner_none_84px.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - dark_none - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_small_108px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_small_108px.svg new file mode 100644 index 0000000000..c9f3072a19 --- /dev/null +++ b/src/plugin-personalization/operation/qrc/dark/icons/corner_small_108px.svg @@ -0,0 +1,45 @@ + + + dark_small + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/dark/icons/corner_small_84px.svg b/src/plugin-personalization/operation/qrc/dark/icons/corner_small_84px.svg deleted file mode 100644 index 429ce11722..0000000000 --- a/src/plugin-personalization/operation/qrc/dark/icons/corner_small_84px.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - dark_small - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/icons/download_more_dark.png b/src/plugin-personalization/operation/qrc/icons/download_more_dark.png new file mode 100644 index 0000000000..9f39057fb5 Binary files /dev/null and b/src/plugin-personalization/operation/qrc/icons/download_more_dark.png differ diff --git a/src/plugin-personalization/operation/qrc/icons/download_more_light.png b/src/plugin-personalization/operation/qrc/icons/download_more_light.png new file mode 100644 index 0000000000..de43d1568c Binary files /dev/null and b/src/plugin-personalization/operation/qrc/icons/download_more_light.png differ diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_big_108px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_big_108px.svg new file mode 100644 index 0000000000..10b716baf6 --- /dev/null +++ b/src/plugin-personalization/operation/qrc/light/icons/corner_big_108px.svg @@ -0,0 +1,47 @@ + + + light_big + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_big_84px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_big_84px.svg deleted file mode 100644 index cd42df6204..0000000000 --- a/src/plugin-personalization/operation/qrc/light/icons/corner_big_84px.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - light_big - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_middle_108px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_middle_108px.svg new file mode 100644 index 0000000000..830dfd0705 --- /dev/null +++ b/src/plugin-personalization/operation/qrc/light/icons/corner_middle_108px.svg @@ -0,0 +1,47 @@ + + + light_middle + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_middle_84px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_middle_84px.svg deleted file mode 100644 index a4f80d9aa9..0000000000 --- a/src/plugin-personalization/operation/qrc/light/icons/corner_middle_84px.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - light_middle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_none_108px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_none_108px.svg new file mode 100644 index 0000000000..fd3218752d --- /dev/null +++ b/src/plugin-personalization/operation/qrc/light/icons/corner_none_108px.svg @@ -0,0 +1,47 @@ + + + light_none + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_none_84px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_none_84px.svg deleted file mode 100644 index 9d65f83cd4..0000000000 --- a/src/plugin-personalization/operation/qrc/light/icons/corner_none_84px.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - light_none - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_small_108px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_small_108px.svg new file mode 100644 index 0000000000..ae73a39aa5 --- /dev/null +++ b/src/plugin-personalization/operation/qrc/light/icons/corner_small_108px.svg @@ -0,0 +1,47 @@ + + + light_none 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/light/icons/corner_small_84px.svg b/src/plugin-personalization/operation/qrc/light/icons/corner_small_84px.svg deleted file mode 100644 index 9c0209a294..0000000000 --- a/src/plugin-personalization/operation/qrc/light/icons/corner_small_84px.svg +++ /dev/null @@ -1,52 +0,0 @@ - - - light_small - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/operation/qrc/personalization.qrc b/src/plugin-personalization/operation/qrc/personalization.qrc index efcc4fc37d..561ffc04f9 100644 --- a/src/plugin-personalization/operation/qrc/personalization.qrc +++ b/src/plugin-personalization/operation/qrc/personalization.qrc @@ -9,16 +9,20 @@ texts/round_high_16px.svg texts/round_low_16px.svg texts/help_16px.svg - texts/download-more_84px.svg - dark/icons/corner_none_84px.svg - dark/icons/corner_small_84px.svg - dark/icons/corner_middle_84px.svg - dark/icons/corner_big_84px.svg - light/icons/corner_none_84px.svg - light/icons/corner_small_84px.svg - light/icons/corner_middle_84px.svg - light/icons/corner_big_84px.svg + dark/icons/corner_none_108px.svg + dark/icons/corner_small_108px.svg + dark/icons/corner_middle_108px.svg + dark/icons/corner_big_108px.svg + light/icons/corner_none_108px.svg + light/icons/corner_small_108px.svg + light/icons/corner_middle_108px.svg + light/icons/corner_big_108px.svg + + + + icons/download_more_light.png + icons/download_more_dark.png diff --git a/src/plugin-personalization/operation/qrc/texts/download-more_84px.svg b/src/plugin-personalization/operation/qrc/texts/download-more_84px.svg deleted file mode 100644 index 3b8a487217..0000000000 --- a/src/plugin-personalization/operation/qrc/texts/download-more_84px.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - 编组 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/plugin-personalization/qml/ColorAndIcons.qml b/src/plugin-personalization/qml/ColorAndIcons.qml index a2d4dd1be6..f35d453e26 100644 --- a/src/plugin-personalization/qml/ColorAndIcons.qml +++ b/src/plugin-personalization/qml/ColorAndIcons.qml @@ -101,8 +101,8 @@ DccObject { colorDialog.color = dccData.model.activeColor colorDialog.open() } else { - dccData.worker.setActiveColor(listview.cutColors[index]) dccData.worker.setActiveColors(listview.colors[index] + "," + listview.darkColors[index]) + dccData.worker.setActiveColor(listview.cutColors[index]) } } } @@ -111,12 +111,13 @@ DccObject { DccColorDialog { id: colorDialog anchors.centerIn: Overlay.overlay + popupType: Popup.Item width: 300 height: 300 onAccepted: { console.warn(colorDialog.color) - dccData.worker.setActiveColor(colorDialog.color) dccData.worker.setActiveColors(colorDialog.color + "," + colorDialog.color) + dccData.worker.setActiveColor(colorDialog.color) } } } diff --git a/src/plugin-personalization/qml/DccColorDialog.qml b/src/plugin-personalization/qml/DccColorDialog.qml index 416ed4bc2f..0c625ddb65 100644 --- a/src/plugin-personalization/qml/DccColorDialog.qml +++ b/src/plugin-personalization/qml/DccColorDialog.qml @@ -14,9 +14,6 @@ import org.deepin.dtk.style 1.0 as DS ColorDialogImpl { id: control - color: "transparent" - width: parent.width - height: parent.height implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, contentWidth + leftPadding + rightPadding, @@ -122,21 +119,39 @@ ColorDialogImpl { D.TextField { text: control.color.toString().substring(1) - readOnly: true Layout.preferredWidth: 70 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter + validator: RegularExpressionValidator { + regularExpression: /^[0-9a-fA-F]{6}$/ + } + onEditingFinished: { + control.color = "#" + text + } } Repeater { model: [control.red, control.green, control.blue] D.TextField { text: modelData - readOnly: true Layout.fillWidth: true Layout.preferredWidth: 70 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter + inputMethodHints: Qt.ImhDigitsOnly + validator: IntValidator { bottom: 0; top: 255 } + + onEditingFinished: { + if (text !== "") { + if (modelData === control.red) { + control.red = text; + } else if (modelData === control.green) { + control.green = text; + } else if (modelData === control.blue) { + control.blue = text; + } + } + } } } diff --git a/src/plugin-personalization/qml/IconThemeGridView.qml b/src/plugin-personalization/qml/IconThemeGridView.qml index a32f5c9b95..44d51d963f 100644 --- a/src/plugin-personalization/qml/IconThemeGridView.qml +++ b/src/plugin-personalization/qml/IconThemeGridView.qml @@ -42,6 +42,7 @@ GridLayout { Layout.fillWidth: true Text { text: model.id + color: this.palette.windowText } Item { diff --git a/src/plugin-personalization/qml/InterfaceEffectListview.qml b/src/plugin-personalization/qml/InterfaceEffectListview.qml index 26e9ca2455..dc938a252b 100644 --- a/src/plugin-personalization/qml/InterfaceEffectListview.qml +++ b/src/plugin-personalization/qml/InterfaceEffectListview.qml @@ -7,7 +7,7 @@ import QtQuick.Layouts 1.15 import org.deepin.dtk 1.0 as D import org.deepin.dcc 1.0 -Rectangle { +Control { id: root property alias model: repeater.model property bool backgroundVisible: true @@ -22,14 +22,10 @@ Rectangle { Compatible } - color: "transparent" - implicitHeight: layoutView.height Layout.fillWidth: true - - ColumnLayout { + contentItem: ColumnLayout { id: layoutView width: parent.width - clip: true spacing: 0 Repeater { id: repeater diff --git a/src/plugin-personalization/qml/ThemeSelectView.qml b/src/plugin-personalization/qml/ThemeSelectView.qml index dc36134b0a..4b418e8baf 100644 --- a/src/plugin-personalization/qml/ThemeSelectView.qml +++ b/src/plugin-personalization/qml/ThemeSelectView.qml @@ -81,14 +81,14 @@ ListView { color: "transparent" border.width: 2 border.color: D.DTK.platformTheme.activeColor - radius: 12 + radius: 10 } Rectangle { anchors.fill: parent anchors.margins: listview.itemBorderWidth + 1 color: "transparent" - radius: 12 + radius: 10 Image { anchors.fill: parent @@ -156,12 +156,13 @@ ListView { anchors.fill: parent anchors.margins: listview.itemBorderWidth + 1 color: "transparent" - radius: 12 + radius: 10 - D.DciIcon { + Image { anchors.fill: parent - sourceSize: Qt.size(parent.width, parent.height) - name: "download-more" + mipmap: true + source: D.DTK.themeType === D.ApplicationHelper.LightType ? + "qrc:/icons/download_more_light.png" : "qrc:/icons/download_more_dark.png" } } } diff --git a/src/plugin-personalization/qml/WallpaperPage.qml b/src/plugin-personalization/qml/WallpaperPage.qml index d5701e2725..1937e5e718 100644 --- a/src/plugin-personalization/qml/WallpaperPage.qml +++ b/src/plugin-personalization/qml/WallpaperPage.qml @@ -39,7 +39,7 @@ DccObject { id: image anchors.fill: parent source: dccData.model.wallpaperMap[dccData.model.currentSelectScreen] - sourceSize: Qt.size(image.width, image.height) + mipmap: true visible: false fillMode: Image.PreserveAspectCrop asynchronous: true diff --git a/src/plugin-personalization/qml/WindowEffectPage.qml b/src/plugin-personalization/qml/WindowEffectPage.qml index 463dc0d58c..2057d96fff 100644 --- a/src/plugin-personalization/qml/WindowEffectPage.qml +++ b/src/plugin-personalization/qml/WindowEffectPage.qml @@ -176,6 +176,7 @@ DccObject { slider.handleType: Slider.HandleType.ArrowBottom slider.from: 20 slider.to: 100 + slider.value: 20 slider.live: true slider.stepSize: 1 slider.snapMode: Slider.SnapAlways