From 94501c4618e9855c8d4e2745f66dc42b7abae978 Mon Sep 17 00:00:00 2001 From: daboe01 Date: Fri, 25 Mar 2022 19:48:43 +0100 Subject: [PATCH] POC for inline svg standard icons instead of material icons --- AppKit/Themes/Aristo3/ThemeDescriptors.j | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/AppKit/Themes/Aristo3/ThemeDescriptors.j b/AppKit/Themes/Aristo3/ThemeDescriptors.j index fd7be7cf8..59daa0d3a 100644 --- a/AppKit/Themes/Aristo3/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo3/ThemeDescriptors.j @@ -7021,7 +7021,16 @@ var themedButtonValues = nil, // See Cib/_CPCibCustomResource.j and NSCustomResource.j (nib2cib) [@"button-image-plus", [CPImage imageWithMaterialIconNamed:@"add" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,0.85)"]]], [@"button-image-minus", [CPImage imageWithMaterialIconNamed:@"remove" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,0.85)"]]], - [@"button-image-action", [CPImage imageWithMaterialIconNamed:@"settings" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,0.85)"]]], + // [@"button-image-action", [CPImage imageWithMaterialIconNamed:@"settings" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,0.85)"]]], + + [@"button-image-action", [CPImage imageWithCSSDictionary:@{ + @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgaW5rc2NhcGU6dmVyc2lvbj0iMS4wYmV0YTEgKDMyZDQ4MTIsIDIwMTktMDktMTkpIgogICBzb2RpcG9kaTpkb2NuYW1lPSJnZWFyLnN2ZyIKICAgaWQ9InN2ZzEyIgogICB2ZXJzaW9uPSIxLjEiCiAgIHZpZXdCb3g9Ii05IC05IDE4IDE4Ij4KICA8bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGExOCI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGRlZnMKICAgICBpZD0iZGVmczE2IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICBpbmtzY2FwZTpzbmFwLW90aGVycz0iZmFsc2UiCiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnMTIiCiAgICAgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMjUiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjQ3IgogICAgIGlua3NjYXBlOmN5PSIwLjA3MzIyMjY3OSIKICAgICBpbmtzY2FwZTpjeD0iMjYuODkyNzIzIgogICAgIGlua3NjYXBlOnpvb209IjE3LjMwOTE0MSIKICAgICBzaG93Z3JpZD0iZmFsc2UiCiAgICAgaWQ9Im5hbWVkdmlldzE0IgogICAgIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjkwNyIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjE2MDAiCiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIKICAgICBpbmtzY2FwZTpwYWdlb3BhY2l0eT0iMCIKICAgICBndWlkZXRvbGVyYW5jZT0iMTAiCiAgICAgZ3JpZHRvbGVyYW5jZT0iMTAiCiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIKICAgICBib3JkZXJvcGFjaXR5PSIxIgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IgogICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIgLz4KICA8cGF0aAogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgaWQ9InBhdGgxMCIKICAgICBzdHlsZT0iZmlsbC1ydWxlOmV2ZW5vZGQiCiAgICAgZD0ibSAxLjIzMzUzNjUsLTIuMjczMzYyNCAxLjgyLC0wLjM5IDAuNTIsMS4yNyAtMS41NiwxLjAxMDAwMDA0IGEgNC41LDQuNSAwIDAgMSAwLDEuNDU5OTk5OTYgdiAwIGwgMS41NiwxLjAxIC0wLjUyLDEuMjcgLTEuODIsLTAuMzkgYSA0LjUsNC41IDAgMCAxIC0xLjA0MDAwMDAxLDEuMDQgdiAwIGwgMC4zOSwxLjgyIC0xLjI3LDAuNTIgLTEuMDA5OTk5OTksLTEuNTYgYSA0LjUsNC41IDAgMCAxIC0xLjQ2LDAgdiAwIGwgLTEuMDEsMS41NiAtMS4yNywtMC41MiAwLjM5LC0xLjgyIGEgNC41LDQuNSAwIDAgMSAtMS4wNCwtMS4wNCB2IDAgbCAtMS44MiwwLjM5IC0wLjUyLC0xLjI3IDEuNTYsLTEuMDEgYSA0LjUsNC41IDAgMCAxIDAsLTEuNDU5OTk5OTYgdiAwIGwgLTEuNTYsLTEuMDEwMDAwMDQgMC41MiwtMS4yNyAxLjgyLDAuMzkgYSA0LjUsNC41IDAgMCAxIDEuMDQsLTEuMDQgdiAwIGwgLTAuMzksLTEuODIgMS4yNywtMC41MiAxLjAxLDEuNTYgYSA0LjUsNC41IDAgMCAxIDEuNDYsMCB2IDAgbCAxLjAwOTk5OTk5LC0xLjU2IDEuMjcsMC41MiAtMC4zOSwxLjgyIGEgNC41LDQuNSAwIDAgMSAxLjA0MDAwMDAxLDEuMDQgTSAwLjA3MzUzNjQ5LDAuMzQ2NjM3NjQgYSAyLjUsMi41IDAgMCAwIC00Ljk5OTk5OTk5LDAgMi41LDIuNSAwIDAgMCA0Ljk5OTk5OTk5LDAgeiIgLz4KICA8cGF0aAogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgZD0ibSA0LjU3NjY0MSwtMS40MzE3NDQ4IGMgMC42NTY0NDI0LDAuOTY5ODE4MTUgMS4zMzAxNzU4LDEuOTI5NjQ3MTcgMS45MzM3NjA4LDIuOTMzNzg3OSAwLjA2MzkxOSwwLjEzNTY4MyAwLjA5NDAyNSwwLjI0MDU0MzUgMC4xNTU0NzA0LDAuMDU4NTQ0IDAuNTM2MDc4OSwtMS4wMTY3MDE1NCAxLjA3MjE1NzksLTIuMDMzNDAzMTIgMS42MDgyMzY4LC0zLjA1MDEwNDciCiAgICAgc3R5bGU9ImZpbGw6bm9uZTtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MXB4O3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1vcGFjaXR5OjEiCiAgICAgaWQ9InBhdGgyNCIgLz4KPC9zdmc+Cg==')" + } + beforeDictionary:nil + afterDictionary:nil + size:CGSizeMake(16,16)]], + + [@"button-image-plus", [CPImage imageWithMaterialIconNamed:@"add" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,1.00)"]], CPThemeStateHighlighted], [@"button-image-minus", [CPImage imageWithMaterialIconNamed:@"remove" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,1.00)"]], CPThemeStateHighlighted],