From 36adf8029a0e4bd8c5cec3c295e570b17b674d48 Mon Sep 17 00:00:00 2001 From: yyc12345 Date: Tue, 8 Sep 2026 22:13:59 +0800 Subject: [PATCH] feat: change src layout and write license infos --- src/LICENSES.toml | 40 +++++++++++++++++++ src/app/sarasacw-picture/LICENSES.toml | 0 src/apps/LICENSES.toml | 9 +++++ src/{ext => }/bitmap/LICENSES.toml | 0 src/component/LICENSES.toml | 24 ++++++++--- .../nostd_icons/application_icons.py | 4 +- .../nostd_icons/mimetype_icons.py | 17 +------- .../std_icons/action_icons.py | 6 +-- .../std_icons/components.py | 14 +++++++ 9 files changed, 87 insertions(+), 27 deletions(-) delete mode 100644 src/app/sarasacw-picture/LICENSES.toml create mode 100644 src/apps/LICENSES.toml rename src/{ext => }/bitmap/LICENSES.toml (100%) diff --git a/src/LICENSES.toml b/src/LICENSES.toml index 132beb8..d79539d 100644 --- a/src/LICENSES.toml +++ b/src/LICENSES.toml @@ -1,3 +1,19 @@ +[[licenses]] +file = 'go-base.svg' +license = "CC-BY-SA-4.0" +authors = ["yyc12345"] + +[[licenses]] +file = 'go-inner-shining.svg' +license = "CC-BY-SA-4.0" +authors = ["yyc12345"] + +[[licenses]] +file = 'go-inner.svg' +license = "Apache-2.0" +authors = ["Google", "yyc12345"] +source = 'https://github.com/google/material-design-icon' + [[licenses]] file = 'object-flip-horizontal.svg' license = "LGPL-2.1-only" @@ -21,3 +37,27 @@ file = 'object-rotate-right.svg' license = "LGPL-2.1-only" authors = ["KDE Oxygen Icon Theme Team", "yyc12345"] source = 'https://invent.kde.org/frameworks/oxygen-icons' + +[[licenses]] +file = 'object-rotate-right.svg' +license = "LGPL-2.1-only" +authors = ["KDE Oxygen Icon Theme Team", "yyc12345"] +source = 'https://invent.kde.org/frameworks/oxygen-icons' + +[[licenses]] +file = 'dialog-infomation.svg' +license = "LGPL-2.1-only" +authors = ["KDE Oxygen Icon Theme Team", "yyc12345"] +source = 'https://invent.kde.org/frameworks/oxygen-icons' + +[[licenses]] +file = 'dialog-warning.svg' +license = "LGPL-2.1-only" +authors = ["KDE Oxygen Icon Theme Team", "yyc12345"] +source = 'https://invent.kde.org/frameworks/oxygen-icons' + +[[licenses]] +file = 'dialog-error.svg' +license = "LGPL-2.1-only" +authors = ["KDE Oxygen Icon Theme Team"] +source = 'https://invent.kde.org/frameworks/oxygen-icons' diff --git a/src/app/sarasacw-picture/LICENSES.toml b/src/app/sarasacw-picture/LICENSES.toml deleted file mode 100644 index e69de29..0000000 diff --git a/src/apps/LICENSES.toml b/src/apps/LICENSES.toml new file mode 100644 index 0000000..6b05d9a --- /dev/null +++ b/src/apps/LICENSES.toml @@ -0,0 +1,9 @@ +[[licenses]] +file = 'sarasacw-picture-frame.svg' +license = "CC-BY-SA-4.0" +authors = ["yyc12345"] + +[[licenses]] +file = 'notepad.blend' +license = "CC-BY-SA-4.0" +authors = ["yyc12345"] diff --git a/src/ext/bitmap/LICENSES.toml b/src/bitmap/LICENSES.toml similarity index 100% rename from src/ext/bitmap/LICENSES.toml rename to src/bitmap/LICENSES.toml diff --git a/src/component/LICENSES.toml b/src/component/LICENSES.toml index 75cc647..a0d0aac 100644 --- a/src/component/LICENSES.toml +++ b/src/component/LICENSES.toml @@ -1,20 +1,32 @@ [[licenses]] -file = 'go-base.svg' +file = 'image-base.svg' license = "CC-BY-SA-4.0" authors = ["yyc12345"] [[licenses]] -file = 'go-inner-shining.svg' +file = 'generic-background.svg' license = "CC-BY-SA-4.0" authors = ["yyc12345"] [[licenses]] -file = 'go-inner.svg' +file = 'triangle.svg' +license = "Apache-2.0" +authors = ["Austin Andrews", "yyc12345"] +source = 'https://pictogrammers.com/library/mdi/icon/menu-left/' + +[[licenses]] +file = 'magnifying-glass.blend' +license = "CC-BY-SA-4.0" +authors = ["yyc12345"] + +[[licenses]] +file = 'minus.svg' license = "Apache-2.0" authors = ["Google", "yyc12345"] source = 'https://github.com/google/material-design-icon' [[licenses]] -file = 'notepad.blend' -license = "CC-BY-SA-4.0" -authors = ["yyc12345"] +file = 'plus.svg' +license = "Apache-2.0" +authors = ["Google", "yyc12345"] +source = 'https://github.com/google/material-design-icon' diff --git a/tool/src/aurora_iconset_builder/nostd_icons/application_icons.py b/tool/src/aurora_iconset_builder/nostd_icons/application_icons.py index e306469..781828a 100644 --- a/tool/src/aurora_iconset_builder/nostd_icons/application_icons.py +++ b/tool/src/aurora_iconset_builder/nostd_icons/application_icons.py @@ -20,7 +20,7 @@ def register(ctx: AuroraContext) -> None: ctx.register( "nostd/application/org.sarasachipworkshop.picture", ( - SvgSource("app", "sarasacw-picture", "app-frame.svg"), + SvgSource("apps", "sarasacw-picture-frame.svg"), TempArtSource("image-jpeg.png"), NewArtSource(), FdArtSink(FdContext.Applications, "org.sarasachipworkshop.picture"), @@ -32,7 +32,7 @@ def register(ctx: AuroraContext) -> None: ctx.register( "nostd/application/notepad", ( - BlenderSource("app", "notepad.blend"), + BlenderSource("apps", "notepad.blend"), TempArtSink("notepad.png"), WinArtSink(WinCategory.Application, "notepad"), ), diff --git a/tool/src/aurora_iconset_builder/nostd_icons/mimetype_icons.py b/tool/src/aurora_iconset_builder/nostd_icons/mimetype_icons.py index ae0bc0e..2101cc9 100644 --- a/tool/src/aurora_iconset_builder/nostd_icons/mimetype_icons.py +++ b/tool/src/aurora_iconset_builder/nostd_icons/mimetype_icons.py @@ -13,19 +13,11 @@ from ..assemblicon.lowlevel.artproc import ( def register(ctx: AuroraContext) -> None: - ctx.register( - "component/image-base", - ( - SvgSource("component", "image-base.svg"), - TempArtSink("component", "image-base.png"), - ), - build_image_base_icon, - ) ctx.register( "nostd/mimetype/image-jpeg", ( TempArtSource("component", "image-base.png"), - BitmapSource("ext", "bitmap", "Niinsaare_järv.jpg"), + BitmapSource("bitmap", "Niinsaare_järv.jpg"), TempArtSink("image-jpeg.png"), FdArtSink(FdContext.MimeTypes, "image-jpeg"), WinArtSink(WinCategory.Extension, "jpg"), @@ -37,13 +29,6 @@ def register(ctx: AuroraContext) -> None: IMAGE_INNER_RECT = Rectangle(Point(20 * 4, 52 * 4), Point(236 * 4, 204 * 4)) - -def build_image_base_icon( - env: AuroraEnvironment, src: SvgSource, sink: TempArtSink -) -> None: - src.pull_to_temp(env, sink) - - def build_image_jpeg_icon( env: AuroraEnvironment, base_src: TempArtSource, diff --git a/tool/src/aurora_iconset_builder/std_icons/action_icons.py b/tool/src/aurora_iconset_builder/std_icons/action_icons.py index 640a226..02b5e57 100644 --- a/tool/src/aurora_iconset_builder/std_icons/action_icons.py +++ b/tool/src/aurora_iconset_builder/std_icons/action_icons.py @@ -11,9 +11,9 @@ def register(ctx: AuroraContext) -> None: ctx.register( "std/action/go-[previous|down|next|up]", ( - SvgSource("component", "go-base.svg"), - SvgSource("component", "go-inner-shining.svg"), - SvgSource("component", "go-inner.svg"), + SvgSource("go-base.svg"), + SvgSource("go-inner-shining.svg"), + SvgSource("go-inner.svg"), FdArtSink(FdContext.Actions, "go-previous"), FdArtSink(FdContext.Actions, "go-down"), FdArtSink(FdContext.Actions, "go-next"), diff --git a/tool/src/aurora_iconset_builder/std_icons/components.py b/tool/src/aurora_iconset_builder/std_icons/components.py index 6f75418..cec9581 100644 --- a/tool/src/aurora_iconset_builder/std_icons/components.py +++ b/tool/src/aurora_iconset_builder/std_icons/components.py @@ -18,6 +18,14 @@ def register(ctx: AuroraContext) -> None: ), build_generic_background, ) + ctx.register( + "component/image-base", + ( + SvgSource("component", "image-base.svg"), + TempArtSink("component", "image-base.png"), + ), + build_image_base_icon, + ) ctx.register( "component/triangles", ( @@ -59,6 +67,12 @@ def build_generic_background( src.pull_to_temp(env, sink) +def build_image_base_icon( + env: AuroraEnvironment, src: SvgSource, sink: TempArtSink +) -> None: + src.pull_to_temp(env, sink) + + def build_triangle_icons( env: AuroraEnvironment, tri_src: SvgSource,