比较提交

...
共修改 22 个文件,包含 417 行新增和 105 行删除

没有与搜索条件相匹配的文件

+16
查看文件
@@ -0,0 +1,16 @@
大鱼调色 1.8.2(59)公测
高级色彩管理移入顶部“颜色设置”按钮,默认收起。关闭后不留空白,调色模块直接上移;展开/收起不改参数、不增加撤销项。详细说明移入工具提示。
新增默认黑金渐变主题:黑色与深炭色渐变背景、亮金文字、柔和静态光晕及金色细边。保留五种原有配色及其编号;明确保存的主题偏好保留,可随时切换到黑金。系统增加对比度或减少透明度时去掉文字光晕。
默认继续原有色彩流程;已保存的 nil/v2/v3 工程及完整预设保持原处理。相机 Log、工作空间和输出转换逻辑沿用 1.8.1 修正,没有更改渲染算法或模板默认。
本版验证与正式签名、公证、宿主和安装包结果见 verification/Delivery.json、HostCompactUI1.8.2.json、InstalledSelfTest.json、Package.json 和 Release.json。本轮独立替换正式 APP 并验收,PKG 展开验包,不重复执行系统安装脚本。
595 项原生检查、FCP 中六主题切换/设置反复开关、nil 原流程保持和 v3 完整预设重开逐字节一致通过。独立远程源码重建通过同样595项检查;8个依赖源包按锁定摘要验证,复用已验证的静态运行时缓存。
安装包:大鱼调色-1.8.2.pkg
字节数:43006067
SHA-256:cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded
实际编译源码:da03d16c7efa87a5d230467334ec73f9a3a12e54
+9 -3
查看文件
@@ -1,8 +1,14 @@
# 大鱼调色
原生 FxPlug 4 调色器,当前公测版本 **1.8.1(57)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
原生 FxPlug 4 调色器,当前公测版本 **1.8.2(59)**。唯一安装位置为 `/Library/Plug-Ins/FxPlug/大鱼调色.app`;Final Cut Pro 中从“效果 → 大鱼调色”添加。
1.8.1 修正 1.8.0 固定 ACEScct 接管并隐藏一级 CST 的设计问题,恢复原有输入、工作曲线/色域与输出选择,并将主输出放到一级层和印片之后。在参数顶部明确选择“一级 CST · 延后输出(推荐)”启用修正流程。模板与插件注册缺省保持原有流程,保护已有未声明 CMS 的工程。1.8.0 ACES 流程作为兼容方式保留,不自动修改已保存画面。
1.8.2 将高级色彩管理收进顶部“颜色设置”按钮,默认收起且不占调色区域;展开和收起只改变显示,不写调色参数、不产生撤销项。新增“黑金渐变”主题:黑色与深炭色背景、亮金文字和小范围静态光晕;未设置主题时默认黑金,已明确保存的五种旧主题继续保留,可随时切换。增加对比度或减少透明度时不绘制文字光晕。窄栏使用两排操作按钮。
默认色彩流程仍为“原有流程”,已保存的 v2/v3 工程继续使用原设置。下文的高级色彩流程均从“颜色设置”展开选择。色轮与通道曲线保留实际色相,界面主题不改变图像颜色。
[1.8.2 安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.2-blackgold-20261104);595 项原生检查与正式 FCP 验收见[界面验收记录](verification/HostCompactUI1.8.2.json)。
1.8.1 修正 1.8.0 固定 ACEScct 接管并隐藏一级 CST 的设计问题,恢复原有输入、工作曲线/色域与输出选择,并将主输出放到一级层和印片之后。打开顶部“颜色设置”,明确选择“一级 CST · 延后输出”启用修正流程。模板与插件注册缺省保持原有流程,保护已有未声明 CMS 的工程。1.8.0 ACES 流程作为兼容方式保留,不自动修改已保存画面。
[1.8.1 安装包 Release](https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.1-cst-correction-20261104);[修正约定与验证边界](research/cms-correction-20261104/design.md)。1.8.0 的研究来源与历史实施见[只读调查](research/cms-audit-20261103/report.md)。
@@ -22,7 +28,7 @@
## 1.8.0 兼容色彩管理
在调色参数顶部选择管理方式;色彩管理独立于可删除的调色模块。旧工程与 v1–v6 预设缺省仍走原有渲染,不自动改变原画面。新增一级层默认关闭额外色调映射,旧层明确保存的开关保留。
打开顶部“颜色设置”选择管理方式;色彩管理独立于可删除的调色模块。旧工程与 v1–v6 预设缺省仍走原有渲染,不自动改变原画面。新增一级层默认关闭额外色调映射,旧层明确保存的开关保留。
- **跟随 FCP**:按实际源/目标颜色配置转换,不重复还原相机,不加显示映射。内部一级工作空间固定为 ACEScct/AP1。
- **相机编码 → ACES**:明确指定输入曲线/原色,再经过一次所选输出变换。此方式保留旧版 sRGB 码值载体约定,使用前须关闭上游相机还原和重复的颜色符合。
+15 -1
查看文件
@@ -1,6 +1,20 @@
# 1.8.2(59)黑金界面与高级颜色设置
仓库 https://dayu.media/git/dayu/dayu-color.git,main。实际编译源码 da03d16c7efa87a5d230467334ec73f9a3a12e54;发行标签 v1.8.2-blackgold-20261104。标签包括最终 Package.json;发布后的 Release.json 和最后恢复/清理核验保存在后续 main,标签中的旧 Release.json 属于上版历史。本版安装包以本版 Release 页面和后续 main 的发布记录为准。
高级颜色设置默认收起,展开/收起不写参数。未保存主题偏好时使用黑金 ID5;原主题 ID0–4 及明确保存的选择保留。渲染实现、模板与色彩流程缺省不变,nil/v2/v3 状态保持。候选58的黑金“添加模块”文字漏绘已在实机发现并回滚,未发布安装包;正式版59修复并增加像素绘制检查。
595 项正式安装版检查、FCP 12.4 六主题/10次开关、原 nil 工程保持、8590字节完整 v3 预设在更新与冷重开前后逐字节一致通过。独立远程克隆 Release 重建也通过595项检查,8个依赖归档的大小和 SHA-256 校验通过;复用已验证静态依赖缓存,不代表全依赖冷构建。详见 verification/HostCompactUI1.8.2.json、CompactUIRecovery1.8.2.json。
唯一正式 APP:/Library/Plug-Ins/FxPlug/大鱼调色.app,Bundle ID:com.dayu.color。恢复依赖、Xcode 27.1/FxPlug SDK4.3.5、构建/签名/公证步骤沿用下文;私钥与凭据须独立恢复。正式 APP 已独立替换并在宿主验收;PKG 通过20项展开验包,本轮没有重新运行系统安装脚本。
安装包:../发行包/大鱼调色-1.8.2.pkg,43006067 字节,SHA-256:cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded。网站文章与自动更新后端未改。
---
# 1.8.1(57)CST 修正交付
实际编译源码:`059245858035e74f78bd669ef25913408d07d235`。仓库:`https://dayu.media/git/dayu/dayu-color.git`;版本标签为 `v1.8.1-cst-correction-20261104`。标签包含最终 `verification/Package.json`;Release 发布记录在完成上传/下载校验后提交到后续 main。标签快照中的旧 `Release.json` 属于上一版历史,不能当作本版的安装包记录;本版以版本页面及后续 main 的发布校验为准。
实际编译源码:`059245858035e74f78bd669ef25913408d07d235`。仓库:`https://dayu.media/git/dayu/dayu-color.git`;版本标签为 `v1.8.1-cst-correction-20261104`,标签提交 `d0eadccc29782aa30301fff6dbf71c84b5758f59`。Release 382/附件26已发布,正式附件完整下载核验通过:42,999,475字节,SHA-256 `f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd`。标签包含最终 `verification/Package.json`;Release 发布记录在完成上传/下载校验后提交到后续 main。标签快照中的旧 `Release.json` 属于上一版历史,不能当作本版的安装包记录;本版以版本页面及后续 main 的发布校验为准。
正式位置 `/Library/Plug-Ins/FxPlug/大鱼调色.app`,Bundle ID `com.dayu.color`。启用修正流程需在顶部选择“一级 CST · 延后输出(推荐)”;旧 nil/v2 工程与模板缺省保留。候选56自动模板切换在实际宿主验收中发现会影响旧 nil 工程,已回滚,未发布安装包。
+9
查看文件
@@ -0,0 +1,9 @@
# 1.8.2:收起高级颜色设置,新增黑金主题
基线:12fdde332f3174b2e948ad67df1d1f30aee2d69c。默认色彩流程继续为 nil/原有流程;保留已保存的 v2/v3 设置。此任务只改变检查器的展示和主题。
采用顶部四个操作按钮(保存、载入、导出、颜色设置),避免在已有六枚主题色块旁挤入图标。颜色设置以单一界面布尔状态控制原位展开/收起,首次和重开默认收起,不占参数区高度;打开/关闭不写调色状态,不制造撤销项。说明缩短,完整条件放入工具提示。
保留原主题 ID0–4,追加黑金 ID5,未设置偏好的默认值改为5。现有明确主题选择保持;本机验收选择新主题。黑色/炭黑不透明渐变背景、金色边线和亮金文字;文字只附加小范围静态光晕,增加对比度或减少透明度时去掉光晕。真实色轮、曲线通道和媒体图像保留语义颜色。
沿用 AppKit 与 FxPlug 原位视图,无新浮动窗口、计时器、动画或渲染算法。280窄栏和正常栏分别布局,按钮保持可读。验证默认收起、反复开关、键盘/辅助功能名称、窄栏、六种主题、减少装饰分支及旧工程参数保持;正式签名、公证、安装和 FCP 视觉验收后交付 PKG/Release。
+8 -8
查看文件
@@ -1,11 +1,11 @@
{
"status": "draft-download-required",
"releaseID": 381,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.0-cms-20261103",
"tag": "v1.8.0-cms-20261103",
"commit": "a5a2bddeb361aac66899c5939671122075a6cffa",
"assetID": 25,
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.0-cms-20261103/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.0.pkg",
"bytes": 42851034,
"sha256": "fd59203d387122e768090a97851daf3bd7c07193a8073b9497a10c05d5fd6c42"
"releaseID": 382,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.1-cst-correction-20261104",
"tag": "v1.8.1-cst-correction-20261104",
"commit": "d0eadccc29782aa30301fff6dbf71c84b5758f59",
"assetID": 26,
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.1-cst-correction-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.1.pkg",
"bytes": 42999475,
"sha256": "f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd"
}
+17
查看文件
@@ -0,0 +1,17 @@
{
"status": "installed-awaiting-host-verification",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.8.2",
"build": "58",
"team": "B3W25FX5H5",
"notaryID": "1d8097bd-1e68-4070-a7e4-c0381382b1f6",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "870f0064c2cdf76d1025832512120af8d76f6840",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-86f5ddc4ffcc4e5b97507888122c29b3.app",
"hostIssue": "Black-gold pull-down menu selectedItem is nil; missing Add Module caption. Not accepted or published; rolled back to verified 1.8.1 before rebuilding."
}
+38
查看文件
@@ -0,0 +1,38 @@
{
"compiledSource": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
"remote": "https://dayu.media/git/dayu/dayu-color.git",
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-1.8.2",
"fsck": "full strict passed",
"changedSourceFilesIdentical": [
"Packaging/Release-1.8.2.md",
"README.md",
"research/ui-blackgold-20261104/brief.md",
"verification/CompactUICandidate58.json",
"大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h",
"大鱼调色/Plugin/DYDiagnostics.mm",
"大鱼调色/Plugin/DYInspector.mm",
"大鱼调色/Plugin/DYManagedColorPanel.mm",
"大鱼调色/Plugin/DYTheme.h",
"大鱼调色/Plugin/DYTheme.mm",
"大鱼调色/Plugin/Info.plist",
"大鱼调色/Wrapper Application/Info.plist"
],
"dependencyArchivesVerified": [
"OpenColorIO-2.5.2.tar.gz",
"expat-2.7.2.tar.gz",
"yaml-cpp-0.8.0.tar.gz",
"Imath-3.2.1.tar.gz",
"pystring-1.1.4.tar.gz",
"minizip-ng-4.0.10.tar.gz",
"zlib-1.3.1.tar.gz",
"sse2neon-227cc413fb2d50b2a10073087be96b59d5364aea.tar.gz"
],
"scope": "Independent remote checkout; build and formal host checks recorded separately.",
"passResult": true,
"independentBuild": "Release Wrapper Application",
"nativeChecks": 595,
"nativeChecksPassed": true,
"dependenciesBuild": "Eight archived dependencies verified; reuse verified static runtime cache, not a full dependency cold build.",
"generatedCopiesNeverShown": true,
"generatedRegistrationRemoved": true
}
+5 -5
查看文件
@@ -2,15 +2,15 @@
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.8.1",
"build": "57",
"version": "1.8.2",
"build": "59",
"team": "B3W25FX5H5",
"notaryID": "cdc68483-c0ef-4b1e-a3a3-8a3eb621afdd",
"notaryID": "11fcf84b-680e-415e-87d2-bcf4ee8cdb78",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "059245858035e74f78bd669ef25913408d07d235",
"sourceCommit": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
"hostVerification": "verification/HostPrimaryCST1.8.1.json"
"hostVerification": "verification/HostCompactUI1.8.2.json"
}
+39
查看文件
@@ -0,0 +1,39 @@
{
"version": "1.8.2",
"build": "59",
"host": "Final Cut Pro 12.4",
"appPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"compiledSource": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
"checks": {
"defaultPanelHidden": true,
"closedPanelNoBlankSpace": true,
"goldGradientAndLuminousTextObserved": true,
"addModuleCaptionVisible": true,
"realColorWheelPreserved": true,
"allSixThemeSelectors": true,
"settingsToggles": 10,
"savedV3ModePreserved": true,
"presetBeforeAfterByteIdentical": true,
"coldReopenPresetByteIdentical": true,
"coldReopenSettingsCollapsed": true,
"coldReopenGoldThemePersisted": true,
"originalNilProjectStillOriginalFlow": true,
"addModuleNativeMenuOpensAndEscapeCloses": true
},
"preset": {
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/ui58-before.json",
"after": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/ui59-after.json",
"bytes": 8590,
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982",
"coldReopened": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/ui59-cold-reopened.json"
},
"limitations": [
"Width 280/320/400 and CMS nil/v2/v3 invariance checked by native fake-host diagnostics; actual FCP observed at normal inspector width.",
"System display accessibility switches were not changed; glow policy code reads current system settings.",
"Image rendering code and template unchanged; prior CST numerical/host export acceptance retained."
],
"pass": true,
"formalHostProcess": [
"50123 /Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit/Contents/MacOS/大鱼调色 XPC Service"
]
}
+63 -5
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 581,
"checks": 595,
"gpu": "Apple M4",
"limitations": [
"Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.",
@@ -12,7 +12,7 @@
"error": "未提供错误信息",
"name": "runtime-directory",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E8696C43-54FE-43B0-AC84-69FCD0178A98"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/377C95AC-EBB8-43A8-A90C-1C9AA3E7A0E5"
},
{
"descriptors": 278,
@@ -890,7 +890,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E8696C43-54FE-43B0-AC84-69FCD0178A98/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/377C95AC-EBB8-43A8-A90C-1C9AA3E7A0E5/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -910,7 +910,7 @@
},
{
"heartbeats": 0,
"maximumGapMS": 83.03549999254756,
"maximumGapMS": 101.97175000212155,
"name": "external-activation-main-loop-responsive",
"pass": true
},
@@ -3066,8 +3066,66 @@
"Gamma26": 0.7659831047058105,
"name": "primary-Cube-restores-output-gamma-selection",
"pass": true
},
{
"name": "compact-color-settings-hidden-without-gap",
"pass": true
},
{
"name": "compact-color-settings-button-expands-panel",
"pass": true
},
{
"name": "compact-color-settings-repeated-toggle-does-not-edit-grade",
"pass": true
},
{
"name": "compact-settings-preserve-CMS-version-1",
"pass": true
},
{
"name": "compact-settings-preserve-CMS-version-2",
"pass": true
},
{
"name": "compact-settings-preserve-CMS-version-3",
"pass": true
},
{
"name": "compact-header-controls-fit-280",
"pass": true
},
{
"name": "compact-header-controls-fit-320",
"pass": true
},
{
"name": "compact-header-controls-fit-400",
"pass": true
},
{
"name": "compact-new-host-stays-original-flow",
"pass": true
},
{
"name": "compact-six-stable-theme-choices",
"pass": true
},
{
"minimumContrast": 7.243752441010932,
"name": "compact-gold-labels-have-readable-contrast",
"pass": true
},
{
"brightCaptionPixels": 242,
"name": "compact-gold-pull-down-draws-readable-caption",
"pass": true
},
{
"name": "compact-gold-glow-respects-system-display-options",
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/E8696C43-54FE-43B0-AC84-69FCD0178A98",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/377C95AC-EBB8-43A8-A90C-1C9AA3E7A0E5",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
+16 -16
查看文件
@@ -1,7 +1,7 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.1.pkg",
"sha256": "f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd",
"bytes": 42999475,
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.2.pkg",
"sha256": "cbabffc620ad851bd8ecddfaf797c46689722d0f772be409aaa29d0841a2eded",
"bytes": 43006067,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
@@ -31,27 +31,27 @@
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.8.1",
"build": "57"
"version": "1.8.2",
"build": "59"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.9130cef7-f8cf-4179-ba41-ec0bbaf9147f/AA2FAE46-CB99-479D-B1AB-D2102658694A/大鱼调色"
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.20452a40-e96f-4a01-9191-82412995e286/89DECFA7-D24D-462F-912E-9503BB73B5E6/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.8.1.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 00:20:55 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.1.pkg: accepted\nsource=Notarized Developer ID",
"signature": "Package \"大鱼调色-1.8.2.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 02:55:41 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.2.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"message": "Successfully received submission info",
"createdDate": "2026-11-04T00:20:57.041Z",
"id": "f525871a-56a0-4b05-8726-d2f116db4594",
"name": "大鱼调色-1.8.1.pkg",
"status": "Accepted"
"id": "26361685-6bdd-4c59-bc2c-4824ea190e05",
"status": "Accepted",
"createdDate": "2026-11-04T02:55:43.274Z",
"name": "大鱼调色-1.8.2.pkg",
"message": "Successfully received submission info"
},
"appCompiledSource": "059245858035e74f78bd669ef25913408d07d235",
"appBuild": "57",
"appCompiledSource": "da03d16c7efa87a5d230467334ec73f9a3a12e54",
"appBuild": "59",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
@@ -59,6 +59,6 @@
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostPrimaryCST1.8.1.json",
"installedAppHostAcceptance": "verification/HostCompactUI1.8.2.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+8 -2
查看文件
@@ -4,8 +4,14 @@
"removed": [
"/Library/Plug-Ins/FxPlug/.dayu-color-candidate56-retained.app",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-build-1.8.1/Build/Products/Release/大鱼调色.app",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-build-1.8.1/Build/Products/Release/大鱼调色 XPC Service.pluginkit"
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-build-1.8.1/Build/Products/Release/大鱼调色 XPC Service.pluginkit",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-1.8.1",
"/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-build-1.8.1",
"/Volumes/备份/大鱼调色-1.8.1.pkg"
],
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"scope": "Current task generated candidates and restore products; user source, media, packages and prior releases retained"
"scope": "Current task generated candidates and restore products; user source, media, packages and prior releases retained",
"finalSignatureAndTicket": true,
"registeredFormalVersions": 1,
"registry": "com.dayu.color.XPC(1.1)\tF973B51D-2CC7-4174-92D5-25AC02DDBC1B\t2026-11-04 00:09:45 +0000\t/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit\n (1 plug-in)"
}
+7 -1
查看文件
@@ -50,5 +50,11 @@
}
],
"scope": "Application source rebuilt from independent remote clone; verified static dependency cache reused, not a completely cold dependency build",
"cleanupPending": true
"cleanupPending": false,
"tag": "v1.8.1-cst-correction-20261104",
"tagCommit": "d0eadccc29782aa30301fff6dbf71c84b5758f59",
"taggedTrackedFiles": 456,
"taggedApplicationSourcesMatchBuiltCommit": true,
"temporaryCloneRemoved": true,
"generatedRestoreProductsRemoved": true
}
+15 -15
查看文件
@@ -3,25 +3,25 @@
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.8.0-cms-20261103",
"releaseCommit": "a5a2bddeb361aac66899c5939671122075a6cffa",
"releaseID": 381,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.0-cms-20261103",
"tag": "v1.8.1-cst-correction-20261104",
"releaseCommit": "d0eadccc29782aa30301fff6dbf71c84b5758f59",
"releaseID": 382,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.1-cst-correction-20261104",
"prerelease": true,
"assetID": 25,
"assetName": "大鱼调色-1.8.0.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.0-cms-20261103/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.0.pkg",
"bytes": 42851034,
"sha256": "fd59203d387122e768090a97851daf3bd7c07193a8073b9497a10c05d5fd6c42",
"assetID": 26,
"assetName": "大鱼调色-1.8.1.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.1-cst-correction-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.1.pkg",
"bytes": 42999475,
"sha256": "f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd",
"existingAssetReused": true,
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
"credentialSource": "macOS Keychain: dayu-git-api",
"draftBrowserDownload": {
"path": "/Volumes/备份/大鱼调色-1.8.0.pkg",
"sha256": "fd59203d387122e768090a97851daf3bd7c07193a8073b9497a10c05d5fd6c42",
"bytes": 42851034,
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.0-cms-20261103/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.0.pkg",
"observedBrowserURL": "https://dayu.media/git/attachments/52c92564-4662-4157-b22b-d9020b3fd4dd",
"cleanup": "Verified temporary browser download removed; final distribution package retained"
"path": "/Volumes/备份/大鱼调色-1.8.1.pkg",
"sha256": "f94aa3a21ffbe52bc68b482289b71112d9895161e18f983af918d11547d254cd",
"bytes": 42999475,
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.1-cst-correction-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.1.pkg",
"actualVisitedURL": "https://dayu.media/git/attachments/033747bf-5f82-4cfd-9af0-ef2c89fe4108",
"temporaryCopyCleaned": true
}
}
@@ -0,0 +1,37 @@
// Presentation-only changes must never rewrite a host's grading parameters.
{
DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil);
DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease];[view refresh];[view setFrameSize:NSMakeSize(400,780)];[view layoutSubtreeIfNeeded];
NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"];NSView *first=cards.firstObject[@"view"];
run.record(@"compact-color-settings-hidden-without-gap",panel.hidden&&first.frame.origin.y==8&&[settings.accessibilityLabel isEqual:@"颜色设置"]);
NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];int starts=host->_undoStarts,ends=host->_undoEnds;
[settings performClick:nil];[view layoutSubtreeIfNeeded];run.record(@"compact-color-settings-button-expands-panel",!panel.hidden&&first.frame.origin.y>=NSMaxY(panel.frame)+12&&settings.state==NSControlStateValueOn);
for(int i=0;i<9;i++){[settings performClick:nil];[view layoutSubtreeIfNeeded];}
run.record(@"compact-color-settings-repeated-toggle-does-not-edit-grade",panel.hidden&&first.frame.origin.y==8&&[values isEqual:host->_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds);
for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults()]){
DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=state.count?state:nil;DYWriteAssets(host,assets,kCMTimeZero);[view refresh];NSDictionary *snapshot=[view presetSnapshot];[settings performClick:nil];[settings performClick:nil];
run.record([NSString stringWithFormat:@"compact-settings-preserve-CMS-version-%@",state[@"version"]?:@1],[[view presetSnapshot]isEqual:snapshot]);
}
for(NSNumber *width in @[@280,@320,@400]){
[view setFrameSize:NSMakeSize(width.doubleValue,780)];[view layoutSubtreeIfNeeded];NSArray *buttons=@[[view valueForKey:@"save"],[view valueForKey:@"load"],[view valueForKey:@"export"],settings];BOOL fit=YES;
for(NSView *button in buttons){fit&=NSMinX(button.frame)>=0&&NSMaxX(button.frame)<=width.doubleValue&&button.frame.size.width>=66;for(NSView *other in buttons)if(button!=other)fit&=!NSIntersectsRect(button.frame,other.frame);}
NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==6&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]);
run.record([NSString stringWithFormat:@"compact-header-controls-fit-%@",width],fit);
}
DYDiagnosticManager *fresh=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(fresh,nil);run.record(@"compact-new-host-stays-original-flow",!DYReadAssets(fresh,kCMTimeZero).colorManagement);
NSInteger previous=DYThemeIndex();@try{
BOOL colors=DYThemeNames().count==6&&[DYThemeNames()[5]isEqual:@"黑金渐变"];
for(NSInteger i=0;i<6;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];}
run.record(@"compact-six-stable-theme-choices",colors);
DYSetThemeIndex(5);auto luminance=[](NSColor *color){NSColor *c=[color colorUsingColorSpace:NSColorSpace.sRGBColorSpace];auto linear=[](double x){return x<=.04045?x/12.92:pow((x+.055)/1.055,2.4);};return .2126*linear(c.redComponent)+.7152*linear(c.greenComponent)+.0722*linear(c.blueComponent);};
double minimum=100;for(NSString *text in @[@"text",@"secondary"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop"])minimum=std::min(minimum,(luminance(DYThemePalette()[text])+.05)/(luminance(DYThemePalette()[surface])+.05));
run.record(@"compact-gold-labels-have-readable-contrast",minimum>=4.5,@{@"minimumContrast":@(minimum)});
DYThemePopUpButton *pullDown=[[[DYThemePopUpButton alloc]initWithFrame:NSMakeRect(0,0,240,28) pullsDown:YES]autorelease];[pullDown addItemWithTitle:@"+ 添加模块"];pullDown.font=[NSFont systemFontOfSize:11];
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:240 pixelsHigh:28 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:0]autorelease];
[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];[pullDown drawRect:pullDown.bounds];[NSGraphicsContext restoreGraphicsState];NSUInteger glyphPixels=0;
for(int y=6;y<23;y++)for(int x=9;x<90;x++){NSColor *c=[bitmap colorAtX:x y:y];if(c.redComponent>.55&&c.greenComponent>.35)glyphPixels++;}
run.record(@"compact-gold-pull-down-draws-readable-caption",glyphPixels>30,@{@"brightCaptionPixels":@(glyphPixels)});
BOOL reduced=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast||NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
run.record(@"compact-gold-glow-respects-system-display-options",reduced?DYThemeTextShadow()==nil:DYThemeTextShadow().shadowBlurRadius<=2);
}@finally{DYSetThemeIndex(previous);}
}
+2
查看文件
@@ -9,6 +9,7 @@
#import "DYLUTLibrary.h"
#import "DYLUTBrowser.h"
#import "DYInspector.h"
#import "DYTheme.h"
#include "DYSpiderState.h"
#include <string>
#import <CoreVideo/CoreVideo.h>
@@ -501,6 +502,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool {
#include "DYMaskPanelDiagnostics.inc.h"
#include "DYManagedDiagnostics.inc.h"
#include "DYPrimaryDiagnostics.inc.h"
#include "DYCompactUIDiagnostics.inc.h"
[gpu release];
} @catch(NSException *exception) {
run.record(@"diagnostic-exception",false,@{@"exception":exception.name?:@"unknown",@"message":exception.reason?:@"unknown"});
+35 -25
查看文件
@@ -19,17 +19,17 @@
static NSColor *DYAccent(void) { return DYThemeColor(@"accent"); }
static NSColor *DYInk(void) { return DYThemeColor(@"text"); }
static NSTextField *DYLabel(NSString *text, CGFloat size) {
NSTextField *v=[NSTextField labelWithString:text?:@""];
NSTextField *v=[DYThemeLabel labelWithString:text?:@""];
v.font=[NSFont systemFontOfSize:size weight:size==11?NSFontWeightMedium:NSFontWeightRegular]; v.textColor=DYThemeColor(@"slot15");
v.lineBreakMode=NSLineBreakByTruncatingTail;
return v;
}
static NSButton *DYButton(NSString *title,id target,SEL action) {
NSButton *b=[NSButton buttonWithTitle:title target:target action:action];
NSButton *b=[DYThemeButton buttonWithTitle:title target:target action:action];
b.bezelStyle=NSBezelStyleRounded; b.font=[NSFont systemFontOfSize:11];
b.contentTintColor=DYAccent(); return b;
}
@interface DYWebsiteLink : NSButton @end
@interface DYWebsiteLink : DYThemeButton @end
@implementation DYWebsiteLink
- (NSAccessibilityRole)accessibilityRole {return NSAccessibilityLinkRole;}
- (void)resetCursorRects {[self addCursorRect:self.bounds cursor:NSCursor.pointingHandCursor];}
@@ -100,7 +100,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
- (void)drawWithFrame:(NSRect)frame inView:(NSView *)view {
NSRect rect=NSInsetRect(frame,.5,.5);NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:2.5 yRadius:2.5];
NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot5"] endingColor:DYThemePalette()[@"slot4"]]autorelease];[gradient drawInBezierPath:p angle:90];[[DYThemePalette()[@"accent"]colorWithAlphaComponent:.65]setStroke];p.lineWidth=.9;[p stroke];
[self drawInteriorWithFrame:NSInsetRect(frame,4,3) inView:view];
[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[self drawInteriorWithFrame:NSInsetRect(frame,4,3) inView:view];[NSGraphicsContext restoreGraphicsState];
}
@end
@@ -125,6 +125,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
return self;
}
- (BOOL)isFlipped { return YES; }
- (void)drawRect:(NSRect)rect {if([self.identifier isEqual:@"inspectorBackground"])DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);}
- (BOOL)isAccessibilityElement { return YES; }
- (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; }
- (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); }
@@ -159,9 +160,8 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
@interface DYCard : DYFlippedView @end
@implementation DYCard
- (void)drawRect:(NSRect)rect {
[DYThemeColor(@"card") setFill];
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,.5,.5) xRadius:11 yRadius:11];
[path fill]; [DYThemeColor(@"border") setStroke];
DYDrawThemeSurface(path,YES); [DYThemeColor(@"border") setStroke];
path.lineWidth=1; [path stroke];
[[NSColor colorWithWhite:.52 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(32,19,5,5)]fill];
}
@@ -175,7 +175,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
NSRect r=NSInsetRect(self.bounds,.5,2);
NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease];
[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:r xRadius:8 yRadius:8] angle:90];
NSDictionary *attributes=@{NSFontAttributeName:self.font,NSForegroundColorAttributeName:DYInk()};
NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk());
[(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes];
[self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes];
}
@@ -192,6 +192,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
- (void)dealloc {[_swatch release];[super dealloc];}
- (void)drawRect:(NSRect)dirtyRect {
NSRect r=NSInsetRect(self.bounds,3,3);[_swatch setFill];NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:r xRadius:5 yRadius:5];[p fill];
if([self.identifier isEqual:@"themeSwatch"]&&self.tag==5){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:NSColor.blackColor endingColor:DYThemeSwatch(5)]autorelease];[g drawInBezierPath:p angle:45];}
if([self.identifier isEqual:@"customColorSwatch"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[NSColor.systemRedColor,NSColor.systemYellowColor,NSColor.systemGreenColor,NSColor.systemCyanColor,NSColor.systemBlueColor,NSColor.systemPurpleColor]]autorelease];[g drawInBezierPath:p angle:45];[@"⌾" drawInRect:NSInsetRect(r,3,1) withAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:16],NSForegroundColorAttributeName:NSColor.whiteColor}];}
if(self.state==NSControlStateValueOn){[DYInk() setStroke];p.lineWidth=2;[p stroke];}
}
@@ -281,7 +282,7 @@ static NSArray *DYPresentationSections(void) {
}
- (void)drawRect:(NSRect)dirtyRect {
NSRect r=[self plotRect];
[[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1] setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];
[(DYThemeIndex()==5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];
[[NSColor colorWithWhite:1 alpha:.1] setStroke];NSBezierPath *grid=[NSBezierPath bezierPath];grid.lineWidth=.5;
for(int i=0;i<5;i++){CGFloat x=r.origin.x+r.size.width*i/4,y=r.origin.y+r.size.height*i/4;[grid moveToPoint:NSMakePoint(x,NSMinY(r))];[grid lineToPoint:NSMakePoint(x,NSMaxY(r))];[grid moveToPoint:NSMakePoint(NSMinX(r),y)];[grid lineToPoint:NSMakePoint(NSMaxX(r),y)];}[grid stroke];
std::vector<NSPoint> p; p.push_back(NSMakePoint(0,0));
@@ -434,6 +435,7 @@ static NSImage *DYWheelImage(void) {
NSArray *_themeButtons;
NSMutableDictionary *_tabs;
NSInteger _visibleLooks;
NSButton *_colorSettings;BOOL _colorSettingsExpanded;
BOOL _refreshing,_graphicUndoOpen;
BOOL _embedded;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight;
DYSpiderPanel *_spiderPanel;
@@ -474,11 +476,12 @@ static NSImage *DYWheelImage(void) {
_save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain];
_load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain];
_export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain];
_addModule=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
_colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];[_colorSettings setButtonType:NSButtonTypePushOnPushOff];_colorSettings.toolTip=@"展开或收起高级颜色设置;默认使用原有流程";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已收起";
_addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
for(NSDictionary *section in DYPresentationSections()){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_addModule]){[self addSubview:v];v.hidden=_embedded;}
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<5;i++){
DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=DYThemeSwatch(i);b.tag=i;b.target=self;b.action=@selector(selectTheme:);b.title=@"";b.bordered=NO;
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule]){[self addSubview:v];v.hidden=_embedded;}
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<DYThemeNames().count;i++){
DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=DYThemeSwatch(i);b.tag=i;b.identifier=@"themeSwatch";b.target=self;b.action=@selector(selectTheme:);b.title=@"";b.bordered=NO;
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded;[themes addObject:b];
}_themeButtons=[themes copy];
_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect];
@@ -489,12 +492,13 @@ static NSImage *DYWheelImage(void) {
_scroll.contentView.wantsLayer=YES;_scroll.contentView.layer.masksToBounds=YES;
_scroll.accessibilityLabel=@"调色参数滚动区";
_document=[[DYFlippedView alloc] initWithFrame:NSMakeRect(0,0,360,1000)];
_document.accessibilityLabel=@"调色参数";
_document.accessibilityLabel=@"调色参数";_document.identifier=@"inspectorBackground";
_scroll.documentView=_document; [self addSubview:_scroll];
if(!_embedded){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];[_document addSubview:_managedPanel];}
if(!_embedded){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_document addSubview:_managedPanel];}
[self buildCards];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager];
[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil];
[NSWorkspace.sharedWorkspace.notificationCenter addObserver:self selector:@selector(themeChanged:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
if(_renderer)[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(previewChanged:) name:@"DYPreviewDidChange" object:_renderer];
[self themeChanged:nil];
[self setAccessibilityLabel:@"大鱼调色检查器"];
@@ -506,14 +510,15 @@ static NSImage *DYWheelImage(void) {
[self graphicGesture:NO title:nil];_spiderPanel.delegate=nil;
for(id graphic in _graphics)if([graphic isKindOfClass:DYPrimaryBalanceWheel.class])[(DYPrimaryBalanceWheel*)graphic setDelegate:nil];
for(NSProgress *p in _assetLoads.allValues)[p cancel];[_assetLoads release];[_assetLoadIDs release];[_menuScan cancel];[_menuScan release];[_pendingAssetMenuCommand release];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[[NSNotificationCenter defaultCenter] removeObserver:self];[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_addModule release];
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_colorSettings release];[_addModule release];
[_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
[_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release];
[super dealloc];
}
- (BOOL)isFlipped { return YES; }
- (void)drawRect:(NSRect)rect {DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);}
- (BOOL)isAccessibilityElement { return YES; }
- (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; }
- (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); }
@@ -533,12 +538,17 @@ static NSImage *DYWheelImage(void) {
else dispatch_async(dispatch_get_main_queue(),^{ [self refresh]; });
}
- (void)selectTheme:(NSButton *)button {DYSetThemeIndex(button.tag);}
- (void)toggleColorSettings:(id)sender {
_colorSettingsExpanded=!_colorSettingsExpanded;_managedPanel.hidden=!_colorSettingsExpanded;_colorSettings.state=_colorSettingsExpanded?NSControlStateValueOn:NSControlStateValueOff;
_colorSettings.accessibilityValue=_colorSettingsExpanded?@"已展开":@"已收起";[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded];
[_document scrollPoint:NSZeroPoint];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
}
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
- (void)redrawTree:(NSView *)view { [view setNeedsDisplay:YES];for(NSView *child in view.subviews)[self redrawTree:child]; }
- (void)themeChanged:(NSNotification *)notification {
self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor];
for(NSButton *b in _themeButtons)b.state=b.tag==DYThemeIndex()?NSControlStateValueOn:NSControlStateValueOff;
_websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:@{NSFontAttributeName:_websiteLink.font,NSForegroundColorAttributeName:DYAccent(),NSUnderlineStyleAttributeName:@(NSUnderlineStyleSingle)}]autorelease];
_websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:DYThemeTextAttributes(_websiteLink.font,DYAccent())]autorelease];
for(NSDictionary *r in _controls.allValues)[r[@"field"] setBackgroundColor:DYThemeColor(@"field")];
[_browser updatePalette:DYThemePalette()];[self redrawTree:self];
}
@@ -628,7 +638,7 @@ static NSImage *DYWheelImage(void) {
toggle.tag=[pid integerValue]; toggle.contentTintColor=DYAccent(); toggle.accessibilityLabel=d[@"title"];
[row addSubview:toggle]; record[@"toggle"]=toggle;
} else if([kind isEqualToString:@"popup"]) {
NSPopUpButton *popup=[[[NSPopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO] autorelease];
NSPopUpButton *popup=[[[DYThemePopUpButton alloc] initWithFrame:NSZeroRect pullsDown:NO] autorelease];
[popup addItemsWithTitles:d[@"options"]?:@[]]; popup.font=[NSFont systemFontOfSize:11];
popup.target=self; popup.action=@selector(scalarChanged:); popup.tag=[pid integerValue];
popup.accessibilityLabel=d[@"title"]; [row addSubview:popup]; record[@"popup"]=popup;
@@ -709,16 +719,16 @@ static NSImage *DYWheelImage(void) {
- (void)layout {
[super layout];
CGFloat w=MAX(280,self.bounds.size.width),h=self.bounds.size.height;
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);
for(NSInteger i=0;i<5;i++)[_themeButtons[i]setFrame:NSMakeRect(w-146+i*22,17,21,22)];
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);_subtitle.hidden=_embedded||w<340;
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-147+i*19,17,19,22)];
_resetAll.frame=NSMakeRect(w-33,16,23,24);
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
CGFloat gap=7,bw=(w-32-gap*2)/3;
_save.frame=NSMakeRect(16,74,bw,27); _load.frame=NSMakeRect(16+bw+gap,74,bw,27); _export.frame=NSMakeRect(16+(bw+gap)*2,74,bw,27);
_addModule.frame=NSMakeRect(16,108,w-32,27);
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,144,w,MAX(80,h-144));
CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4);
NSArray *actions=@[_save,_load,_export,_colorSettings];for(NSUInteger i=0;i<actions.count;i++)[actions[i]setFrame:NSMakeRect(16+(bw+gap)*(compact?i%2:i),74+(compact?i/2*34:0),bw,27)];
CGFloat top=compact?178:144;_addModule.frame=NSMakeRect(16,top-36,w-32,27);
_scroll.frame=_embedded?NSMakeRect(0,0,w,h):NSMakeRect(0,top,w,MAX(80,h-top));
CGFloat cw=MAX(244,_scroll.contentSize.width-32),y=8;
if(_managedPanel){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
if(_managedPanel&&!_managedPanel.hidden){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
for(NSMutableDictionary *c in _cards) {
DYCard *card=c[@"view"];BOOL collapsed=[c[@"collapsed"]boolValue];NSString *key=c[@"section"][@"key"];
card.hidden=[c[@"removed"]boolValue];if(card.hidden){y=[self layoutRepeatedToolsAfter:[@"base:" stringByAppendingString:key] y:y width:w];continue;}
+11 -10
查看文件
@@ -13,28 +13,29 @@
NSDictionary *_state;NSString *_inputLUTPath;NSUInteger _selectionGeneration;BOOL _refreshing;
}
- (BOOL)isFlipped{return YES;}
- (CGFloat)contentHeight{NSInteger m=[_state[@"mode"]integerValue];return m==0?112:(m==1||m==4)?204:302;}
static NSTextField *cmsLabel(NSString*s){NSTextField*l=[NSTextField wrappingLabelWithString:s];l.font=[NSFont systemFontOfSize:11];l.textColor=DYThemeColor(@"text");return l;}
- (CGFloat)contentHeight{NSInteger m=[_state[@"mode"]integerValue];return m==0?82:(m==1||m==4)?110:238;}
static NSTextField *cmsLabel(NSString*s){NSTextField*l=[DYThemeLabel wrappingLabelWithString:s];l.font=[NSFont systemFontOfSize:11];l.textColor=DYThemeColor(@"text");return l;}
- (instancetype)initWithManager:(id<PROAPIAccessing>)m renderer:(DYRenderer*)r assetTarget:(id)target {
if((self=[super initWithFrame:NSZeroRect])){_manager=m;_renderer=[r retain];_assetTarget=target;self.identifier=@"managedColor";
_mode=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"一级 CST · 原有流程",@"1.8 兼容 · 跟随 FCP",@"1.8 兼容 · 相机 → ACES",@"1.8 兼容 · LUT → ACES",@"一级 CST · 延后输出(推荐)"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
_mode=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];[_mode addItemsWithTitles:@[@"原有流程(默认)",@"1.8 兼容 · 跟随 FCP",@"1.8 兼容 · 相机 → ACES",@"1.8 兼容 · LUT → ACES",@"一级 CST · 延后输出"]];_mode.target=self;_mode.action=@selector(modeChanged:);_mode.accessibilityLabel=@"色彩管理方式";
_inputLabel=[cmsLabel(@"输入空间")retain];_outputLabel=[cmsLabel(@"输出目标")retain];
_input=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedInputSpaces()){[_input addItemWithTitle:s[@"name"]];_input.lastItem.representedObject=s[@"id"];} _input.target=self;_input.action=@selector(settingsChanged:);_input.accessibilityLabel=@"新版输入空间";
_output=[[NSPopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedOutputSpaces()){[_output addItemWithTitle:s[@"name"]];_output.lastItem.representedObject=s[@"id"];} _output.target=self;_output.action=@selector(settingsChanged:);_output.accessibilityLabel=@"新版输出目标";
_gamut=[[NSButton checkboxWithTitle:@"ACES 参考色域压缩" target:self action:@selector(settingsChanged:)]retain];_gamut.font=[NSFont systemFontOfSize:11];
_lut=[[NSButton buttonWithTitle:@"选择输入 LUT…" target:self action:@selector(chooseLUT:)]retain];_lut.bezelStyle=NSBezelStyleRounded;
_input=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedInputSpaces()){[_input addItemWithTitle:s[@"name"]];_input.lastItem.representedObject=s[@"id"];} _input.target=self;_input.action=@selector(settingsChanged:);_input.accessibilityLabel=@"新版输入空间";
_output=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect];for(NSDictionary*s in DYManagedOutputSpaces()){[_output addItemWithTitle:s[@"name"]];_output.lastItem.representedObject=s[@"id"];} _output.target=self;_output.action=@selector(settingsChanged:);_output.accessibilityLabel=@"新版输出目标";
_gamut=[[DYThemeButton checkboxWithTitle:@"ACES 参考色域压缩" target:self action:@selector(settingsChanged:)]retain];_gamut.font=[NSFont systemFontOfSize:11];_gamut.contentTintColor=DYThemeColor(@"accent");
_lut=[[DYThemeButton buttonWithTitle:@"选择输入 LUT…" target:self action:@selector(chooseLUT:)]retain];_lut.bezelStyle=NSBezelStyleRounded;
_help=[cmsLabel(@"")retain];_help.textColor=DYThemeColor(@"secondary");_context=[cmsLabel(@"宿主颜色信息将在渲染后显示。")retain];_context.textColor=DYThemeColor(@"secondary");_context.accessibilityLabel=@"当前颜色链路";
for(NSView*v in @[_mode,_inputLabel,_input,_outputLabel,_output,_gamut,_lut,_help,_context])[self addSubview:v];[self refreshWithState:nil context:nil];
}return self;
}
- (void)dealloc{[_renderer release];[_state release];[_inputLUTPath release];for(id v in @[_mode,_input,_output,_gamut,_lut,_inputLabel,_outputLabel,_help,_context])[v release];[super dealloc];}
- (void)layout{[super layout];CGFloat w=self.bounds.size.width;_mode.frame=NSMakeRect(0,3,w,26);_inputLabel.frame=NSMakeRect(2,36,70,22);_input.frame=NSMakeRect(72,32,w-72,26);_outputLabel.frame=NSMakeRect(2,67,70,22);_output.frame=NSMakeRect(72,63,w-72,26);_gamut.frame=NSMakeRect(0,94,w,22);_lut.frame=NSMakeRect(0,120,w,25);_help.frame=NSMakeRect(2,152,w-4,96);_context.frame=NSMakeRect(2,252,w-4,47);if([_state[@"mode"]integerValue]<2||DYPrimaryColorState(_state)){_help.frame=NSMakeRect(2,36,w-4,104);_context.frame=NSMakeRect(2,144,w-4,54);}}
- (void)layout{[super layout];CGFloat w=self.bounds.size.width;_mode.frame=NSMakeRect(0,3,w,26);_inputLabel.frame=NSMakeRect(2,36,62,22);_input.frame=NSMakeRect(64,32,w-64,26);_outputLabel.frame=NSMakeRect(2,67,62,22);_output.frame=NSMakeRect(64,63,w-64,26);_gamut.frame=NSMakeRect(0,94,w,22);_lut.frame=NSMakeRect(0,120,w,25);_help.frame=NSMakeRect(2,152,w-4,42);_context.frame=NSMakeRect(2,198,w-4,36);if([_state[@"mode"]integerValue]<2||DYPrimaryColorState(_state)){_help.frame=NSMakeRect(2,36,w-4,42);_context.frame=NSMakeRect(2,80,w-4,28);}}
- (void)refreshWithState:(NSDictionary*)s context:(NSDictionary*)context {
_refreshing=YES;NSDictionary *saved=[s copy];[_state release];_state=saved;NSInteger mode=s.count?[s[@"mode"]integerValue]:0;[_mode selectItemAtIndex:mode];
NSDictionary *values=s.count&&!DYPrimaryColorState(s)?s:DYManagedColorDefaults();for(NSMenuItem*i in _input.itemArray)if([i.representedObject isEqual:values[@"input"]])[_input selectItem:i];for(NSMenuItem*i in _output.itemArray)if([i.representedObject isEqual:values[@"output"]])[_output selectItem:i];
_input.hidden=_inputLabel.hidden=_output.hidden=_outputLabel.hidden=_gamut.hidden=mode<2||mode==4;_context.hidden=mode==0;_input.enabled=mode==2||mode==3;_output.enabled=mode==2||mode==3;_gamut.enabled=mode==2||mode==3;_gamut.state=[values[@"gamutCompression"]boolValue];_lut.hidden=mode!=3;_inputLabel.stringValue=mode==3?@"LUT 输出":@"输入空间";_outputLabel.stringValue=mode==1?@"跟随宿主":@"输出目标";
_help.stringValue=mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
_context.stringValue=mode==4?@"素材编码 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_refreshing=NO;[self setNeedsLayout:YES];
_help.toolTip=mode==4?@"输入、工作空间及输出均使用下面的一级 CST 设置。一级与印片完成后才执行主输出;其余工具为输出后的 SDR 修饰。请核对上游相机 LUT 与颜色符合,插件无法恢复上游已裁切的信息。":mode==0?@"保留原有处理顺序。选择“延后输出”后,使用一级 CST 的输入和工作空间,在一级与印片之后执行主输出。":mode==1?@"保留 1.8.0 的固定 ACEScct 流程,一级 CST 转换由全局管理接管。宿主已还原的画面无法重新获得原始 Log 信息。":mode==2?@"按所选相机编码解释兼容码值。请确认上游未还原、未自动符合;选择准确输入与输出目标。PQ/HLG 仅支持一级与印片,其他工具用于 SDR。":@"使用输入 LUT,并按“LUT 输出”解释其结果;再进入 ACEScct 和所选输出变换。";
_help.stringValue=mode==0?@"保留原有调色顺序。高级流程按需选择。":mode==4?@"使用一级 CST 设置,在一级与印片之后输出。":mode==1?@"保留 1.8 兼容流程,输入跟随 FCP。":mode==2?@"按所选相机编码解释输入;请核对上游转换。":@"按所选编码解释输入 LUT 的输出。";
_context.stringValue=mode==4?@"输入 CST → 工作域调色与印片 → 输出 CST":context.count?[NSString stringWithFormat:@"%@ → ACEScct → %@",context[@"source"]?:@"未知",context[@"destination"]?:@"未知"]:@"宿主颜色信息将在渲染后显示。";_context.toolTip=mode==4?@"素材编码 → 一级输入 CST → 所选工作域调色与印片 → 一级输出 CST → 宿主。请核对上游相机 LUT 与颜色符合;已裁切信息无法恢复。":_context.stringValue;_refreshing=NO;[self setNeedsLayout:YES];
}
- (void)setInputLUTPath:(NSString*)path{NSString *saved=[path copy];[_inputLUTPath release];_inputLUTPath=saved;_lut.title=path.length?path.lastPathComponent:@"选择输入 LUT…";_lut.toolTip=path.length?path:@"选择 LUT,并准确指定其输出编码";_lut.accessibilityLabel=path.length?[@"输入 LUT:" stringByAppendingString:path.lastPathComponent]:@"选择输入 LUT";}
- (void)refreshContext{[self refreshWithState:_state context:[_renderer colorContext]];}
+8
查看文件
@@ -7,3 +7,11 @@ FOUNDATION_EXPORT void DYSetThemeIndex(NSInteger index);
FOUNDATION_EXPORT NSDictionary<NSString *, NSColor *> *DYThemePalette(void);
FOUNDATION_EXPORT NSColor *DYThemeColor(NSString *role);
FOUNDATION_EXPORT NSColor *DYThemeSwatch(NSInteger index);
// Shared AppKit controls keep native actions, focus, and accessibility.
FOUNDATION_EXPORT NSShadow *DYThemeTextShadow(void);
FOUNDATION_EXPORT NSDictionary *DYThemeTextAttributes(NSFont *font, NSColor *color);
FOUNDATION_EXPORT void DYDrawThemeSurface(NSBezierPath *path, BOOL card);
@interface DYThemeLabel : NSTextField @end
@interface DYThemeButton : NSButton @end
@interface DYThemePopUpButton : NSPopUpButton @end
+54 -9
查看文件
@@ -11,7 +11,7 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
- (instancetype)init {
if((self=[super init])) {
_defaults=[[NSUserDefaults alloc]initWithSuiteName:preferenceDomain];
[_defaults registerDefaults:@{@"themeIndex":@1}];
[_defaults registerDefaults:@{@"themeIndex":@5}];
[[NSDistributedNotificationCenter defaultCenter]addObserver:self selector:@selector(externalChange:) name:distributedChange object:preferenceDomain suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
}
return self;
@@ -23,25 +23,26 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
}
@end
static DYThemeStore *store(void){static DYThemeStore *s;static dispatch_once_t once;dispatch_once(&once,^{s=[DYThemeStore new];});return s;}
NSArray<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙"];}
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<5?i:1;}
static const double paletteRGB[5][17][3]={
NSArray<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙",@"黑金渐变"];}
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<6?i:5;}
static const double paletteRGB[6][17][3]={
{{0.11,0.12,0.14},{0.075,0.08,0.095},{0.17,0.18,0.21},{0.12,0.13,0.15},{0.27,0.29,0.33},{0.2,0.22,0.25},{0.36,0.39,0.44},{0.25,0.28,0.32},{0.21,0.23,0.26},{0.15,0.17,0.2},{0.78,0.83,0.9},{0.55,0.61,0.7},{1.0,1.0,1.0},{0.78,0.82,0.88},{0.96,0.97,0.98},{0.86,0.89,0.92},{0.67,0.72,0.77}},
{{0.031,0.086,0.148},{0.025,0.075,0.13},{0.07,0.155,0.235},{0.045,0.12,0.19},{0.115,0.22,0.33},{0.07,0.15,0.24},{0.15,0.33,0.5},{0.08,0.24,0.36},{0.23,0.32,0.41},{0.18,0.26,0.35},{0.38,0.76,1.0},{0.23,0.64,0.97},{0.96,0.98,1.0},{0.62,0.7,0.76},{0.88,0.96,1.0},{0.82,0.9,0.96},{0.58,0.7,0.78}},
{{0.11,0.09,0.17},{0.07,0.06,0.12},{0.18,0.14,0.28},{0.13,0.1,0.21},{0.27,0.22,0.42},{0.2,0.16,0.31},{0.43,0.34,0.68},{0.31,0.23,0.52},{0.22,0.18,0.31},{0.15,0.12,0.23},{0.78,0.71,1.0},{0.5,0.42,0.93},{0.95,0.9,1.0},{0.63,0.5,0.95},{0.98,0.95,1.0},{0.9,0.86,0.97},{0.7,0.66,0.82}},
{{0.08,0.17,0.1},{0.05,0.12,0.07},{0.12,0.27,0.15},{0.09,0.2,0.11},{0.16,0.35,0.2},{0.12,0.27,0.15},{0.21,0.57,0.31},{0.14,0.4,0.21},{0.14,0.27,0.16},{0.1,0.2,0.11},{0.54,0.96,0.64},{0.22,0.75,0.35},{0.91,1.0,0.93},{0.28,0.8,0.42},{0.95,1.0,0.96},{0.86,0.96,0.88},{0.66,0.8,0.68}},
{{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}}
{{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}},
{{.065,.060,.050},{.012,.012,.012},{.12,.105,.075},{.045,.042,.035},{.105,.092,.065},{.15,.125,.075},{.17,.14,.085},{.075,.065,.045},{.23,.20,.14},{.10,.09,.065},{.98,.82,.42},{.72,.51,.18},{1,.90,.65},{.88,.74,.43},{1,.86,.48},{.96,.82,.49},{.79,.70,.48}}
};
NSColor *DYThemeSwatch(NSInteger index){static const double values[5][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28}};index=MAX(0,MIN(4,index));return rgb(values[index][0],values[index][1],values[index][2]);}
void DYSetThemeIndex(NSInteger index){if(index<0||index>4)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
NSColor *DYThemeSwatch(NSInteger index){static const double values[6][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28},{.96,.77,.36}};index=MAX(0,MIN(5,index));return rgb(values[index][0],values[index][1],values[index][2]);}
void DYSetThemeIndex(NSInteger index){if(index<0||index>5)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
NSDictionary<NSString *,NSColor *> *DYThemePalette(void){
static NSArray *palettes;static dispatch_once_t once;dispatch_once(&once,^{
NSMutableArray *all=[NSMutableArray array];
for(NSInteger index=0;index<5;index++){
for(NSInteger index=0;index<6;index++){
const double (*p)[3]=paletteRGB[index];NSMutableDictionary *d=[NSMutableDictionary dictionary];
for(int i=0;i<17;i++)d[[NSString stringWithFormat:@"slot%d",i]]=rgb(p[i][0],p[i][1],p[i][2]);
NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):DYThemeSwatch(index);
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];[all addObject:[[d copy]autorelease]];
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];[all addObject:[[d copy]autorelease]];
}palettes=[all copy];
});return palettes[DYThemeIndex()];
}
@@ -50,3 +51,47 @@ NSColor *DYThemeColor(NSString *role){
NSMutableDictionary *all=[NSMutableDictionary dictionary];for(NSString *key in DYThemePalette())all[key]=[NSColor colorWithName:[@"Dayu." stringByAppendingString:key] dynamicProvider:^NSColor *(NSAppearance *appearance){return DYThemePalette()[key];}];colors=[all copy];
});return colors[role]?:NSColor.whiteColor;
}
NSShadow *DYThemeTextShadow(void) {
NSWorkspace *workspace=NSWorkspace.sharedWorkspace;
if(DYThemeIndex()!=5||workspace.accessibilityDisplayShouldIncreaseContrast||workspace.accessibilityDisplayShouldReduceTransparency)return nil;
NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[DYThemeColor(@"accent")colorWithAlphaComponent:.30];shadow.shadowBlurRadius=1.8;shadow.shadowOffset=NSZeroSize;return shadow;
}
NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) {
NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:@{NSFontAttributeName:font,NSForegroundColorAttributeName:color}];
NSShadow *shadow=DYThemeTextShadow();if(shadow)attributes[NSShadowAttributeName]=shadow;return attributes;
}
void DYDrawThemeSurface(NSBezierPath *path,BOOL card) {
NSDictionary *palette=DYThemePalette();NSString *role=card?@"card":@"background";
if(DYThemeIndex()==5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];}
else {[palette[role]setFill];[path fill];}
}
@implementation DYThemeLabel
- (void)drawRect:(NSRect)rect {[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[super drawRect:rect];[NSGraphicsContext restoreGraphicsState];}
@end
@interface DYThemeButtonCell : NSButtonCell @end
@implementation DYThemeButtonCell
- (NSRect)drawTitle:(NSAttributedString*)title withFrame:(NSRect)frame inView:(NSView*)view {
if(DYThemeIndex()!=5)return [super drawTitle:title withFrame:frame inView:view];
NSMutableAttributedString *gold=[[title mutableCopy]autorelease];[gold addAttributes:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45]) range:NSMakeRange(0,gold.length)];return [super drawTitle:gold withFrame:frame inView:view];
}
- (void)drawBezelWithFrame:(NSRect)frame inView:(NSView*)view {
if(DYThemeIndex()!=5||!self.bordered){[super drawBezelWithFrame:frame inView:view];return;}
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(frame,1,2) xRadius:6 yRadius:6];DYDrawThemeSurface(path,YES);[[DYThemeColor(@"accent")colorWithAlphaComponent:self.highlighted?.8:.32]setStroke];path.lineWidth=self.highlighted?1.5:1;[path stroke];
}
@end
@implementation DYThemeButton
+ (Class)cellClass {return DYThemeButtonCell.class;}
@end
@implementation DYThemePopUpButton
- (void)drawRect:(NSRect)rect {
if(DYThemeIndex()!=5){[super drawRect:rect];return;}
NSRect bounds=NSInsetRect(self.bounds,1,2);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];DYDrawThemeSurface(path,YES);
[[DYThemeColor(@"accent")colorWithAlphaComponent:self.enabled?.38:.18]setStroke];path.lineWidth=1;[path stroke];
NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45])];NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.lineBreakMode=NSLineBreakByTruncatingTail;attributes[NSParagraphStyleAttributeName]=paragraph;
CGFloat y=NSMidY(self.bounds)-(self.font?:[NSFont systemFontOfSize:11]).pointSize*.62;
[(self.pullsDown?[self itemAtIndex:0].title:(self.selectedItem.title?:@""))drawInRect:NSMakeRect(9,y,MAX(0,self.bounds.size.width-29),18) withAttributes:attributes];
[@"⌄" drawInRect:NSMakeRect(self.bounds.size.width-20,y,13,18) withAttributes:attributes];
if(self.window.firstResponder==self){[DYThemeColor(@"accent")setStroke];path.lineWidth=2;[path stroke];}
}
@end
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.8.1</string>
<string>1.8.2</string>
<key>CFBundleVersion</key>
<string>57</string>
<string>59</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
@@ -71,7 +71,7 @@
<key>uuid</key>
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
<key>version</key>
<string>1.8.1</string>
<string>1.8.2</string>
</dict>
<dict>
<key>className</key>
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.8.1</string>
<string>1.8.2</string>
<key>CFBundleVersion</key>
<string>57</string>
<string>59</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>