Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Allow opening duplicate clicked folders within the same process #1965

Merged
merged 1 commit into from
May 9, 2024

Conversation

liyigang1
Copy link
Contributor

@liyigang1 liyigang1 commented Apr 29, 2024

Allow opening duplicate clicked folders within the same process

Log: Allow opening duplicate clicked folders within the same process
Task: https://pms.uniontech.com/task-view-341709.html

@liyigang1 liyigang1 marked this pull request as draft April 29, 2024 09:20
@deepin-bot
Copy link
Contributor

deepin-bot bot commented Apr 30, 2024

TAG Bot

New tag: 6.0.49
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #1967

@liyigang1 liyigang1 changed the title feat: 【 ICBC Customized Task Round to Main Line 】 Allow opening duplicate clicked folders within the same process feat: Allow opening duplicate clicked folders within the same process May 6, 2024
@liyigang1 liyigang1 force-pushed the fix-2 branch 3 times, most recently from 7a16f8a to 6be5f79 Compare May 7, 2024 06:26
@liyigang1 liyigang1 marked this pull request as ready for review May 7, 2024 06:46
@liyigang1 liyigang1 force-pushed the fix-2 branch 2 times, most recently from d41751a to b758af5 Compare May 7, 2024 07:15
@@ -32,7 +32,7 @@ class Application : public QObject
kUrlOfNewTab, // default path to new tabs
kThemeName,
kFileAndDirMixedSort, // Mixed sorting of ordinary files and directories
kListItemExpandable // Item expandable as tree in FileView with list view mode
kListItemExpandable, // Item expandable as tree in FileView with list view mode
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不需要逗号

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改

@@ -199,6 +199,17 @@
"description[zh_CN]": "日志规则",
"permissions": "readwrite",
"visibility": "public"
},
"dfm.open.folder.in.a.separate.process": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

名称太长了

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

写到org.deepin.dde.file-manager.view.json去更合适

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改

@liyigang1 liyigang1 force-pushed the fix-2 branch 3 times, most recently from 544f792 to 8a416bc Compare May 8, 2024 01:05
src/apps/dde-file-manager/commandparser.cpp Show resolved Hide resolved
kOpenfolderwindowsinaseparateprocess, false).toBool();

auto target = item->targetUrl();
if (flag && FileManagerWindowsManager::instance().containsCurrentUrl(target, window())) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果一个窗口有多个tab,其中一个tab的url和当前tab的url一样,会什么效果

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

需求说的不管tab页,只需要验证当前的显示的url

Allow opening duplicate clicked folders within the same process

Log: Allow opening duplicate clicked folders within the same process
Task: https://pms.uniontech.com/task-view-341709.html
@deepin-ci-robot
Copy link

deepin pr auto review

- 修正 `Open from default window:` 中文翻譯,原為 `開啟預設的視窗:` 更正為 `從預設視窗開檔:`
- 修正 `Compute file preview` 中文翻譯,原為 `計算文件預覽` 更正為 `計算文件預覽`
- 修正 `The remote environment shows thumbnail previews` 中文翻譯,原為 `遠端環境顯示縮圖預覽` 更正為 `遠端環境顯示縮圖預覽`
- 修正 `Use the file chooser dialog of File Manager` 中文翻譯,原為 `使用文件管理器的選擇文件對話框` 更正為 `使用文件管理器的文件選擇对话框`
- 修正 `Ask for my confirmation when deleting files` 中文翻譯,原為 `在删除文件时要求确认` 更正为 `在删除文件时要求确认`
- 修正 `Set as wallpaper` 中文翻譯,原為 `設定桌布` 更正为 `设置桌面背景`
- 修正 `Advanced` 中文翻譯,原為 `進階` 更正为 `高级`
- 修正 `Mount` 中文翻譯,原為 `挂载` 更正为 `挂载`
- 修正 `Auto mount` 中文翻譯,原为 `自动挂载` 更正为 `自动挂载`
- 修正 `Open after auto mount` 中文翻譯,原为 `自动挂载后打开` 更正为 `自动挂载后打开文件`
- 修正 `Merge the entries of Samba shared folders` 中文翻譯,原為 `合并Samba共享目录入口` 更正为 `合并Samba共享目录的入口`
- 修正 `Switching the entry display may lead to failed mounting` 中文翻譯,原為 `切換入口顯示模式可能会导致挂载状态失效` 更正为 `切换入口显示模式可能会导致挂载状态失效`
- 修正 `Use the file chooser dialog of File Manager` 中文翻譯,原為 `使用文件管理器的文件选择对话框` 更正为 `使用文件管理器的选择文件对话框`
- 修正 `Quick access` 中文翻譯,原為 `快捷访问` 更正为 `快速访问`
- 修正 `Partitions` 中文翻譯,原為 `分区` 更正为 `分区`
- 修正 `Network` 中文翻譯,原為 `网络` 更正为 `网络`
- 修正 `Tag` 中文翻譯,原為 `标签` 更正为 `标签`
- 修正 `Other` 中文翻譯,原為 `其他` 更正为 `其他`
- 修正 `Unknown Group` 中文翻譯,原為 `未知组` 更正为 `未知组`
- 修正 `Search or input address` 中文翻譯,原為 `搜索或输入地址` 更正为 `搜索或输入地址`
- 修正 `Are you sure clear search histories?` 中文翻譯,原為 `你确定要清除搜索历史吗?` 更正为 `确定要清除搜索历史吗?`
- 修正 `Cancel` 中文翻譯,原為 `取消` 更正为 `取消`
- 修正 `Confirm` 中文翻譯,原為 `确定` 更正为 `确定`

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Johnson-zs, liyigang1

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@liyigang1
Copy link
Contributor Author

/merge

@deepin-bot deepin-bot bot merged commit c7556f3 into linuxdeepin:master May 9, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants