Merge desktop-develop into develop - #202
Merged
Merged
Conversation
Re-arrange the settings page from stacked groups into six tabs so configuration is grouped by user intent instead of one long list. Reuses existing settings rows and the real local bridge UI under 接入; experimental transports (iroh/relay/P2P) honestly show 未启用. No new IPC, UI library or state management — pure in-component re-layout. Co-authored-by: Cursor <cursoragent@cursor.com>
- Receive page now orders by what needs the user: 待确认传输 → 配对请求 → 待处理资料 → 等待接收 → 最近完成. Drops the receive-config block (目录/端口/策略) that now lives in Settings·收件, and folds network diagnostics into the 等待接收 note instead of a separate facts table. - Transfers page groups records into 需要处理 / 进行中 / 历史 and surfaces failed/cancelled main actions (继续发送 / 备用码 / 删除) inline without expanding. - Devices page reorders to 附近设备 → 已信任设备 → 选中设备详情, adding a detail block with real fields only (平台/地址/指纹/信任/在线) plus send/pair/forget actions. Pure in-component re-layout: no new IPC, UI library or state management. Co-authored-by: Cursor <cursoragent@cursor.com>
# Conflicts: # CONTRIBUTING.md # docs/DEVELOPMENT.md
# Conflicts: # CONTRIBUTING.md # docs/DEVELOPMENT.md
补充NekoDrop桌面客户端三栏式工具化设计方案文档 新增图标、侧边栏、设备管理等全套桌面UI基础组件
- 统一明暗模式按钮图标，简化TitleBar的macOS检测逻辑 - 移除TransfersManager中的统计仪表盘组件 - 优化TransferZone的终端日志与命令处理 - 修复设备相关字段的空值兜底处理 - 调整TransferZone的页签显示逻辑
- 提取 platformDisplay 工具统一处理平台徽章的图标、文案与emoji展示 - 新增多组图标并更新全局图标库使用，替换旧的外观图标为sun/moon - 清理LeftSidebar、SettingsManager等组件的冗余代码与重复逻辑 - 优化UI文案措辞，简化设置项与页面提示文本 - 为未实现的协作、组网、状态同步页签添加即将推出的占位组件
- 新增 `awaiting_approval` 传输阶段的支持与对应测试用例 - 为桌面标题栏添加窗口拖动功能，禁止内部交互控件参与拖动 - 优化TCP JSON帧读取的错误处理，添加连接中断的友好提示文案 - 动态更新发送按钮文案以反映当前传输状态 - 重构传输进度面板，复用状态判断逻辑，新增状态提示文本并仅在活跃传输时显示取消按钮
# Conflicts: # apps/desktop/src-tauri/src/commands/mod.rs # apps/desktop/src/App.tsx # apps/desktop/src/styles.css
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
1 participant
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.
Summary
Verification