Merge branch 'master' into master

linuxdeepin · Jul 13, 2023 · 3d25b65 · 3d25b65
2 parents 81de275 + 7d0acc3
commit 3d25b65
Show file tree

Hide file tree

Showing 16 changed files with 152 additions and 232 deletions.
diff --git a/.github/workflows/backup-to-gitlab.yml b/.github/workflows/backup-to-gitlab.yml
@@ -8,10 +8,8 @@ concurrency:
 jobs:
   backup-to-gitlabwh:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitlabwh.yml@master
-    secrets:
-      BRIDGETOKEN: ${{ secrets.BRIDGETOKEN }}
+    secrets: inherit
 
   backup-to-gitee:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitee.yml@master
-    secrets:
-      GITEE_SYNC_TOKEN: ${{ secrets.GITEE_SYNC_TOKEN }}
+    secrets: inherit
diff --git a/.github/workflows/call-build-distribution.yml b/.github/workflows/call-build-distribution.yml
@@ -10,8 +10,4 @@ on:
 jobs:
   check_job:
     uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
-    secrets:
-      BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
-      BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
-      WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
-      WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
+    secrets: inherit
diff --git a/.github/workflows/call-clacheck.yml b/.github/workflows/call-clacheck.yml
@@ -12,5 +12,4 @@ concurrency:
 jobs:
   clacheck:
     uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: export
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false

diff --git a/src/main.cpp b/src/main.cpp
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
     app->loadTranslator();
     app->setApplicationLicense("GPLV3");
     app->setApplicationVersion(DApplication::buildVersion(VERSION));
+    app->setAttribute(Qt::AA_UseHighDpiPixmaps);
     app->setOrganizationName("deepin");
     app->setApplicationName("deepin-album");
     app->setApplicationDisplayName(QObject::tr("Album"));

diff --git a/src/qml/ThumbnailImageView/CollecttionView/DayCollection.qml b/src/qml/ThumbnailImageView/CollecttionView/DayCollection.qml
@@ -544,7 +544,7 @@ Item {
                 var paths = albumControl.getDayPaths(m_dayToken)
                 viewModel.clear()
                 for (var i = 0;i !== paths.length;++i) {
-                    viewModel.append({url: paths[i], filePath: albumControl.localPath(paths[i])})
+                    viewModel.append({url: paths[i], filePath: albumControl.url2localPath(paths[i])})
 
                     //顺便统计下图片和视频的数量
                     if(fileControl.isImage(paths[i])) {

diff --git a/src/qml/ThumbnailImageView/DeviceAlbum/DeviceAlbum.qml b/src/qml/ThumbnailImageView/DeviceAlbum/DeviceAlbum.qml
@@ -55,7 +55,7 @@ Rectangle {
         //QML的翻译不支持%n的特性，只能拆成这种代码
 
         var photoCountText = ""
-        var photoCount = albumControl.getDeviceAlbumInfoConut(devicePath, 1)
+        var photoCount = albumControl.getDeviceAlbumInfoConut(devicePath, 3)
         if(photoCount === 0) {
             photoCountText = ""
         } else if(photoCount === 1) {
@@ -65,7 +65,7 @@ Rectangle {
         }
 
         var videoCountText = ""
-        var videoCount = albumControl.getDeviceAlbumInfoConut(devicePath, 2)
+        var videoCount = albumControl.getDeviceAlbumInfoConut(devicePath, 4)
         if(videoCount === 0) {
             videoCountText = ""
         } else if(videoCount === 1) {