From b1c6c02f2cdbc817af1184e1278875c3ee401853 Mon Sep 17 00:00:00 2001 From: xust Date: Mon, 2 Sep 2024 10:22:29 +0800 Subject: [PATCH 1/7] fix: [desktop] UI text. as title. Log: as title. Bug: https://pms.uniontech.com/bug-view-269329.html --- .../options/optionswindow.cpp | 2 +- translations/dde-file-manager.ts | 20 +++++++++---------- translations/dde-file-manager_bo.ts | 20 +++++++++---------- translations/dde-file-manager_ug.ts | 20 +++++++++---------- translations/dde-file-manager_zh_CN.ts | 20 +++++++++---------- translations/dde-file-manager_zh_HK.ts | 20 +++++++++---------- translations/dde-file-manager_zh_TW.ts | 20 +++++++++---------- 7 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/plugins/desktop/ddplugin-organizer/options/optionswindow.cpp b/src/plugins/desktop/ddplugin-organizer/options/optionswindow.cpp index 08a632d7df..e97823c035 100644 --- a/src/plugins/desktop/ddplugin-organizer/options/optionswindow.cpp +++ b/src/plugins/desktop/ddplugin-organizer/options/optionswindow.cpp @@ -87,7 +87,7 @@ bool OptionsWindow::initialize() auto titleBar = new DTitlebar(this); titleBar->setMenuVisible(false); titleBar->setBackgroundTransparent(true); - titleBar->setTitle(tr("Desktop options")); + titleBar->setTitle(tr("View options")); mainLayout->addWidget(titleBar, 0, Qt::AlignTop); // content diff --git a/translations/dde-file-manager.ts b/translations/dde-file-manager.ts index a7ee3430d7..540809d3b6 100644 --- a/translations/dde-file-manager.ts +++ b/translations/dde-file-manager.ts @@ -335,20 +335,20 @@ Unable to find the original file - - + + File has been moved or deleted File has been moved or deleted - + You do not have permission to access this folder You do not have permission to access this folder - + You do not have permission to traverse files in it You do not have permission to traverse files in it @@ -889,19 +889,19 @@ (copy %1) - - + + dde-file-manager dde-file-manager - + Files are being processed Files are being processed - + Bit Bit @@ -2124,8 +2124,8 @@ ddplugin_organizer::OptionsWindow - Desktop options - Desktop options + View options + diff --git a/translations/dde-file-manager_bo.ts b/translations/dde-file-manager_bo.ts index 605045ad57..a4a73a2808 100644 --- a/translations/dde-file-manager_bo.ts +++ b/translations/dde-file-manager_bo.ts @@ -335,20 +335,20 @@ དམིགས་འབེན་ཡིག་ཆའི་འབྲེལ་མཐུད་རྙེད་ཐབས་བྲལ། - - + + File has been moved or deleted ཡིག་ཆ་སྤོས་ཟིན་པའམ་བསུབས་ཟིན། - + You do not have permission to access this folder ཁྱོད་ལ་ཡིག་ཁུག་འདི་ཀློག་དབང་མེད། - + You do not have permission to traverse files in it ཁྱོད་ལ་ཡན་ལག་ཡིག་ཆར་ལྟ་སྤྱོད་བྱེད་དབང་མེད། @@ -889,19 +889,19 @@ （འདྲ་དཔེ། %1） - - + + dde-file-manager dde-file-manager - + Files are being processed ཡིག་ཆ་ཐག་གཅོད་བཞིན་པ། - + Bit གནས། @@ -2124,8 +2124,8 @@ ddplugin_organizer::OptionsWindow - Desktop options - ཅོག་ངོས་གདམ་ཚན། + View options + གདམ་ག་ལ་ལྟ་བ། diff --git a/translations/dde-file-manager_ug.ts b/translations/dde-file-manager_ug.ts index cf4b276ad2..6c5aa02cfb 100644 --- a/translations/dde-file-manager_ug.ts +++ b/translations/dde-file-manager_ug.ts @@ -335,20 +335,20 @@ ئۇلىنىش نىشان ھۆججىتىنى تاپالمىدى - - + + File has been moved or deleted ھۆججەت يۆتكىۋېتىلگەن ياكى ئۆچۈرۈلگەن - + You do not have permission to access this folder بۇ ھۆججەتنى ئوقۇش ھوقۇقىڭىز يوق - + You do not have permission to traverse files in it تارماق ھۆججەتلەرنى كۆرۈش ھوقۇقىڭىز يوق @@ -889,19 +889,19 @@ (قوشۇمچە %1) - - + + dde-file-manager ھۆججەت باشقۇرغۇچ - + Files are being processed ھۆججەتنى بىر تەرەپ قىلىۋاتىدۇ - + Bit بىت @@ -2124,8 +2124,8 @@ ddplugin_organizer::OptionsWindow - Desktop options - ئۈستەليۈزى تۈرلىرى + View options + تاللانمىلارنى كۆرۈش diff --git a/translations/dde-file-manager_zh_CN.ts b/translations/dde-file-manager_zh_CN.ts index e4d4297a13..1b45e723f5 100644 --- a/translations/dde-file-manager_zh_CN.ts +++ b/translations/dde-file-manager_zh_CN.ts @@ -335,20 +335,20 @@ 无法找到链接目标文件 - - + + File has been moved or deleted 文件已被移动或删除 - + You do not have permission to access this folder 您没有权限访问该文件夹 - + You do not have permission to traverse files in it 您没有权限遍历子文件 @@ -889,19 +889,19 @@ （副本 %1） - - + + dde-file-manager dde-file-manager - + Files are being processed 正在处理文件 - + Bit 位 @@ -2124,8 +2124,8 @@ ddplugin_organizer::OptionsWindow - Desktop options - 桌面选项 + View options + 视图选项 diff --git a/translations/dde-file-manager_zh_HK.ts b/translations/dde-file-manager_zh_HK.ts index 4f69046736..e4b7ba45ca 100644 --- a/translations/dde-file-manager_zh_HK.ts +++ b/translations/dde-file-manager_zh_HK.ts @@ -335,20 +335,20 @@ 無法找到鏈接目標文件 - - + + File has been moved or deleted 文件已被移動或刪除 - + You do not have permission to access this folder 您沒有權限訪問該文件夾 - + You do not have permission to traverse files in it 您沒有權限遍歷子文件 @@ -889,19 +889,19 @@ （副本 %1） - - + + dde-file-manager dde-file-manager - + Files are being processed 正在處理文件 - + Bit 位 @@ -2124,8 +2124,8 @@ ddplugin_organizer::OptionsWindow - Desktop options - 桌面選項 + View options + 視圖選項 diff --git a/translations/dde-file-manager_zh_TW.ts b/translations/dde-file-manager_zh_TW.ts index 466994dc97..0fce0ca295 100644 --- a/translations/dde-file-manager_zh_TW.ts +++ b/translations/dde-file-manager_zh_TW.ts @@ -335,20 +335,20 @@ 無法找到連結目標文件 - - + + File has been moved or deleted 文件已被移動或刪除 - + You do not have permission to access this folder 您沒有權限訪問該資料夾 - + You do not have permission to traverse files in it 您沒有權限遍歷子文件 @@ -889,19 +889,19 @@ （副本 %1） - - + + dde-file-manager dde-file-manager - + Files are being processed 正在處理文件 - + Bit 位 @@ -2124,8 +2124,8 @@ ddplugin_organizer::OptionsWindow - Desktop options - 桌面選項 + View options + 視圖選項 From c111f55bc9d3c34e5e03563fabd9376f373c021e Mon Sep 17 00:00:00 2001 From: xust Date: Mon, 2 Sep 2024 10:37:34 +0800 Subject: [PATCH 2/7] fix: [disk] disable rename for iso9660 fs as title. Log: as title. Bug: https://pms.uniontech.com/bug-view-270215.html --- .../dfmplugin-computer/fileentity/blockentryfileentity.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/filemanager/core/dfmplugin-computer/fileentity/blockentryfileentity.cpp b/src/plugins/filemanager/core/dfmplugin-computer/fileentity/blockentryfileentity.cpp index 181f9b442c..dcdf4d697a 100644 --- a/src/plugins/filemanager/core/dfmplugin-computer/fileentity/blockentryfileentity.cpp +++ b/src/plugins/filemanager/core/dfmplugin-computer/fileentity/blockentryfileentity.cpp @@ -233,6 +233,9 @@ bool BlockEntryFileEntity::renamable() const if (datas.value(DeviceProperty::kOpticalDrive).toBool()) return false; + if (datas.value(DeviceProperty::kFileSystem).toString() == "iso9660") + return false; + if (datas.value(DeviceProperty::kIsEncrypted).toBool() && datas.value(DeviceProperty::kCleartextDevice).toString() == "/") return false; From 35dbae65fdabb7c11a9817499eeffe36bf75a782 Mon Sep 17 00:00:00 2001 From: xust Date: Tue, 3 Sep 2024 10:39:44 +0800 Subject: [PATCH 3/7] fix: [desktop] crash in some case. 1. uncheck an organized collection; 2. change the wallpaper; 3. crash. the event is not unsubscribed when collection removed at step 1, when the wallpaper event emitted, the event handler executed with nullptr, cause crash. unsubscribe signal when collection destroyed. Log: as above. Bug: https://pms.uniontech.com/bug-view-271449.html --- .../desktop/ddplugin-organizer/mode/normalizedmode.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/desktop/ddplugin-organizer/mode/normalizedmode.cpp b/src/plugins/desktop/ddplugin-organizer/mode/normalizedmode.cpp index cd5fdf7fc7..55ec9f5926 100644 --- a/src/plugins/desktop/ddplugin-organizer/mode/normalizedmode.cpp +++ b/src/plugins/desktop/ddplugin-organizer/mode/normalizedmode.cpp @@ -224,6 +224,10 @@ void NormalizedModePrivate::connectCollectionSignals(CollectionHolderPointer col }); dpfSignalDispatcher->subscribe("ddplugin_background", "signal_Background_BackgroundSetted", collection->widget(), &CollectionWidget::cacheSnapshot); + connect(collection->widget(), &QWidget::destroyed, this, [](QObject *obj) { + dpfSignalDispatcher->unsubscribe("ddplugin_background", "signal_Background_BackgroundSetted", + obj, &CollectionWidget::cacheSnapshot); + }); } } From 8fa8b9d95ed2077957de55e472a006cf1f9d85c3 Mon Sep 17 00:00:00 2001 From: xust Date: Tue, 3 Sep 2024 11:22:25 +0800 Subject: [PATCH 4/7] fix: [desktop] the view setting dialog lost focus as title. Log: as title. Bug: https://pms.uniontech.com/bug-view-271953.html --- .../desktop/ddplugin-organizer/options/organizationgroup.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/desktop/ddplugin-organizer/options/organizationgroup.cpp b/src/plugins/desktop/ddplugin-organizer/options/organizationgroup.cpp index 4f0007a548..0ca8ef3a16 100644 --- a/src/plugins/desktop/ddplugin-organizer/options/organizationgroup.cpp +++ b/src/plugins/desktop/ddplugin-organizer/options/organizationgroup.cpp @@ -99,7 +99,8 @@ QLayout *OrganizationGroup::buildTypeLayout() for (QWidget *wid : list) { wid->setFixedHeight(kCheckEntryHeight); gridLayout->addWidget(wid, row, col, Qt::AlignTop); - wid->setVisible(true); // requiring widget to be visible when layout calculates sizehint. + // this line makes the setting widget lose focus, Commenting this line seems to have no effect + // wid->setVisible(true); // requiring widget to be visible when layout calculates sizehint. ++index; row = index / 3; col = index % 3; From e23e891d85c0083e455c16a84fd8047d32776526 Mon Sep 17 00:00:00 2001 From: liyigang Date: Mon, 2 Sep 2024 11:18:28 +0800 Subject: [PATCH 5/7] fix: Create new text in the SMB server, double-click to open the text editor and edit the text The mimetype method for reading files is inconsistent, and the parameters passed in using openwithdialog are incorrect Log: Create new text in the SMB server, double-click to open the text editor and edit the text Bug: https://pms.uniontech.com/bug-view-267705.html --- .../fileoperationsevent/fileoperationseventreceiver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/common/core/dfmplugin-fileoperations/fileoperationsevent/fileoperationseventreceiver.cpp b/src/plugins/common/core/dfmplugin-fileoperations/fileoperationsevent/fileoperationseventreceiver.cpp index 2b1d349382..298c1d03db 100644 --- a/src/plugins/common/core/dfmplugin-fileoperations/fileoperationsevent/fileoperationseventreceiver.cpp +++ b/src/plugins/common/core/dfmplugin-fileoperations/fileoperationsevent/fileoperationseventreceiver.cpp @@ -883,7 +883,7 @@ bool FileOperationsEventReceiver::handleOperationOpenFiles(const quint64 windowI dpfSignalDispatcher->publish(DFMBASE_NAMESPACE::GlobalEventType::kMoveToTrash, windowId, fileHandler.getInvalidPath(), AbstractJobHandler::JobFlag::kNoHint, nullptr); } else { // deal open file with custom dialog - dpfSlotChannel->push("dfmplugin_utils", "slot_OpenWith_ShowDialog", windowId, fileHandler.getInvalidPath()); + dpfSlotChannel->push("dfmplugin_utils", "slot_OpenWith_ShowDialog", windowId, urls); ok = true; } } From 3de592603ee2aefb394459e5e9ee41f8d968ec69 Mon Sep 17 00:00:00 2001 From: liyigang Date: Tue, 3 Sep 2024 13:12:21 +0800 Subject: [PATCH 6/7] fix: Local directory attribute box statistics file size and quantity errors Local directory attribute box statistics file size and quantity errors Log: Local directory attribute box statistics file size and quantity errors --- src/dfm-base/file/local/syncfileinfo.cpp | 5 ++--- .../core/dfmplugin-propertydialog/views/basicwidget.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/dfm-base/file/local/syncfileinfo.cpp b/src/dfm-base/file/local/syncfileinfo.cpp index 694e7f3d57..c987f8c9da 100644 --- a/src/dfm-base/file/local/syncfileinfo.cpp +++ b/src/dfm-base/file/local/syncfileinfo.cpp @@ -659,10 +659,9 @@ FileInfo::FileType SyncFileInfoPrivate::updateFileType() const QString &absoluteFilePath = filePath(); const QByteArray &nativeFilePath = QFile::encodeName(absoluteFilePath); QT_STATBUF statBuffer; - auto fileMode = attribute(DFileInfo::AttributeID::kStandardType).toUInt(); - if (fileMode <= 0 || QT_STAT(nativeFilePath.constData(), &statBuffer) != 0) + if (QT_STAT(nativeFilePath.constData(), &statBuffer) != 0) return fileType; - fileMode = fileMode <= 0 ? statBuffer.st_mode : fileMode; + auto fileMode = statBuffer.st_mode; if (S_ISDIR(fileMode)) fileType = FileInfo::FileType::kDirectory; else if (S_ISCHR(fileMode)) diff --git a/src/plugins/common/core/dfmplugin-propertydialog/views/basicwidget.cpp b/src/plugins/common/core/dfmplugin-propertydialog/views/basicwidget.cpp index 3d7884e55f..fada133904 100644 --- a/src/plugins/common/core/dfmplugin-propertydialog/views/basicwidget.cpp +++ b/src/plugins/common/core/dfmplugin-propertydialog/views/basicwidget.cpp @@ -286,12 +286,12 @@ void BasicWidget::basicFill(const QUrl &url) fileType->setRightValue(info->displayOf(DisPlayInfoType::kMimeTypeDisplayName), Qt::ElideMiddle, Qt::AlignVCenter, true); if (type == FileInfo::FileType::kDirectory && fileCount && fileCount->RightValue().isEmpty()) { fileCount->setRightValue(tr("%1 item").arg(0), Qt::ElideNone, Qt::AlignVCenter, true); + connect(fileCalculationUtils, &FileStatisticsJob::dataNotify, this, &BasicWidget::slotFileCountAndSizeChange); if (info->canAttributes(CanableInfoType::kCanRedirectionFileUrl)) { fileCalculationUtils->start(QList() << info->urlOf(UrlInfoType::kRedirectedFileUrl)); } else { fileCalculationUtils->start(QList() << url); } - connect(fileCalculationUtils, &FileStatisticsJob::dataNotify, this, &BasicWidget::slotFileCountAndSizeChange); } else { layoutMain->removeWidget(fileCount); fieldMap.remove(BasicFieldExpandEnum::kFileCount); From 5779551e1c480105ac56e5f059204c4a7c63ca56 Mon Sep 17 00:00:00 2001 From: liyigang Date: Fri, 30 Aug 2024 15:41:52 +0800 Subject: [PATCH 7/7] fix: add depend libxcb-xfixes0-dev add depend libxcb-xfixes0-dev Log: add depend libxcb-xfixes0-dev --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 54878b7e34..77645f434f 100644 --- a/debian/control +++ b/debian/control @@ -43,6 +43,7 @@ Build-Depends: libpoppler-cpp-dev, libcryptsetup-dev, libpcre3-dev, + libxcb-xfixes0-dev (>= 1.10~), deepin-desktop-base | deepin-desktop-server | deepin-desktop-device Standards-Version: 3.9.8 Homepage: http://www.deepin.org