fix: 【UI】整改页面为空的显示问题

根据UI设计图整改 Log: 【UI】整改页面为空的显示问题 Bug: https://pms.uniontech.com/bug-view-167825.html
linuxdeepin · Sep 4, 2023 · def9cdd · def9cdd
1 parent 7d0c54b
commit def9cdd
Show file tree

Hide file tree

Showing 55 changed files with 12,411 additions and 12,236 deletions.
diff --git a/src/deepin-album.qrc b/src/deepin-album.qrc
@@ -12,7 +12,6 @@
         <file>qml/ThumbnailImageView/RecentlyDeletedView/RecentlyDeletedView.qml</file>
         <file>qml/ThumbnailImageView/ThumbnailImage.qml</file>
         <file>qml/ThumbnailImageView/NoPictureView.qml</file>
-        <file>qml/ThumbnailImageView/ImportView.qml</file>
         <file>qml/PreviewImageViewer/AlertToolTip.qml</file>
         <file>qml/PreviewImageViewer/FloatingNotice.qml</file>
         <file>qml/PreviewImageViewer/FullThumbnail.qml</file>

diff --git a/src/dsg/icons/nopicture1.dci b/src/dsg/icons/nopicture1.dci
diff --git a/src/dsg/icons/nopicture2.dci b/src/dsg/icons/nopicture2.dci
diff --git a/src/dsg/icons/nopicture3.dci b/src/dsg/icons/nopicture3.dci
diff --git a/src/dsg/icons/nopicture4.dci b/src/dsg/icons/nopicture4.dci
diff --git a/src/qml/ThumbnailImageView/CollecttionView/CollecttionView.qml b/src/qml/ThumbnailImageView/CollecttionView/CollecttionView.qml
@@ -87,9 +87,10 @@ BaseView {
     }
 
     // 若没有数据，显示导入图片视图
-    ImportView {
+    NoPictureView {
         visible: GStatus.currentViewType === Album.Types.ViewCollecttion && allCollection.numLabelText === "" && albumControl.getAllCount() === 0
-
+        bShowImportBtn: true
+        iconName: "nopicture1"
         onVisibleChanged: {
             if (visible) {
                 GStatus.statusBarNumText = ""

diff --git a/src/qml/ThumbnailImageView/CustomAlbum/CustomAlbum.qml b/src/qml/ThumbnailImageView/CustomAlbum/CustomAlbum.qml
@@ -137,7 +137,7 @@ BaseView {
                 left: parent.left
             }
             font: DTK.fontManager.t6
-            text: numLabelText
+            text: numLabelText !== "" ? numLabelText : qsTr("0 item")
         }
 
         // 筛选下拉框
@@ -150,7 +150,6 @@ BaseView {
             }
             width: 130
             height: 30
-            visible: !(numLabelText === "" && filterType === 0)
         }
 
         MouseArea {
@@ -188,7 +187,7 @@ BaseView {
         }
     }
 
-    // 仅在自动导入相册筛选无内容时，显示无结果
+    // 筛选无内容时，显示无结果
     Label {
         anchors {
             top: customAlbumTitleRect.bottom
@@ -197,30 +196,18 @@ BaseView {
             right: parent.right
             centerIn: parent
         }
-        visible: numLabelText === "" && filterType > 0 && (isSystemAutoImport || isNormalAutoImport)
+        visible: numLabelText === "" && filterType > 0
         font: DTK.fontManager.t4
         color: Qt.rgba(85/255, 85/255, 85/255, 0.4)
         text: qsTr("No results")
     }
 
-    // 仅在自动导入相册无内容时，显示没有图片或视频时显示
-    Label {
-        anchors {
-            top: customAlbumTitleRect.bottom
-            left: parent.left
-            bottom: theView.bottom
-            right: parent.right
-            centerIn: parent
-        }
-        visible: numLabelText === "" && filterType === 0 && (isSystemAutoImport || isNormalAutoImport)
-        font: DTK.fontManager.t4
-        color: Qt.rgba(85/255, 85/255, 85/255, 0.4)
-        text: qsTr("No photos or videos found")
-    }
-
-    // 自定义相册，若没有数据，显示导入图片视图
-    ImportView {
-        visible: GStatus.currentViewType === Album.Types.ViewCustomAlbum && numLabelText === "" && isCustom
+    // 1.自定义相册，若没有数据，显示导入图片视图
+    // 2.自动导入相册，无内容时，显示没有图片或视频时显示
+    NoPictureView {
+        visible: numLabelText === ""  && filterType === 0
+        bShowImportBtn: isCustom
+        iconName: isCustom ? "nopicture1" : (GStatus.currentViewType === Album.Types.ViewCustomAlbum ? "nopicture2" : "nopicture3")
     }
 
     Component.onCompleted: {

diff --git a/src/qml/ThumbnailImageView/HaveImportedView/HaveImportedView.qml b/src/qml/ThumbnailImageView/HaveImportedView/HaveImportedView.qml
@@ -17,6 +17,7 @@ BaseView {
     property string selectedText: getSelectedText(selectedPaths)
     property alias selectedPaths: theView.selectedPaths
     property real titleOpacity: 0.7
+    property bool bShowImportTips: GStatus.currentViewType === Album.Types.ViewHaveImported && numLabelText === "" && filterType === 0
 
     Connections {
         target: albumControl
@@ -45,8 +46,6 @@ BaseView {
         theView.importedListModel.loadImportedInfos()
         theView.updateSelectedPaths()
         getNumLabelText()
-
-        filterCombo.visible = albumControl.getAllInfoConut(1) > 0 || albumControl.getAllInfoConut(2)
     }
 
     // 刷新总数标签
@@ -108,6 +107,17 @@ BaseView {
             text: qsTr("Import")
         }
 
+        Label {
+            anchors {
+                top: importedLabel.bottom
+                topMargin: 10
+                left: parent.left
+            }
+            visible: bShowImportTips
+            font: DTK.fontManager.t6
+            text: qsTr("0 item")
+        }
+
         // 筛选下拉框
         FilterComboBox {
             id: filterCombo
@@ -128,8 +138,10 @@ BaseView {
     }
 
     // 若没有数据，显示导入图片视图
-    ImportView {
-        visible: GStatus.currentViewType === Album.Types.ViewHaveImported && numLabelText === "" && filterType === 0
+    NoPictureView {
+        visible: bShowImportTips
+        bShowImportBtn: true
+        iconName: "nopicture1"
     }
 
     Component.onCompleted: {

diff --git a/src/qml/ThumbnailImageView/ImportView.qml b/src/qml/ThumbnailImageView/ImportView.qml
diff --git a/src/qml/ThumbnailImageView/NoPictureView.qml b/src/qml/ThumbnailImageView/NoPictureView.qml
@@ -3,36 +3,50 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.11
+import QtQuick.Layouts 1.11
 import org.deepin.dtk 1.0
 
 
 Item {
     anchors.fill: parent
-    Item {
-        anchors.centerIn: parent
-        ActionButton {
-            id: noImageIcon
-            anchors {
-                top: parent.top
-                topMargin: -70
-                left : parent.left
-                leftMargin: -width / 2
-            }
 
-            icon {
-                name:"nopicture1"
-                width: 140
-                height: 140
-            }
+    property bool bShowImportBtn: false
+    property string iconName: "nopicture4"
+
+    ColumnLayout {
+        anchors {
+            centerIn: parent
         }
-        Label{
-            anchors {
-                top:noImageIcon.bottom
-                topMargin: 20
-                left : parent.left
-                leftMargin: -width/2
+
+        spacing: 15
+
+        DciIcon {
+            id: openViewImageIcon
+            Layout.alignment: Qt.AlignHCenter
+            Layout.preferredWidth: 140
+            Layout.preferredHeight: 100
+            sourceSize: Qt.size(140, 100)
+            name: iconName
+            palette: DTK.makeIconPalette(window.palette)
+        }
+
+        RecommandButton {
+            id: openPictureBtn
+
+            Layout.alignment: Qt.AlignHCenter
+            Layout.preferredWidth: 302
+            Layout.preferredHeight: 36
+            font.capitalization: Font.MixedCase
+            text: qsTr("Import Photos and Videos")
+            visible: bShowImportBtn
+            onClicked:{
+                importDialog.open()
             }
-            text:qsTr("No photos or videos found")
+        }
+        Label {
+            Layout.alignment: Qt.AlignHCenter
+            color: "#7A7A7A"
+            text: bShowImportBtn ? qsTr("Or drag them here") : qsTr("No photos or videos found")
         }
     }
 }
diff --git a/src/qml/ThumbnailImageView/RecentlyDeletedView/RecentlyDeletedView.qml b/src/qml/ThumbnailImageView/RecentlyDeletedView/RecentlyDeletedView.qml
@@ -169,7 +169,7 @@ BaseView {
             }
             width: 130
             height: 30
-            visible: !theView.haveSelect && totalCount > 0
+            visible: (!theView.haveSelect && totalCount > 0) || totalCount === 0
         }
 
         WarningButton {
@@ -254,7 +254,7 @@ BaseView {
 
     // 若没有数据，显示无图片视图
     NoPictureView {
-        visible: GStatus.currentViewType === Album.Types.ViewRecentlyDeleted && numLabelText === "" && filterType === 0
+        visible: GStatus.currentViewType === Album.Types.ViewRecentlyDeleted && numLabelText === ""/* && filterType === 0*/
     }
 
     Component.onCompleted: {

diff --git a/src/res.qrc b/src/res.qrc
@@ -44,6 +44,8 @@
         <file>dsg/icons/topleft.dci</file>
         <file>dsg/icons/nopicture1.dci</file>
         <file>dsg/icons/nopicture2.dci</file>
+        <file>dsg/icons/nopicture3.dci</file>
+        <file>dsg/icons/nopicture4.dci</file>
         <file>dsg/icons/item.dci</file>
         <file>dsg/icons/import_left.dci</file>
         <file>dsg/icons/back_album.dci</file>