Repository navigation
Conversation
一键整理 - 托盘「整理桌面…」、设置「一键整理桌面」/文件格子「整理桌面」按钮(ISettingsAppActions in-process 实现)、映射格子空白处「一键整理」、标题栏「…」「一键整理桌面」(原「重新整理桌面」) 直接执行整理,不再打开预览(无 待整理/留在桌面 区分);完成后发通知(移动模式带「撤销」)。 - 按全局「整理方式」:移动到格子 = 执行预览的默认方案(同一事务/历史/撤销); 只映射 = 先清除所有「放回桌面」标记,文件夹/大文件也一并映射,项优先进同类映射格子, 其余按规划分组,最后按「一键整理」规则兜底。 - 有中断待恢复的整理、预览窗口已打开或宿主未就绪时改为打开预览。 - 旧预览保留为「整理预览…」:托盘菜单、映射格子空白处菜单、标题栏「…」菜单。 - 自动归类新文件仍跳过「放回桌面」项(不变)。 重复「其他」 - 原因:上次整理创建的「其他」格子规则只含当时的分类([Other]);单个项目的分类(如 1 个视频/Media) 被并入「其他」桶后匹配不到规则,规划器就又提议「新建'其他'」。 - 修复:DesktopOrganizationCategoryReuse —— 新建桶前先复用规则含该分类的格子(尊重排除扩展名), 其次复用同名格子;映射分组也按分类、再按名称复用已有映射格子(ApplyGroupsAsync)。 上游文件改动:App.Tray.cs 2 行、InProcessSettingsAppActions.cs 1 行、DesktopOrganizationPlanner.cs 1 块。 不改 Strings/*.json(文案内联在 ForkOrganizeModeText)。新增 ForkOneClickOrganizeTests。
GOXF
added a commit
that referenced
this pull request
Nov 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
一键整理桌面
点「整理桌面」直接完成,不再弹出预览、不再区分 待整理 / 留在桌面。
改为一键执行的入口:
InProcessSettingsAppActions.ShowDesktopOrganizationWindow→OrganizeDesktopOneClick,IPC 不变)按全局「整理方式」(fork-organize.json):
完成后发通知(移动模式带「撤销」)。有中断待恢复的整理、预览窗口已打开、宿主未就绪时改为打开预览。
旧预览保留为「整理预览…」:托盘菜单、映射格子空白处菜单、标题栏「…」菜单。
自动归类新文件仍尊重「放回桌面」(不变)。
重复「其他」
原因:上次整理创建的「其他」格子,其规则只含当时收到的分类([Other])。之后某个只有 1 项的分类(如 1 个视频 = Media)被规划器并入「其他」桶,匹配不到该规则,于是又提议「新建'其他'」。
修复:
DesktopOrganizationCategoryReuse(DesktopOrganizationPlanner.CreatePlan中一处调用)—— 新建前先复用规则包含该分类的格子(尊重排除扩展名),其次复用同名格子;映射分组同样先按分类、再按名称复用已有映射格子(ApplyGroupsAsync)。限制:只映射模式下,名为「其他」的真实文件夹格子无法接收映射项,仍会与映射「其他」并存(需手动合并)。
约束
ForkOrganizeModeText);未新增 bindable property;Services 不引用 App.Current。App.Tray.cs2 行、InProcessSettingsAppActions.cs1 行、DesktopOrganizationPlanner.cs1 块。ForkOneClickOrganizeTests,更新MappedOrganizeReorganizeTests。