diff --git a/odfstudio/branding/linux/generate-icons.py b/odfstudio/branding/linux/generate-icons.py index 407550405826..200e9bdad631 100755 --- a/odfstudio/branding/linux/generate-icons.py +++ b/odfstudio/branding/linux/generate-icons.py @@ -5,9 +5,18 @@ import shutil import subprocess from pathlib import Path -ICONS = ("main", "startcenter") SIZES = (16, 24, 32, 48, 64, 128, 256, 512) +ICONS = { + "soffice.svg": ("main", "startcenter"), + "writer.svg": ("writer",), + "calc.svg": ("calc",), + "draw.svg": ("draw",), + "impress.svg": ("impress",), + "base.svg": ("base",), + "math.svg": ("math",), +} + def main(): parser = argparse.ArgumentParser() @@ -17,41 +26,45 @@ def main(): here = Path(__file__).resolve().parent root = here.parent.parent.parent - source = root / "odfstudio" / "branding" / "windows" / "soffice.svg" + source_dir = root / "odfstudio" / "branding" / "windows" destination = root / "sysui" / "desktop" / "icons" / "hicolor" - - if not source.exists(): - raise SystemExit(f"Missing SVG: {source}") - inkscape = shutil.which(args.inkscape) if not inkscape: raise SystemExit(f"Inkscape not found: {args.inkscape}") - for size in SIZES: - appdir = destination / f"{size}x{size}" / "apps" + for svg_name, names in ICONS.items(): + source = source_dir / svg_name - for name in ICONS: - output = appdir / f"{name}.png" + if not source.exists(): + raise SystemExit(f"Missing SVG: {source}") - subprocess.run([ - inkscape, - str(source), - "--export-type=png", - f"--export-filename={output}", - f"--export-width={size}", - f"--export-height={size}", - "--export-background-opacity=0", - ], check=True) + print(f"{svg_name}: {', '.join(names)}") - print(f"written: {output}") + for size in SIZES: + appdir = destination / f"{size}x{size}" / "apps" - scalable = destination / "scalable" / "apps" + for name in names: + output = appdir / f"{name}.png" - for name in ICONS: - output = scalable / f"{name}.svg" - shutil.copyfile(source, output) - print(f"written: {output}") + subprocess.run([ + inkscape, + str(source), + "--export-type=png", + f"--export-filename={output}", + f"--export-width={size}", + f"--export-height={size}", + "--export-background-opacity=0", + ], check=True) + + print(f" written: {output}") + + scalable = destination / "scalable" / "apps" + + for name in names: + output = scalable / f"{name}.svg" + shutil.copyfile(source, output) + print(f" written: {output}") print("Done.") diff --git a/sysui/desktop/icons/hicolor/128x128/apps/base.png b/sysui/desktop/icons/hicolor/128x128/apps/base.png index 417ae6f35e50..c4eed34ea7b5 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/base.png and b/sysui/desktop/icons/hicolor/128x128/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/calc.png b/sysui/desktop/icons/hicolor/128x128/apps/calc.png index ac5842a0c7b2..6e6e1fd01089 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/calc.png and b/sysui/desktop/icons/hicolor/128x128/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/draw.png b/sysui/desktop/icons/hicolor/128x128/apps/draw.png index 87775924b493..93888f4892e2 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/draw.png and b/sysui/desktop/icons/hicolor/128x128/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/impress.png b/sysui/desktop/icons/hicolor/128x128/apps/impress.png index 4aa51e13be49..260b36a44647 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/impress.png and b/sysui/desktop/icons/hicolor/128x128/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/math.png b/sysui/desktop/icons/hicolor/128x128/apps/math.png index 60052ca3b9ad..ba1669591961 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/math.png and b/sysui/desktop/icons/hicolor/128x128/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/128x128/apps/writer.png b/sysui/desktop/icons/hicolor/128x128/apps/writer.png index 20f4bdcdbe83..4b043bbd0b65 100644 Binary files a/sysui/desktop/icons/hicolor/128x128/apps/writer.png and b/sysui/desktop/icons/hicolor/128x128/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/base.png b/sysui/desktop/icons/hicolor/16x16/apps/base.png index cdc1f493b8c9..b78b017f017a 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/base.png and b/sysui/desktop/icons/hicolor/16x16/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/calc.png b/sysui/desktop/icons/hicolor/16x16/apps/calc.png index 975b778bac29..82e24cbe0fc0 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/calc.png and b/sysui/desktop/icons/hicolor/16x16/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/draw.png b/sysui/desktop/icons/hicolor/16x16/apps/draw.png index e7112b34fee1..36d48cbae244 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/draw.png and b/sysui/desktop/icons/hicolor/16x16/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/impress.png b/sysui/desktop/icons/hicolor/16x16/apps/impress.png index 31c5a98e22d7..d2b8eb76d4b7 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/impress.png and b/sysui/desktop/icons/hicolor/16x16/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png b/sysui/desktop/icons/hicolor/16x16/apps/math.png index 5f7a5df7874e..42c6f1b09e85 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/math.png and b/sysui/desktop/icons/hicolor/16x16/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/16x16/apps/writer.png b/sysui/desktop/icons/hicolor/16x16/apps/writer.png index da3acc402b36..8172d08848aa 100644 Binary files a/sysui/desktop/icons/hicolor/16x16/apps/writer.png and b/sysui/desktop/icons/hicolor/16x16/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/24x24/apps/base.png b/sysui/desktop/icons/hicolor/24x24/apps/base.png index 6f258d714120..08739737f27c 100644 Binary files a/sysui/desktop/icons/hicolor/24x24/apps/base.png and b/sysui/desktop/icons/hicolor/24x24/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/24x24/apps/calc.png b/sysui/desktop/icons/hicolor/24x24/apps/calc.png index a3b37379ff1a..7019e38cbfad 100644 Binary files a/sysui/desktop/icons/hicolor/24x24/apps/calc.png and b/sysui/desktop/icons/hicolor/24x24/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/24x24/apps/draw.png b/sysui/desktop/icons/hicolor/24x24/apps/draw.png index d77b7e9eee46..dbdc08616b60 100644 Binary files a/sysui/desktop/icons/hicolor/24x24/apps/draw.png and b/sysui/desktop/icons/hicolor/24x24/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/24x24/apps/impress.png b/sysui/desktop/icons/hicolor/24x24/apps/impress.png index 52645bc3f970..15e8ff685fe7 100644 Binary files a/sysui/desktop/icons/hicolor/24x24/apps/impress.png and b/sysui/desktop/icons/hicolor/24x24/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/24x24/apps/math.png b/sysui/desktop/icons/hicolor/24x24/apps/math.png index 50fa882880cf..9f3df3d41c76 100644 Binary files a/sysui/desktop/icons/hicolor/24x24/apps/math.png and b/sysui/desktop/icons/hicolor/24x24/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/24x24/apps/writer.png b/sysui/desktop/icons/hicolor/24x24/apps/writer.png index 7bef2ec7be23..43ecb837aa4b 100644 Binary files a/sysui/desktop/icons/hicolor/24x24/apps/writer.png and b/sysui/desktop/icons/hicolor/24x24/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/base.png b/sysui/desktop/icons/hicolor/256x256/apps/base.png index 265ffcb67c65..7434432116ce 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/base.png and b/sysui/desktop/icons/hicolor/256x256/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/calc.png b/sysui/desktop/icons/hicolor/256x256/apps/calc.png index 240da6c8966d..d9b0430b07d3 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/calc.png and b/sysui/desktop/icons/hicolor/256x256/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/draw.png b/sysui/desktop/icons/hicolor/256x256/apps/draw.png index 8b8436789cc2..280e0207a534 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/draw.png and b/sysui/desktop/icons/hicolor/256x256/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/impress.png b/sysui/desktop/icons/hicolor/256x256/apps/impress.png index 2de82d6bd42b..224188e2530d 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/impress.png and b/sysui/desktop/icons/hicolor/256x256/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/math.png b/sysui/desktop/icons/hicolor/256x256/apps/math.png index 7fc3db25ac2e..2ddbcb5d8d56 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/math.png and b/sysui/desktop/icons/hicolor/256x256/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/256x256/apps/writer.png b/sysui/desktop/icons/hicolor/256x256/apps/writer.png index 6cc9e8483033..7659ba9f0b86 100644 Binary files a/sysui/desktop/icons/hicolor/256x256/apps/writer.png and b/sysui/desktop/icons/hicolor/256x256/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/32x32/apps/base.png b/sysui/desktop/icons/hicolor/32x32/apps/base.png index 45e3145d5241..e42c4f15d0a1 100644 Binary files a/sysui/desktop/icons/hicolor/32x32/apps/base.png and b/sysui/desktop/icons/hicolor/32x32/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/32x32/apps/calc.png b/sysui/desktop/icons/hicolor/32x32/apps/calc.png index a2c4981e087f..960829209b48 100644 Binary files a/sysui/desktop/icons/hicolor/32x32/apps/calc.png and b/sysui/desktop/icons/hicolor/32x32/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/32x32/apps/draw.png b/sysui/desktop/icons/hicolor/32x32/apps/draw.png index f36ea727e122..02ce246f2ff7 100644 Binary files a/sysui/desktop/icons/hicolor/32x32/apps/draw.png and b/sysui/desktop/icons/hicolor/32x32/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/32x32/apps/impress.png b/sysui/desktop/icons/hicolor/32x32/apps/impress.png index 3d8dd34b8eae..4c0da57805bb 100644 Binary files a/sysui/desktop/icons/hicolor/32x32/apps/impress.png and b/sysui/desktop/icons/hicolor/32x32/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/32x32/apps/math.png b/sysui/desktop/icons/hicolor/32x32/apps/math.png index a69271c651e9..20ef7b9875d0 100644 Binary files a/sysui/desktop/icons/hicolor/32x32/apps/math.png and b/sysui/desktop/icons/hicolor/32x32/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/32x32/apps/writer.png b/sysui/desktop/icons/hicolor/32x32/apps/writer.png index 202d29359998..4929e6d7fdbe 100644 Binary files a/sysui/desktop/icons/hicolor/32x32/apps/writer.png and b/sysui/desktop/icons/hicolor/32x32/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/48x48/apps/base.png b/sysui/desktop/icons/hicolor/48x48/apps/base.png index 13c1a01bbb78..423e10e8fa9e 100644 Binary files a/sysui/desktop/icons/hicolor/48x48/apps/base.png and b/sysui/desktop/icons/hicolor/48x48/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/48x48/apps/calc.png b/sysui/desktop/icons/hicolor/48x48/apps/calc.png index 2871568b9a92..f1a8daaae528 100644 Binary files a/sysui/desktop/icons/hicolor/48x48/apps/calc.png and b/sysui/desktop/icons/hicolor/48x48/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/48x48/apps/draw.png b/sysui/desktop/icons/hicolor/48x48/apps/draw.png index 6e226a2982c7..04645c7748f1 100644 Binary files a/sysui/desktop/icons/hicolor/48x48/apps/draw.png and b/sysui/desktop/icons/hicolor/48x48/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/48x48/apps/impress.png b/sysui/desktop/icons/hicolor/48x48/apps/impress.png index 8968d5865790..0374adcfcc11 100644 Binary files a/sysui/desktop/icons/hicolor/48x48/apps/impress.png and b/sysui/desktop/icons/hicolor/48x48/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/48x48/apps/math.png b/sysui/desktop/icons/hicolor/48x48/apps/math.png index af1c1714ee3f..54b0dbad7652 100644 Binary files a/sysui/desktop/icons/hicolor/48x48/apps/math.png and b/sysui/desktop/icons/hicolor/48x48/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/48x48/apps/writer.png b/sysui/desktop/icons/hicolor/48x48/apps/writer.png index 89a20be35f63..e89e0b134e20 100644 Binary files a/sysui/desktop/icons/hicolor/48x48/apps/writer.png and b/sysui/desktop/icons/hicolor/48x48/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/512x512/apps/base.png b/sysui/desktop/icons/hicolor/512x512/apps/base.png index de9d1733e8eb..9a27314800c7 100644 Binary files a/sysui/desktop/icons/hicolor/512x512/apps/base.png and b/sysui/desktop/icons/hicolor/512x512/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/512x512/apps/calc.png b/sysui/desktop/icons/hicolor/512x512/apps/calc.png index 1160ce19e1cb..802c37015312 100644 Binary files a/sysui/desktop/icons/hicolor/512x512/apps/calc.png and b/sysui/desktop/icons/hicolor/512x512/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/512x512/apps/draw.png b/sysui/desktop/icons/hicolor/512x512/apps/draw.png index 2f8995f87449..707a00a72bea 100644 Binary files a/sysui/desktop/icons/hicolor/512x512/apps/draw.png and b/sysui/desktop/icons/hicolor/512x512/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/512x512/apps/impress.png b/sysui/desktop/icons/hicolor/512x512/apps/impress.png index 4cdcd6e00980..15c394b6b3b6 100644 Binary files a/sysui/desktop/icons/hicolor/512x512/apps/impress.png and b/sysui/desktop/icons/hicolor/512x512/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/512x512/apps/math.png b/sysui/desktop/icons/hicolor/512x512/apps/math.png index 0ddfe19fef0b..bdf5084f8810 100644 Binary files a/sysui/desktop/icons/hicolor/512x512/apps/math.png and b/sysui/desktop/icons/hicolor/512x512/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/512x512/apps/writer.png b/sysui/desktop/icons/hicolor/512x512/apps/writer.png index 9d987c1f9850..7dcf7a93ca4f 100644 Binary files a/sysui/desktop/icons/hicolor/512x512/apps/writer.png and b/sysui/desktop/icons/hicolor/512x512/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/64x64/apps/base.png b/sysui/desktop/icons/hicolor/64x64/apps/base.png index b8631978479a..518212da4332 100644 Binary files a/sysui/desktop/icons/hicolor/64x64/apps/base.png and b/sysui/desktop/icons/hicolor/64x64/apps/base.png differ diff --git a/sysui/desktop/icons/hicolor/64x64/apps/calc.png b/sysui/desktop/icons/hicolor/64x64/apps/calc.png index 56f612e0ff21..c4c38493c9c5 100644 Binary files a/sysui/desktop/icons/hicolor/64x64/apps/calc.png and b/sysui/desktop/icons/hicolor/64x64/apps/calc.png differ diff --git a/sysui/desktop/icons/hicolor/64x64/apps/draw.png b/sysui/desktop/icons/hicolor/64x64/apps/draw.png index 36f598041097..a8759e6cbf7d 100644 Binary files a/sysui/desktop/icons/hicolor/64x64/apps/draw.png and b/sysui/desktop/icons/hicolor/64x64/apps/draw.png differ diff --git a/sysui/desktop/icons/hicolor/64x64/apps/impress.png b/sysui/desktop/icons/hicolor/64x64/apps/impress.png index ba1643b9f794..4ed9bd851e08 100644 Binary files a/sysui/desktop/icons/hicolor/64x64/apps/impress.png and b/sysui/desktop/icons/hicolor/64x64/apps/impress.png differ diff --git a/sysui/desktop/icons/hicolor/64x64/apps/math.png b/sysui/desktop/icons/hicolor/64x64/apps/math.png index 662110a004c7..54984465141b 100644 Binary files a/sysui/desktop/icons/hicolor/64x64/apps/math.png and b/sysui/desktop/icons/hicolor/64x64/apps/math.png differ diff --git a/sysui/desktop/icons/hicolor/64x64/apps/writer.png b/sysui/desktop/icons/hicolor/64x64/apps/writer.png index 3bd2aa9af483..513333328f19 100644 Binary files a/sysui/desktop/icons/hicolor/64x64/apps/writer.png and b/sysui/desktop/icons/hicolor/64x64/apps/writer.png differ diff --git a/sysui/desktop/icons/hicolor/scalable/apps/base.svg b/sysui/desktop/icons/hicolor/scalable/apps/base.svg index fc03801736d2..552c8c04193c 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/base.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/base.svg @@ -1,3 +1,98 @@ - - - + + diff --git a/sysui/desktop/icons/hicolor/scalable/apps/calc.svg b/sysui/desktop/icons/hicolor/scalable/apps/calc.svg index 5cd60a8f282b..4a693ff0746e 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/calc.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/calc.svg @@ -1,3 +1,98 @@ - - - + + diff --git a/sysui/desktop/icons/hicolor/scalable/apps/draw.svg b/sysui/desktop/icons/hicolor/scalable/apps/draw.svg index 0b0df32efc5a..239fa5318e9a 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/draw.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/draw.svg @@ -1,3 +1,98 @@ - - - + + diff --git a/sysui/desktop/icons/hicolor/scalable/apps/impress.svg b/sysui/desktop/icons/hicolor/scalable/apps/impress.svg index 68be3e689559..f19731456d29 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/impress.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/impress.svg @@ -1,3 +1,98 @@ - - - + + diff --git a/sysui/desktop/icons/hicolor/scalable/apps/math.svg b/sysui/desktop/icons/hicolor/scalable/apps/math.svg index 75afb64a909d..a5a793b2111f 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/math.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/math.svg @@ -1,3 +1,98 @@ - - - + + diff --git a/sysui/desktop/icons/hicolor/scalable/apps/writer.svg b/sysui/desktop/icons/hicolor/scalable/apps/writer.svg index dbf00d3aeb00..65578f4b7554 100644 --- a/sysui/desktop/icons/hicolor/scalable/apps/writer.svg +++ b/sysui/desktop/icons/hicolor/scalable/apps/writer.svg @@ -1,3 +1,110 @@ - + - + +