From 2743a927ad5aae795ab1ecd4f8a2cc05d5f8d081 Mon Sep 17 00:00:00 2001 From: Lighto-Ku Date: Tue, 31 Dec 2024 12:24:54 +0800 Subject: [PATCH 1/4] feat: Add media file information display in property dialog - Add support for displaying image size (width x height) for image files - Add support for displaying resolution and duration for video files - Add support for displaying duration for audio files - Add new property filter types and basic field enums for media info - Implement media info handling functions for image/video/audio files This enhancement improves the property dialog by showing more detailed information for media files, providing better user experience. Log: Add media file information display in property dialog Task: https://pms.uniontech.com/story-view-36051.html --- .../dfmplugin_propertydialog_global.h | 8 +- .../views/basicwidget.cpp | 128 +++++++++++++++++- .../views/basicwidget.h | 7 + 3 files changed, 141 insertions(+), 2 deletions(-) diff --git a/src/plugins/common/dfmplugin-propertydialog/dfmplugin_propertydialog_global.h b/src/plugins/common/dfmplugin-propertydialog/dfmplugin_propertydialog_global.h index 6db99dfba6..84daa7552d 100644 --- a/src/plugins/common/dfmplugin-propertydialog/dfmplugin_propertydialog_global.h +++ b/src/plugins/common/dfmplugin-propertydialog/dfmplugin_propertydialog_global.h @@ -37,7 +37,10 @@ enum PropertyFilterType { kFilePositionFiled = 1 << 6, kFileCreateTimeFiled = 1 << 7, kFileAccessedTimeFiled = 1 << 8, - kFileModifiedTimeFiled = 1 << 9 + kFileModifiedTimeFiled = 1 << 9, + kFileImageSizeFiled = 1 << 10, + kFileMediaResolutionFiled = 1 << 11, + kFileMediaDurationFiled = 1 << 12 }; Q_ENUM_NS(PropertyFilterType) @@ -50,6 +53,9 @@ enum BasicFieldExpandEnum : int { kFileCreateTime, kFileAccessedTime, kFileModifiedTime, + kFileImageSize, + kFileMediaResolution, + kFileMediaDuration, }; Q_ENUM_NS(BasicFieldExpandEnum) diff --git a/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.cpp b/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.cpp index b18807fad4..18815dcedd 100644 --- a/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.cpp +++ b/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.cpp @@ -10,7 +10,14 @@ #include #include #include +#include +#include +#include + #include + +#include + #ifdef DTKWIDGET_CLASS_DSizeMode # include #endif @@ -32,6 +39,7 @@ static constexpr int kRightWidgetWidth { 255 }; Q_DECLARE_METATYPE(QList *) +USING_IO_NAMESPACE DWIDGET_USE_NAMESPACE DFMBASE_USE_NAMESPACE using namespace dfmplugin_propertydialog; @@ -90,6 +98,10 @@ void BasicWidget::initUI() DFontSizeManager::instance()->bind(hideFile, DFontSizeManager::SizeType::T7, QFont::Normal); hideFile->setText(tr("Hide this file")); hideFile->setToolTip(hideFile->text()); + + fileImgSize = createValueLabel(frameMain, tr("Image size")); + fileMediaResolution = createValueLabel(frameMain, tr("Resolution")); + fileMediaDuration = createValueLabel(frameMain, tr("Duration")); } KeyValueLabel *BasicWidget::createValueLabel(QFrame *frame, QString leftValue) @@ -214,6 +226,18 @@ void BasicWidget::basicFieldFilter(const QUrl &url) fieldMap.remove(BasicFieldExpandEnum::kFileModifiedTime); fileModified->deleteLater(); fileModified = nullptr; + } else if (fieldFilter & PropertyFilterType::kFileImageSizeFiled) { + fieldMap.remove(BasicFieldExpandEnum::kFileImageSize); + fileImgSize->deleteLater(); + fileImgSize = nullptr; + } else if (fieldFilter & PropertyFilterType::kFileMediaResolutionFiled) { + fieldMap.remove(BasicFieldExpandEnum::kFileMediaResolution); + fileMediaResolution->deleteLater(); + fileMediaResolution = nullptr; + } else if (fieldFilter & PropertyFilterType::kFileMediaDurationFiled) { + fieldMap.remove(BasicFieldExpandEnum::kFileMediaDuration); + fileMediaDuration->deleteLater(); + fileMediaDuration = nullptr; } } @@ -279,9 +303,15 @@ void BasicWidget::basicFill(const QUrl &url) fCount = 1; fileSize->setRightValue(FileUtils::formatSize(fSize), Qt::ElideNone, Qt::AlignVCenter, true); } + if (fileImgSize && fileImgSize->RightValue().isEmpty()) + fileImgSize->setVisible(false); + if (fileMediaResolution && fileMediaResolution->RightValue().isEmpty()) + fileMediaResolution->setVisible(false); + if (fileMediaDuration && fileMediaDuration->RightValue().isEmpty()) + fileMediaDuration->setVisible(false); if (fileType && fileType->RightValue().isEmpty()) { - const FileInfo::FileType type = info->fileType(); + FileInfo::FileType type = info->fileType(); 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); @@ -297,7 +327,38 @@ void BasicWidget::basicFill(const QUrl &url) delete fileCount; fileCount = nullptr; } + + QUrl localUrl = url; + QList urls {}; + bool ok = UniversalUtils::urlsTransformToLocal({ localUrl }, &urls); + if (ok && !urls.isEmpty()) + localUrl = urls.first(); + FileInfoPointer localinfo = InfoFactory::create(localUrl); + const QString &mimeName { localinfo->nameOf(NameInfoType::kMimeTypeName) }; + type = MimeTypeDisplayManager::instance()->displayNameToEnum(mimeName); + QList extenList; + if (type == FileInfo::FileType::kVideos) { + extenList << DFileInfo::AttributeExtendID::kExtendMediaWidth << DFileInfo::AttributeExtendID::kExtendMediaHeight << DFileInfo::AttributeExtendID::kExtendMediaDuration; + connect(&FileInfoHelper::instance(), &FileInfoHelper::mediaDataFinished, this, &BasicWidget::videoExtenInfo); + const QMap &mediaAttributes = localinfo->mediaInfoAttributes(DFileInfo::MediaType::kVideo, extenList); + if (!mediaAttributes.isEmpty()) + videoExtenInfo(url, mediaAttributes); + } else if (type == FileInfo::FileType::kImages) { + extenList << DFileInfo::AttributeExtendID::kExtendMediaWidth << DFileInfo::AttributeExtendID::kExtendMediaHeight; + connect(&FileInfoHelper::instance(), &FileInfoHelper::mediaDataFinished, this, &BasicWidget::imageExtenInfo); + const QMap &mediaAttributes = localinfo->mediaInfoAttributes(DFileInfo::MediaType::kImage, extenList); + if (!mediaAttributes.isEmpty()) + imageExtenInfo(url, mediaAttributes); + } else if (type == FileInfo::FileType::kAudios) { + extenList << DFileInfo::AttributeExtendID::kExtendMediaDuration; + connect(&FileInfoHelper::instance(), &FileInfoHelper::mediaDataFinished, this, &BasicWidget::audioExtenInfo); + const QMap &mediaAttributes = localinfo->mediaInfoAttributes(DFileInfo::MediaType::kAudio, extenList); + if (!mediaAttributes.isEmpty()) + audioExtenInfo(url, mediaAttributes); + } } + + } void BasicWidget::initFileMap() @@ -309,6 +370,9 @@ void BasicWidget::initFileMap() fieldMap.insert(BasicFieldExpandEnum::kFileCreateTime, fileCreated); fieldMap.insert(BasicFieldExpandEnum::kFileAccessedTime, fileAccessed); fieldMap.insert(BasicFieldExpandEnum::kFileModifiedTime, fileModified); + fieldMap.insert(BasicFieldExpandEnum::kFileImageSize, fileImgSize); + fieldMap.insert(BasicFieldExpandEnum::kFileMediaResolution, fileMediaResolution); + fieldMap.insert(BasicFieldExpandEnum::kFileMediaDuration, fileMediaDuration); } void BasicWidget::selectFileUrl(const QUrl &url) @@ -360,3 +424,65 @@ void BasicWidget::closeEvent(QCloseEvent *event) { DArrowLineDrawer::closeEvent(event); } + +void BasicWidget::imageExtenInfo(const QUrl &url, QMap properties) +{ + if (url != currentUrl) { + return; + } + + if (properties.isEmpty()) { + return; + } + int width = properties[DFileInfo::AttributeExtendID::kExtendMediaWidth].toInt(); + int height = properties[DFileInfo::AttributeExtendID::kExtendMediaHeight].toInt(); + const QString &imgSizeStr = QString::number(width) + "x" + QString::number(height); + + fileImgSize->setRightValue(imgSizeStr, Qt::ElideNone, Qt::AlignVCenter, true); + fileImgSize->setVisible(true); +} + +void BasicWidget::videoExtenInfo(const QUrl &url, QMap properties) +{ + if (url != currentUrl) { + return; + } + if (properties.isEmpty()) { + return; + } + + int width = properties[DFileInfo::AttributeExtendID::kExtendMediaWidth].toInt(); + int height = properties[DFileInfo::AttributeExtendID::kExtendMediaHeight].toInt(); + const QString &videoResolutionStr = QString::number(width) + "x" + QString::number(height); + + QVariant duration = properties[DFileInfo::AttributeExtendID::kExtendMediaDuration]; + + QTime t(0, 0, 0); + t = t.addMSecs(duration.toInt()); + + const QString &durationStr = t.toString("hh:mm:ss"); + + fileMediaResolution->setRightValue(videoResolutionStr, Qt::ElideNone, Qt::AlignVCenter, true); + fileMediaResolution->setVisible(true); + fileMediaDuration->setRightValue(durationStr, Qt::ElideNone, Qt::AlignVCenter, true); + fileMediaDuration->setVisible(true); +} + +void BasicWidget::audioExtenInfo(const QUrl &url, QMap properties) +{ + if (url != currentUrl) { + return; + } + if (properties.isEmpty()) { + return; + } + + QVariant duration = properties[DFileInfo::AttributeExtendID::kExtendMediaDuration]; + QTime t(0, 0, 0); + t = t.addMSecs(duration.toInt()); + + const QString &durationStr = t.toString("hh:mm:ss"); + + fileMediaDuration->setRightValue(durationStr, Qt::ElideNone, Qt::AlignVCenter, true); + fileMediaDuration->setVisible(true); +} diff --git a/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.h b/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.h index 1361de8914..5031afac54 100644 --- a/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.h +++ b/src/plugins/common/dfmplugin-propertydialog/views/basicwidget.h @@ -47,6 +47,10 @@ public slots: void slotFileHide(int state); + void imageExtenInfo(const QUrl &url, QMap properties); + void videoExtenInfo(const QUrl &url, QMap properties); + void audioExtenInfo(const QUrl &url, QMap properties); + protected: virtual void closeEvent(QCloseEvent *event) override; @@ -59,6 +63,9 @@ public slots: DFMBASE_NAMESPACE::KeyValueLabel *fileModified { nullptr }; DFMBASE_NAMESPACE::KeyValueLabel *fileAccessed { nullptr }; QCheckBox *hideFile { nullptr }; + DFMBASE_NAMESPACE::KeyValueLabel *fileImgSize { nullptr }; + DFMBASE_NAMESPACE::KeyValueLabel *fileMediaResolution { nullptr }; + DFMBASE_NAMESPACE::KeyValueLabel *fileMediaDuration { nullptr }; bool hideCheckBox { false }; DFMBASE_NAMESPACE::FileStatisticsJob *fileCalculationUtils { nullptr }; qint64 fSize { 0 }; From ede39c554cacc75512ef46b4293403af08ec8d96 Mon Sep 17 00:00:00 2001 From: Lighto-Ku Date: Tue, 31 Dec 2024 13:48:14 +0800 Subject: [PATCH 2/4] chore: update translation as title Log: update translation --- translations/dde-file-manager.ts | 219 +++++++++++++------------ translations/dde-file-manager_bo.ts | 219 +++++++++++++------------ translations/dde-file-manager_ug.ts | 219 +++++++++++++------------ translations/dde-file-manager_zh_CN.ts | 219 +++++++++++++------------ translations/dde-file-manager_zh_HK.ts | 219 +++++++++++++------------ translations/dde-file-manager_zh_TW.ts | 219 +++++++++++++------------ 6 files changed, 702 insertions(+), 612 deletions(-) diff --git a/translations/dde-file-manager.ts b/translations/dde-file-manager.ts index 41606da264..f0e610467b 100644 --- a/translations/dde-file-manager.ts +++ b/translations/dde-file-manager.ts @@ -106,7 +106,7 @@ FileDialogHandle - + All Files All Files @@ -148,50 +148,50 @@ QObject - + need authorization to access need authorization to access - + Can't verify the identity of %1. Can't verify the identity of %1. - + This happens when you log in to a computer the first time. This happens when you log in to a computer the first time. - + The identity sent by the remote computer is The identity sent by the remote computer is - + If you want to be absolutely sure it is safe to continue, contact the system administrator. If you want to be absolutely sure it is safe to continue, contact the system administrator. - + System Disk System Disk - + Data Disk Data Disk - + Blank %1 Disc Blank %1 Disc - + @@ -199,17 +199,17 @@ Unknown - + %1 Drive %1 Drive - + %1 Encrypted %1 Encrypted - + %1 Volume %1 Volume @@ -316,7 +316,7 @@ Recent - + @@ -324,7 +324,7 @@ Auto mount - + @@ -347,7 +347,7 @@ %1 items - + Unable to find the original file Unable to find the original file @@ -426,7 +426,7 @@ - + Built-in disks Built-in disks @@ -450,7 +450,7 @@ - + Loop partitions Loop partitions @@ -458,8 +458,8 @@ - - + + Mounted sharing folders Mounted sharing folders @@ -482,7 +482,7 @@ - + Mounted partitions and discs Mounted partitions and discs @@ -872,7 +872,7 @@ - + Cancel button @@ -907,19 +907,19 @@ (copy %1) - - + + dde-file-manager dde-file-manager - + Files are being processed Files are being processed - + Bit Bit @@ -931,7 +931,7 @@ - + Confirm button Confirm @@ -1748,11 +1748,11 @@ - - - - - + + + + + Clear search history @@ -1762,17 +1762,17 @@ - + search - + advanced search - + Are you sure clear search histories? @@ -3085,120 +3085,120 @@ dfmbase::SettingBackend - + Always open folder in new window Always open folder in new window - + Open file: Open file: - + Click Click - + Double click Double click - + New window and tab New window and tab - + Open from default window: Open from default window: - - + + Computer Computer - - + + Home Home - - + + Desktop Desktop - - + + Videos Videos - - + + Music Music - - + + Pictures Pictures - - + + Documents Documents - - + + Downloads Downloads - + Open in new tab: Open in new tab: - + Current Directory Current Directory - + Files and folders Files and folders - + Show hidden files Show hidden files - + Show file extensions Show file extensions - + Mix sorting of files and folders Mix sorting of files and folders - + Workspace Workspace - + View View @@ -3228,7 +3228,7 @@ Icon - + Activate existing window when reopening folder @@ -4027,32 +4027,32 @@ Computer - + Computer display items Computer display items - + Hide built-in disks on the Computer page Hide built-in disks on the Computer page - + Hide loop partitions on the Computer page Hide loop partitions on the Computer page - + Show file system on disk icon Show file system on disk icon - + Hide My Directories on the Computer page Hide My Directories on the Computer page - + Hide 3rd party entries on the Computer page Hide 3rd party entries on the Computer page @@ -4640,47 +4640,47 @@ - + Unlock device failed Unlock device failed - + Wrong passphrase - + Mount device failed - + unmount Unmount - + lock - + Encrypt failed - + Cannot %1 device %2 - + Reboot to continue encrypt - + Reboot to finish decrypt @@ -5670,58 +5670,73 @@ dfmplugin_propertydialog::BasicWidget - + Basic info Basic info - + Size Size - + Contains Contains - + Type Type - + Location Location - + Time created Time created - + Time accessed Time accessed - + Time modified Time modified - + Hide this file Hide this file - - + + Image size + + + + + Resolution + + + + + Duration + Duration + + + + %1 item %1 item - + %1 items %1 items @@ -6514,22 +6529,22 @@ dfmplugin_titlebar::SortByButtonPrivate - + Name Name - + Time modified Time modified - + Size Size - + Type Type @@ -7309,12 +7324,12 @@ dfmplugin_vault::VaultEventReceiver - + Vault Vault - + Vault not available because cryfs not installed! Vault not available because cryfs not installed! @@ -7517,12 +7532,12 @@ dfmplugin_workspace::FileView - + Mount error Mount error - + Server login credentials are invalid. Please uninstall and remount @@ -7633,7 +7648,7 @@ filedialog_core::FileDialog - + Save button Save diff --git a/translations/dde-file-manager_bo.ts b/translations/dde-file-manager_bo.ts index f365b43d75..fca91e2aec 100644 --- a/translations/dde-file-manager_bo.ts +++ b/translations/dde-file-manager_bo.ts @@ -106,7 +106,7 @@ FileDialogHandle - + All Files ཡིག་ཆ་ཚང་མ། @@ -148,50 +148,50 @@ QObject - + need authorization to access དབང་ཚད་སྤྲད་ནས་ལྟ་སྤྱོད་བྱེད་པ། - + Can't verify the identity of %1. %1ཡི་ཐོབ་ཐང་ངོས་འཛིན་བྱེད་ཐབས་བྲལ། - + This happens when you log in to a computer the first time. ཁྱོད་རང་ཐེངས་དང་པོར་ཐོ་འཇུག་བྱེད་སྐབས་དྲན་སྐུལ་འདི་མཐོང་སྲིད། - + The identity sent by the remote computer is རྒྱང་སྟོན་གློག་ཀླད་ཀྱིས་བསྐུར་བའི་ཐོབ་ཐང་གི་ཆ་འཕྲིན་ནི། - + If you want to be absolutely sure it is safe to continue, contact the system administrator. མུ་མཐུད་བཀོལ་སྤྱོད་བྱས་ཚེ་བདེ་འཇགས་ཡིན་མིན་གཏན་འཁེལ་བྱེད་དགོས་ན། རྒྱུད་ཁོངས་ཀྱི་དོ་དམ་པར་འབྲེལ་བ་བྱོས། - + System Disk རྒྱུད་ཁོངས་སྡེར། - + Data Disk གཞི་གྲངས་སྡེར། - + Blank %1 Disc འོད་སྡེར་སྟོང་པ་%1  - + @@ -199,17 +199,17 @@ མི་ཤེས་པ། - + %1 Drive སྐུལ་ཆས་%1  - + %1 Encrypted གསང་སྡོམ་%1  - + %1 Volume བམ་པོ་%1  @@ -316,7 +316,7 @@ ཉེར་ཆར་བེད་སྤྱོད་བྱས་པ། - + @@ -324,7 +324,7 @@ རང་འཇུག - + @@ -347,7 +347,7 @@ ཚན་པ་%1 - + Unable to find the original file དམིགས་འབེན་ཡིག་ཆའི་འབྲེལ་མཐུད་རྙེད་ཐབས་བྲལ། @@ -426,7 +426,7 @@ - + Built-in disks ནང་བཅུག་སྒྲིག་ཆས། @@ -450,7 +450,7 @@ - + Loop partitions འཁོར་འཁྱིལ་དབྱེ་ཁུལ། @@ -458,8 +458,8 @@ - - + + Mounted sharing folders བཀལ་ཟིན་པའི་མཉམ་སྤྱོད་ཡིག་ཁུག @@ -482,7 +482,7 @@ - + Mounted partitions and discs འགེལ་ཁུལ་དང་འོད་སྡེར། @@ -872,7 +872,7 @@ - + Cancel button @@ -907,19 +907,19 @@ （འདྲ་དཔེ། %1） - - + + dde-file-manager dde-file-manager - + Files are being processed ཡིག་ཆ་ཐག་གཅོད་བཞིན་པ། - + Bit གནས། @@ -931,7 +931,7 @@ - + Confirm button ཆོག @@ -1748,11 +1748,11 @@ - - - - - + + + + + Clear search history འཚོལ་བཤེར་ལོ་རྒྱུས་གསལ། @@ -1762,17 +1762,17 @@ - + search བཤེར་འཚོལ། - + advanced search མཐོ་རིམ་བཤེར་འཚོལ། - + Are you sure clear search histories? ཁྱེད་རང་གི་འཚོལ་ཞིབ་ལོ་རྒྱུས་གསལ་པོ་ཡིན་ནམ། @@ -3085,120 +3085,120 @@ dfmbase::SettingBackend - + Always open folder in new window རྟག་ཏུ་སྒེའུ་ཁུང་གསར་པའི་ནང་ཡིག་ཁུག་ཁ་འབྱེད་པ། - + Open file: ཡིག་ཆ་ཁ་ཕྱེ། - + Click གཅིག་རྡེབ། - + Double click ཉིས་རྡེབ། - + New window and tab སྒེའུ་ཁུང་གསར་པ་དང་ཤོག་བྱང་གསར་པ། - + Open from default window: སོར་བཞག་སྒེའུ་ཁུང་ནས་ཁ་འབྱེད་པ། - - + + Computer རྩིས་འཁོར། - - + + Home དཀར་ཆག་གཙོ་བོ། - - + + Desktop ཅོག་ངོས། - - + + Videos བརྙན་འཕྲིན། - - + + Music རོལ་མོ། - - + + Pictures པར་རིས། - - + + Documents ཡིག་ཆ། - - + + Downloads ཕབ་ལེན། - + Open in new tab: ཤོག་བྱང་གསར་པ་ནས་ཁ་ཕྱེ། - + Current Directory མིག་སྔའི་དཀར་ཆག - + Files and folders ཡིག་ཆ་དང་དཀར་ཆག - + Show hidden files ཡིབ་པའི་ཡིག་ཆ་མངོན་སྟོན། - + Show file extensions ཡིག་ཆའི་རྒྱ་བསྐྱེད་མིང་མངོན་པ། - + Mix sorting of files and folders ཡིག་ཆ་དང་ཡིག་ཁུག་གོ་རིམ་དཀྲུགས་ནས་སྒྲིག་པ། - + Workspace ལས་ཁུལ། - + View མཐོང་རིས། @@ -3228,7 +3228,7 @@ རྟགས་རིས་མཐོང་རིས། - + Activate existing window when reopening folder སྣོད་ཁ་ཡང་བསྐྱར་ཁ་ཕྱེ་སྐབས་ད་ཡོད་ཀྱི་སྒེའུ་ཁུང་ཤུགས་སྣོན་རྒྱག་པ། @@ -4027,32 +4027,32 @@ རྩིས་འཁོར། - + Computer display items རྩིས་འཁོར་ལས་མངོན་པའི་རྣམ་གྲངས། - + Hide built-in disks on the Computer page རྩིས་འཁོར་གྱི་ལས་ཁུལ་དུ་ནང་བཅུག་སྡུད་སྡེར་ཡིབ་པ། - + Hide loop partitions on the Computer page རྩིས་འཁོར་གྱི་ལས་ཁུལ་དུ་འཁོར་འཁྱིལ་དབྱེ་ཁུལ་ཡིབ་པ། - + Show file system on disk icon སྡུད་སྡེར་གྱི་པར་རིས་ཐོག་ཡིག་ཆའི་རྒྱུད་ཁོངས་ཀྱི་གདོང་འཛར་མངོན་སྟོན། - + Hide My Directories on the Computer page རྩིས་འཁོར་གྱི་ལས་ཁུལ་དུ་ངའི་དཀར་ཆག་ཡིབ་པ། - + Hide 3rd party entries on the Computer page རྩིས་འཁོར་གྱི་ལས་ཁུལ་དུ་ཕྱོགས་གསུམ་པའི་ཚན་པ་ཡིབ་པ། @@ -4640,47 +4640,47 @@ - + Unlock device failed སྒྲིག་ཆས་སྒོ་ལྕགས་ཕྱེ་མ་ཐུབ། - + Wrong passphrase - + Mount device failed - + unmount བཤིག་འདོན། - + lock - + Encrypt failed - + Cannot %1 device %2 - + Reboot to continue encrypt - + Reboot to finish decrypt @@ -5670,58 +5670,73 @@ dfmplugin_propertydialog::BasicWidget - + Basic info གཞི་རྩའི་ཆ་འཕྲིན། - + Size ཆེ་ཆུང་། - + Contains ཡིག་ཆའི་ཁ་གྲངས། - + Type རིགས་གྲས། - + Location གནས་ས། - + Time created བཟོ་བའི་དུས་ཚོད། - + Time accessed ལྟ་སྤྱོད་དུས་ཚོད། - + Time modified བཟོ་བཅོས་དུས་ཚོད། - + Hide this file ཡིག་ཆ་འདི་ཡིབ་པ། - - + + Image size + + + + + Resolution + + + + + Duration + དུས་ཚོད་རིང་ཐུང་། + + + + %1 item ཚན་པ་%1 - + %1 items ཚན་པ་%1 @@ -6514,22 +6529,22 @@ dfmplugin_titlebar::SortByButtonPrivate - + Name མིང་། - + Time modified བཟོ་བཅོས་དུས་ཚོད། - + Size ཆེ་ཆུང་། - + Type རིགས་གྲས། @@ -7308,12 +7323,12 @@ dfmplugin_vault::VaultEventReceiver - + Vault ཉེན་འགོག་སྒམ་ཆུང་། - + Vault not available because cryfs not installed! cryfsསྒྲིག་འཇུག་བྱས་མེད་སྟབས། ཉེན་འགོག་སྒམ་སྤྱོད་མི་རུང་། @@ -7516,12 +7531,12 @@ dfmplugin_workspace::FileView - + Mount error འགེལ་འཇུག་ནོར་བ། - + Server login credentials are invalid. Please uninstall and remount ཞབས་ཞུའི་ནང་འཛུལ་ཡིག་ཆ་ནུས་མེད་ཡིན། བཤུབ་ནས་བསྐྱར་སྒྲིག་བྱེད་རོགས། @@ -7632,7 +7647,7 @@ filedialog_core::FileDialog - + Save button ཉར་ཚགས། diff --git a/translations/dde-file-manager_ug.ts b/translations/dde-file-manager_ug.ts index e00213ec19..ea8b735a03 100644 --- a/translations/dde-file-manager_ug.ts +++ b/translations/dde-file-manager_ug.ts @@ -106,7 +106,7 @@ FileDialogHandle - + All Files بارلىق ھۆججەت @@ -148,50 +148,50 @@ QObject - + need authorization to access زىيارەت قىلىش ئۈچۈن ھوقۇق بېرىش كېرەك - + Can't verify the identity of %1. %1 نىڭ سالاھىيىتىنى دەلىللىگىلى بولمىدى - + This happens when you log in to a computer the first time. تۇنجى كىرگەندە بۇ ئەسكەرتىش چىقىدۇ - + The identity sent by the remote computer is يىراق مۇساپىلىك كومپيۇتېر يوللىغان سالاھىيەت ئۇچۇرى - + If you want to be absolutely sure it is safe to continue, contact the system administrator. مەشغۇلاتنى داۋاملاشتۇرۇشنىڭ بىخەتەر ياكى ئەمەسلىكىنى جەزملەشتۈرمەكچى بولسىڭىز سىستېما باشقۇرغۇچىسى بىلەن ئالاقىلىشىڭ. - + System Disk سىستېما دىسكىسى - + Data Disk سانلىق مەلۇمات دىسكىسى - + Blank %1 Disc قۇرۇق %1 دىسكا - + @@ -199,17 +199,17 @@ نامەلۇم - + %1 Drive %1 قوزغاتقۇچ - + %1 Encrypted %1 شىفىرلانغان - + %1 Volume %1 رايۇن @@ -316,7 +316,7 @@ يېقىندا ئىشلەتكەنلىرىم - + @@ -324,7 +324,7 @@ ئاپتوماتىك ئاغدۇرۇش - + @@ -347,7 +347,7 @@ %1تۈر - + Unable to find the original file ئۇلىنىش نىشان ھۆججىتىنى تاپالمىدى @@ -426,7 +426,7 @@ - + Built-in disks ئىچكى دىسكا @@ -450,7 +450,7 @@ - + Loop partitions ئايلانما رايون @@ -458,8 +458,8 @@ - - + + Mounted sharing folders يۈكلەنگەن ھەمبەھىر ھۆججەت قىسقۇچ بار @@ -482,7 +482,7 @@ - + Mounted partitions and discs يۈكلەنگەن رايون ۋە ئوپتىك دىسكا @@ -872,7 +872,7 @@ - + Cancel button @@ -907,19 +907,19 @@ (قوشۇمچە %1) - - + + dde-file-manager ھۆججەت باشقۇرغۇچ - + Files are being processed ھۆججەتنى بىر تەرەپ قىلىۋاتىدۇ - + Bit بىت @@ -931,7 +931,7 @@ - + Confirm button جەزملەشتۈرۈش @@ -1748,11 +1748,11 @@ - - - - - + + + + + Clear search history ئىزدەش تارىخىنى تازىلاش @@ -1762,17 +1762,17 @@ - + search ئىزدەش - + advanced search ئالىي ئىزدەش - + Are you sure clear search histories? ئىزدەش تارىخىنى ئېنىق بىلەمسىز؟ @@ -3085,120 +3085,120 @@ dfmbase::SettingBackend - + Always open folder in new window ھۆججەت قىسقۇچنى دائىم يىڭى كۆزنەكتە ئېچىش - + Open file: ھۆججەت ئېچىش: - + Click تاق چېكىش - + Double click قوش چېكىش - + New window and tab يېڭى كۆزنەك ۋە يېڭى بەتكۈچ - + Open from default window: سۈكۈتتىكى كۆزنەكتە ئېچىش: - - + + Computer كومپيوتېر - - + + Home باش مۇندەرىجە - - + + Desktop ئۈستەليۈزى - - + + Videos سىن - - + + Music مۇزىكا - - + + Pictures رەسىم - - + + Documents ھۆججەت - - + + Downloads چۈشۈرۈلمىلەر - + Open in new tab: يىڭى بەتكۈچتە ئېچىش: - + Current Directory نۆۋەتتىكى مۇندەرىجە - + Files and folders ھۆججەت ۋە مۇندەرىجە - + Show hidden files يوشۇرۇن ھۆججەتلەر كۆرۈنسۇن - + Show file extensions كېڭەيتىلگەن نامى كۆرۈنسۇن - + Mix sorting of files and folders ھۆججەت بىلەن ھۆججەت قىسقۇچنى ئارىلاش تىزىش - + Workspace خىزمەت رايونى - + View كۆرۈنۈش @@ -3228,7 +3228,7 @@ سىن بەلگە كۆرۈنۈشى - + Activate existing window when reopening folder ھۆججەت قىسقۇچنى ئاچقاندا مەۋجۇت كۆزنەكنى قوزغىتىڭ @@ -4027,32 +4027,32 @@ كومپيوتېر - + Computer display items كومپيۇتېردا كۆرسىتىش تۈرى - + Hide built-in disks on the Computer page كومپيۇتېرنىڭ خىزمەت رايونىدا ئىچكى دىسكىنى يوشۇرۇش - + Hide loop partitions on the Computer page كومپيۇتېرنىڭ خىزمەت رايونىدا ئايلانما دىسكىنى يوشۇرۇش - + Show file system on disk icon دىسكا سىنبەلگىسىدە ھۆججەت سىستېمىسى بەلگىسىنى كۆرسەتسۇن - + Hide My Directories on the Computer page كومپيۇتېرنىڭ خىزمەت رايونىدا مۇندەرىجىنى يوشۇرۇش - + Hide 3rd party entries on the Computer page كومپيۇتېرنىڭ خىزمەت رايونىدا 3-تەرەپ تۈرلىرىنى يوشۇرۇش @@ -4640,47 +4640,47 @@ - + Unlock device failed ئۈسكۈنە قۇلۇپىنى يېشەلمىدى - + Wrong passphrase - + Mount device failed - + unmount ئۆچۈرۈش - + lock - + Encrypt failed - + Cannot %1 device %2 - + Reboot to continue encrypt - + Reboot to finish decrypt @@ -5670,58 +5670,73 @@ dfmplugin_propertydialog::BasicWidget - + Basic info ئاساسى ئۇچۇرى - + Size چوڭلۇقى - + Contains ھۆججەت سانى - + Type تىپى - + Location ئورۇن - + Time created قۇرۇلغان ۋاقتى - + Time accessed زىيارەت ۋاقتى - + Time modified ئۆزگەرتىلگەن ۋاقىت - + Hide this file بۇ ھۆججەتنى يوشۇرۇش - - + + Image size + + + + + Resolution + + + + + Duration + ۋاقتى + + + + %1 item %1تۈر - + %1 items %1تۈر @@ -6514,22 +6529,22 @@ dfmplugin_titlebar::SortByButtonPrivate - + Name نامى - + Time modified ئۆزگەرتىلگەن ۋاقىت - + Size - + Type تىپى @@ -7308,12 +7323,12 @@ dfmplugin_vault::VaultEventReceiver - + Vault بىخەتەرلىك ساندۇقى - + Vault not available because cryfs not installed! cryfs قاچىلانمىغاچقا بىخەتەرلىك ساندۇقىنى ئىشلەتكىلى بولمايدۇ @@ -7516,12 +7531,12 @@ dfmplugin_workspace::FileView - + Mount error يۈكلەش خاتالىقىتاغ خاتالىقى - + Server login credentials are invalid. Please uninstall and remount مۇلازىمېتىرغا كىرىش كىنىشكىسى ئىناۋەتسىز. ئۆچۈرۈۋېتىڭ ۋە قايتا ئۆچۈرۈڭ @@ -7632,7 +7647,7 @@ filedialog_core::FileDialog - + Save button ساقلاش diff --git a/translations/dde-file-manager_zh_CN.ts b/translations/dde-file-manager_zh_CN.ts index ed012d493f..20e76cbcc6 100644 --- a/translations/dde-file-manager_zh_CN.ts +++ b/translations/dde-file-manager_zh_CN.ts @@ -106,7 +106,7 @@ FileDialogHandle - + All Files 所有文件 @@ -148,50 +148,50 @@ QObject - + need authorization to access 需要授权来访问 - + Can't verify the identity of %1. 无法确认%1的身份。 - + This happens when you log in to a computer the first time. 当您首次登录时会看到这个提示。 - + The identity sent by the remote computer is 远程电脑发送的身份信息为 - + If you want to be absolutely sure it is safe to continue, contact the system administrator. 若想确认继续操作是否安全，请联系系统管理员。 - + System Disk 系统盘 - + Data Disk 数据盘 - + Blank %1 Disc 空白%1光盘 - + @@ -199,17 +199,17 @@ 未知 - + %1 Drive %1 驱动器 - + %1 Encrypted %1 已加密 - + %1 Volume %1 卷 @@ -316,7 +316,7 @@ 最近使用 - + @@ -324,7 +324,7 @@ 自动挂载 - + @@ -347,7 +347,7 @@ %1 项 - + Unable to find the original file 无法找到链接目标文件 @@ -426,7 +426,7 @@ - + Built-in disks 内置磁盘 @@ -450,7 +450,7 @@ - + Loop partitions 回环分区 @@ -458,8 +458,8 @@ - - + + Mounted sharing folders 已挂载的共享文件夹 @@ -482,7 +482,7 @@ - + Mounted partitions and discs 挂载分区和光盘 @@ -872,7 +872,7 @@ - + Cancel button @@ -907,19 +907,19 @@ （副本 %1） - - + + dde-file-manager dde-file-manager - + Files are being processed 正在处理文件 - + Bit 位 @@ -931,7 +931,7 @@ - + Confirm button 确 定 @@ -1748,11 +1748,11 @@ - - - - - + + + + + Clear search history 清空搜索记录 @@ -1762,17 +1762,17 @@ 未知 - + search 搜索 - + advanced search 高级搜索 - + Are you sure clear search histories? 确认清空搜索记录？ @@ -3085,120 +3085,120 @@ dfmbase::SettingBackend - + Always open folder in new window 总是在新窗口打开文件夹 - + Open file: 打开文件： - + Click 单击 - + Double click 双击 - + New window and tab 新窗口和新标签 - + Open from default window: 从默认窗口打开： - - + + Computer 计算机 - - + + Home 主目录 - - + + Desktop 桌面 - - + + Videos 视频 - - + + Music 音乐 - - + + Pictures 图片 - - + + Documents 文档 - - + + Downloads 下载 - + Open in new tab: 从新标签打开： - + Current Directory 当前目录 - + Files and folders 文件和目录 - + Show hidden files 显示隐藏文件 - + Show file extensions 显示文件扩展名 - + Mix sorting of files and folders 文件和文件夹混合排序 - + Workspace 工作区 - + View 视图 @@ -3228,7 +3228,7 @@ 图标视图 - + Activate existing window when reopening folder 重复打开文件夹时激活已有窗口 @@ -4027,32 +4027,32 @@ 计算机 - + Computer display items 计算机显示项目 - + Hide built-in disks on the Computer page 计算机工作区隐藏内置磁盘 - + Hide loop partitions on the Computer page 计算机工作区隐藏回环分区 - + Show file system on disk icon 在磁盘图标上显示文件系统标签 - + Hide My Directories on the Computer page 计算机工作区隐藏我的目录 - + Hide 3rd party entries on the Computer page 计算机工作区隐藏第三方项 @@ -4640,47 +4640,47 @@ - + Unlock device failed 解锁设备失败 - + Wrong passphrase - + Mount device failed - + unmount 卸载 - + lock - + Encrypt failed - + Cannot %1 device %2 - + Reboot to continue encrypt - + Reboot to finish decrypt @@ -5670,58 +5670,73 @@ dfmplugin_propertydialog::BasicWidget - + Basic info 基本信息 - + Size 大小 - + Contains 文件个数 - + Type 类型 - + Location 位置 - + Time created 创建时间 - + Time accessed 访问时间 - + Time modified 修改时间 - + Hide this file 隐藏此文件 - - + + Image size + 尺寸 + + + + Resolution + 分辨率 + + + + Duration + 时长 + + + + %1 item %1 项 - + %1 items %1 项 @@ -6514,22 +6529,22 @@ dfmplugin_titlebar::SortByButtonPrivate - + Name 名称 - + Time modified 修改时间 - + Size 大小 - + Type 类型 @@ -7308,12 +7323,12 @@ dfmplugin_vault::VaultEventReceiver - + Vault 保险箱 - + Vault not available because cryfs not installed! 因未安装cryfs，保险箱不可用 @@ -7516,12 +7531,12 @@ dfmplugin_workspace::FileView - + Mount error 挂载错误 - + Server login credentials are invalid. Please uninstall and remount 服务器登录凭证失效，请卸载后重新挂载 @@ -7632,7 +7647,7 @@ filedialog_core::FileDialog - + Save button 保 存 diff --git a/translations/dde-file-manager_zh_HK.ts b/translations/dde-file-manager_zh_HK.ts index d1cb8a0a8a..165b1a7035 100644 --- a/translations/dde-file-manager_zh_HK.ts +++ b/translations/dde-file-manager_zh_HK.ts @@ -106,7 +106,7 @@ FileDialogHandle - + All Files 所有文件 @@ -148,50 +148,50 @@ QObject - + need authorization to access 需要授權來訪問 - + Can't verify the identity of %1. 無法確認%1的身份。 - + This happens when you log in to a computer the first time. 當您首次登錄時會看到這個提示。 - + The identity sent by the remote computer is 遠程電腦發送的身份訊息為 - + If you want to be absolutely sure it is safe to continue, contact the system administrator. 若想確認繼續操作是否安全，請聯繫系統管理員。 - + System Disk 系統盤 - + Data Disk 數據盤 - + Blank %1 Disc 空白%1光盤 - + @@ -199,17 +199,17 @@ 未知 - + %1 Drive %1 驅動器 - + %1 Encrypted %1 已加密 - + %1 Volume %1 卷 @@ -316,7 +316,7 @@ 最近使用 - + @@ -324,7 +324,7 @@ 自動掛載 - + @@ -347,7 +347,7 @@ %1 項 - + Unable to find the original file 無法找到鏈接目標文件 @@ -426,7 +426,7 @@ - + Built-in disks 內置磁盤 @@ -450,7 +450,7 @@ - + Loop partitions 迴環分區 @@ -458,8 +458,8 @@ - - + + Mounted sharing folders 已掛載的共享文件夾 @@ -482,7 +482,7 @@ - + Mounted partitions and discs 掛載分區和光盤 @@ -872,7 +872,7 @@ - + Cancel button @@ -907,19 +907,19 @@ （副本 %1） - - + + dde-file-manager dde-file-manager - + Files are being processed 正在處理文件 - + Bit 位 @@ -931,7 +931,7 @@ - + Confirm button 確 定 @@ -1748,11 +1748,11 @@ - - - - - + + + + + Clear search history @@ -1762,17 +1762,17 @@ - + search 搜索 - + advanced search 高級搜索 - + Are you sure clear search histories? 您確定清除搜尋紀錄嗎？ @@ -3085,120 +3085,120 @@ dfmbase::SettingBackend - + Always open folder in new window 總是在新窗口打開文件夾 - + Open file: 打開文件： - + Click 單擊 - + Double click 雙擊 - + New window and tab 新窗口和新標籤 - + Open from default window: 從默認窗口打開： - - + + Computer 計算機 - - + + Home 主目錄 - - + + Desktop 桌 面 - - + + Videos 影片 - - + + Music 音樂 - - + + Pictures 圖片 - - + + Documents 文檔 - - + + Downloads 下載 - + Open in new tab: 從新標籤打開： - + Current Directory 當前目錄 - + Files and folders 文件和目錄 - + Show hidden files 顯示隱藏文件 - + Show file extensions 顯示文件擴展名 - + Mix sorting of files and folders 文件和文件夾混合排序 - + Workspace 工作區 - + View 視圖 @@ -3228,7 +3228,7 @@ 圖標視圖 - + Activate existing window when reopening folder 重複開啟資料夾時啟用現有視窗 @@ -4027,32 +4027,32 @@ 計算機 - + Computer display items 計算機顯示項目 - + Hide built-in disks on the Computer page 計算機工作區隱藏內置磁盤 - + Hide loop partitions on the Computer page 計算機工作區隱藏迴環分區 - + Show file system on disk icon 在磁盤圖標上顯示文件系統標籤 - + Hide My Directories on the Computer page 計算機工作區隱藏我的目錄 - + Hide 3rd party entries on the Computer page 計算機工作區隱藏第三方項 @@ -4640,47 +4640,47 @@ - + Unlock device failed 解鎖設備失敗 - + Wrong passphrase - + Mount device failed - + unmount 卸載 - + lock - + Encrypt failed - + Cannot %1 device %2 - + Reboot to continue encrypt - + Reboot to finish decrypt @@ -5670,58 +5670,73 @@ dfmplugin_propertydialog::BasicWidget - + Basic info 基本訊息 - + Size 大小 - + Contains 文件個數 - + Type 類型 - + Location 位置 - + Time created 創建時間 - + Time accessed 訪問時間 - + Time modified 修改時間 - + Hide this file 隱藏此文件 - - + + Image size + + + + + Resolution + + + + + Duration + 時長 + + + + %1 item %1 項 - + %1 items %1 項 @@ -6514,22 +6529,22 @@ dfmplugin_titlebar::SortByButtonPrivate - + Name 名稱 - + Time modified 修改時間 - + Size 大小 - + Type 類型 @@ -7308,12 +7323,12 @@ dfmplugin_vault::VaultEventReceiver - + Vault 保險箱 - + Vault not available because cryfs not installed! 因未安裝cryfs，保險箱不可用 @@ -7516,12 +7531,12 @@ dfmplugin_workspace::FileView - + Mount error 掛載錯誤 - + Server login credentials are invalid. Please uninstall and remount 伺服器登入憑證無效。請卸載並重新安裝 @@ -7632,7 +7647,7 @@ filedialog_core::FileDialog - + Save button 保 存 diff --git a/translations/dde-file-manager_zh_TW.ts b/translations/dde-file-manager_zh_TW.ts index 3d6775359c..031a34a06f 100644 --- a/translations/dde-file-manager_zh_TW.ts +++ b/translations/dde-file-manager_zh_TW.ts @@ -106,7 +106,7 @@ FileDialogHandle - + All Files 所有文件 @@ -148,50 +148,50 @@ QObject - + need authorization to access 需要授權來訪問 - + Can't verify the identity of %1. 無法確認%1的身份。 - + This happens when you log in to a computer the first time. 當您首次登入時會看到這個提示。 - + The identity sent by the remote computer is 遠端電腦發送的身份訊息為 - + If you want to be absolutely sure it is safe to continue, contact the system administrator. 若想確認繼續操作是否安全，請聯絡系統管理員。 - + System Disk 系統盤 - + Data Disk 資料盤 - + Blank %1 Disc 空白%1光碟 - + @@ -199,17 +199,17 @@ 未知 - + %1 Drive %1 驅動器 - + %1 Encrypted %1 已加密 - + %1 Volume %1 卷 @@ -316,7 +316,7 @@ 最近使用 - + @@ -324,7 +324,7 @@ 自動掛載 - + @@ -347,7 +347,7 @@ %1 項 - + Unable to find the original file 無法找到連結目標文件 @@ -426,7 +426,7 @@ - + Built-in disks 內建磁碟 @@ -450,7 +450,7 @@ - + Loop partitions 迴環分區 @@ -458,8 +458,8 @@ - - + + Mounted sharing folders 已掛載的共享資料夾 @@ -482,7 +482,7 @@ - + Mounted partitions and discs 掛載分區和光碟 @@ -872,7 +872,7 @@ - + Cancel button @@ -907,19 +907,19 @@ （副本 %1） - - + + dde-file-manager dde-file-manager - + Files are being processed 正在處理文件 - + Bit 位 @@ -931,7 +931,7 @@ - + Confirm button 確 定 @@ -1748,11 +1748,11 @@ - - - - - + + + + + Clear search history 清除搜尋紀錄 @@ -1762,17 +1762,17 @@ - + search 搜尋 - + advanced search 進階搜尋 - + Are you sure clear search histories? 您確定清除搜尋紀錄嗎？ @@ -3085,120 +3085,120 @@ dfmbase::SettingBackend - + Always open folder in new window 永遠在新視窗打開 - + Open file: 文件打開方式： - + Click 單擊 - + Double click 雙擊 - + New window and tab 新視窗與新分頁 - + Open from default window: 視窗預設打開： - - + + Computer 電腦 - - + + Home 主資料夾 - - + + Desktop 顯示桌面 - - + + Videos 我的影片 - - + + Music 音樂 - - + + Pictures 圖片 - - + + Documents 文件 - - + + Downloads 下載 - + Open in new tab: 從新分頁打開： - + Current Directory 目前目錄 - + Files and folders 文件和目錄 - + Show hidden files 顯示隱藏檔案 - + Show file extensions 顯示文件副檔名 - + Mix sorting of files and folders 文件和資料夾混合排序 - + Workspace 工作區 - + View 檢視 @@ -3228,7 +3228,7 @@ 圖示顯示 - + Activate existing window when reopening folder 重複開啟資料夾時啟用現有視窗 @@ -4027,32 +4027,32 @@ 電腦 - + Computer display items 電腦顯示項目 - + Hide built-in disks on the Computer page 電腦工作區隱藏內建磁碟 - + Hide loop partitions on the Computer page 電腦工作區隱藏迴環分區 - + Show file system on disk icon 在磁碟圖示上顯示文件系統標籤 - + Hide My Directories on the Computer page 電腦工作區隱藏我的目錄 - + Hide 3rd party entries on the Computer page 電腦工作區隱藏第三方項 @@ -4640,47 +4640,47 @@ - + Unlock device failed 解鎖裝置失敗 - + Wrong passphrase - + Mount device failed - + unmount 移除 - + lock - + Encrypt failed - + Cannot %1 device %2 - + Reboot to continue encrypt - + Reboot to finish decrypt @@ -5670,58 +5670,73 @@ dfmplugin_propertydialog::BasicWidget - + Basic info 基本訊息 - + Size 大小 - + Contains 文件個數 - + Type 類型 - + Location 位置 - + Time created 建立時間 - + Time accessed 訪問時間 - + Time modified 修改時間 - + Hide this file 隱藏此文件 - - + + Image size + + + + + Resolution + + + + + Duration + 時長 + + + + %1 item %1 項 - + %1 items %1 項 @@ -6514,22 +6529,22 @@ dfmplugin_titlebar::SortByButtonPrivate - + Name - + Time modified 修改時間 - + Size - + Type @@ -7308,12 +7323,12 @@ dfmplugin_vault::VaultEventReceiver - + Vault 保險箱 - + Vault not available because cryfs not installed! 因未安裝cryfs，保險箱不可用 @@ -7516,12 +7531,12 @@ dfmplugin_workspace::FileView - + Mount error 掛載錯誤 - + Server login credentials are invalid. Please uninstall and remount 伺服器登入憑證無效。請卸載並重新安裝 @@ -7632,7 +7647,7 @@ filedialog_core::FileDialog - + Save button 儲 存 From f1e428a7ee6a9e279306edfd2580e1c1ec00cf95 Mon Sep 17 00:00:00 2001 From: Lighto-Ku Date: Thu, 2 Jan 2025 10:07:49 +0800 Subject: [PATCH 3/4] fix: correct config key for restore view mode Change the config key from "03_restore_view_mode" to "04_restore_view_mode" to match its path name in LV2_GROUP_VIEW ".04_restore_view_mode", maintaining consistency in the configuration system. Log: fix settings issue Bug: https://pms.uniontech.com/bug-view-298263.html --- src/dfm-base/base/configs/settingbackend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dfm-base/base/configs/settingbackend.cpp b/src/dfm-base/base/configs/settingbackend.cpp index 991b932df3..2a5ed0b005 100644 --- a/src/dfm-base/base/configs/settingbackend.cpp +++ b/src/dfm-base/base/configs/settingbackend.cpp @@ -366,7 +366,7 @@ void SettingBackend::initWorkspaceSettingConfig() { "keys", viewModeKeys } }, 1); ins->addConfig(LV2_GROUP_VIEW ".04_restore_view_mode", - { { "key", "03_restore_view_mode" }, + { { "key", "04_restore_view_mode" }, { "desc", tr("Restore default view mode for all directories") }, { "text", tr("Restore default view mode") }, { "type", "pushButton" }, From 4ddabf6fa2faf21c5d1072ff2d3387af449e0842 Mon Sep 17 00:00:00 2001 From: Lighto-Ku Date: Thu, 2 Jan 2025 13:27:31 +0800 Subject: [PATCH 4/4] fix: optimize filename display height in icon view - Limit filename display height to normal height (2 lines) when item is not selected or not a single selection target - Update Chinese comments to English for better code readability - Keep maximum height display for the last item when it's single selected to ensure proper scrollbar appearance Log: optimize filename display Bug: https://pms.uniontech.com/bug-view-298351.html --- .../dfmplugin-workspace/views/iconitemdelegate.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/plugins/filemanager/dfmplugin-workspace/views/iconitemdelegate.cpp b/src/plugins/filemanager/dfmplugin-workspace/views/iconitemdelegate.cpp index 7b1c80b86d..f733cae384 100644 --- a/src/plugins/filemanager/dfmplugin-workspace/views/iconitemdelegate.cpp +++ b/src/plugins/filemanager/dfmplugin-workspace/views/iconitemdelegate.cpp @@ -647,6 +647,15 @@ void IconItemDelegate::paintItemFileName(QPainter *painter, QRectF iconRect, QPa layout->setAttribute(ElideTextLayout::kBackgroundRadius, kIconModeRectRadius); } + // If the filename is very long, sizeHint() will set the height of the last item to maximum + // to make the scrollbar appear on the right side. + // However, when the last item is not a single selection target, + // we don't need to draw the filename at maximum height + if (!isSelected || !singleSelected) { + qreal normalHeight = lineHeight * 2; + labelRect.setHeight(labelRect.height() > normalHeight ? normalHeight : labelRect.height()); + } + layout->layout(labelRect, opt.textElideMode, painter, background); } @@ -671,7 +680,8 @@ QSize IconItemDelegate::sizeHint(const QStyleOptionViewItem &, const QModelIndex int lineHeight = UniversalUtils::getTextLineHeight(index, parent()->parent()->fontMetrics()); size.setHeight(size.height() + 2 * lineHeight); - // 如果有一个选中，名称显示很长时，最后一个index时设置item的高度为最多，右边才会出现滑动块 + // If there is one selection and the name is very long, + // set the item height to maximum for the last index to make the scrollbar appear on the right side if (index.isValid() && parent()->isLastIndex(index) && d->expandedItem && d->expandedIndex.isValid() && d->expandedItem->isVisible()) { d->expandedItem->setIconHeight(parent()->parent()->iconSize().height());