From b3d8abcb2cea3787386cd1e403ee0b36012d0f5c Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Thu, 20 Nov 2025 22:55:38 +0100 Subject: [PATCH] Build: provide and install a lumiera.desktop file The XDG Desktop spec is accepted universally, and thus the old Debian-specific 'menu' system is deprecated and no longer engaged automatically. See: https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html Thus we'll now provide a Desktop file and install that already from out SCons build system, together with a suitable variation of the Lumiera icon. TODO: not sure if everything was done the correct way * do we need to ''register'' the new file in some way (preinst script?) * the menu entry shows up, but not the icon * but if we put an absolute path for the lumiera.svg into the desktop file, it shows up Remark: in later experiments with package building, the menu entry and the icon showed up in the menu. Not sure if this requires a reboot or some similar trigger (like restart of the destkop) --- admin/scons/LumieraEnvironment.py | 5 +- data/SConscript | 4 + data/desktop/lumiera.desktop | 13 +++ data/desktop/lumiera.svg | 146 +++++++++++++++++++++++++++++ wiki/thinkPad.ichthyo.mm | 150 +++++++++++++++++++++++++++++- 5 files changed, 311 insertions(+), 7 deletions(-) create mode 100644 data/desktop/lumiera.desktop create mode 100644 data/desktop/lumiera.svg diff --git a/admin/scons/LumieraEnvironment.py b/admin/scons/LumieraEnvironment.py index e85dbee62..99a10199f 100644 --- a/admin/scons/LumieraEnvironment.py +++ b/admin/scons/LumieraEnvironment.py @@ -36,6 +36,7 @@ class LumieraEnvironment(Environment): self['TARGDIR'] = buildSetup.TARGDIR self['VERSION'] = buildSetup.VERSION self['DESTDIR'] = '$INSTALLDIR/$PREFIX' + self['SHARE' ] = '$DESTDIR/share' self._anchor_relative('INSTALLDIR') self._anchor_relative('TARGDIR') # @@ -169,7 +170,7 @@ def register_LumieraResourceBuilder(env): return env.Install(toBuild, source) def GuiResource(env, source): - """ pick up giben source resource and install + """ pick up given source resource and install them (flat) into the configured target """ toBuild = env.path.buildUIRes @@ -179,7 +180,7 @@ def register_LumieraResourceBuilder(env): def ConfigData(env, prefix, source, targetDir=None): """ install (copy) configuration- and metadata. - @param targetDir: when None, then use he install location configured (in SConstruct), + @param targetDir: when None, then use he install location configured (in Setup.py), otherwise an explicitly given absolute or relative path segment, which might refer to the location of the executable through the $ORIGIN token @param prefix: a prefix relative to the current path (location of SConscript), diff --git a/data/SConscript b/data/SConscript index d2407b502..e04d5f2fa 100644 --- a/data/SConscript +++ b/data/SConscript @@ -21,5 +21,9 @@ config = ( env.ConfigData('config','setup.ini', targetDir='$ORIGIN') + env.ConfigData('config','dummy_lumiera.ini') ) +#further resources... +env.Install('$SHARE/applications/' , 'desktop/lumiera.desktop') +env.Install('$SHARE/icons/hicolor/scalable/apps/', 'desktop/lumiera.svg') + Export('icons config') diff --git a/data/desktop/lumiera.desktop b/data/desktop/lumiera.desktop new file mode 100644 index 000000000..771d6d0a5 --- /dev/null +++ b/data/desktop/lumiera.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Version=1.5 +Name=Lumiera +Comment=Video editing and compositing (unfinished; development preview) +GenericName=VideoEditor +Exec=lumiera +TryExec=lumiera +Icon=lumiera +Terminal=false +Categories=AudioVideo;Video;AudioVideoEditing; +Keywords=media;film;editing;compositing;fx; + diff --git a/data/desktop/lumiera.svg b/data/desktop/lumiera.svg new file mode 100644 index 000000000..bcf70b504 --- /dev/null +++ b/data/desktop/lumiera.svg @@ -0,0 +1,146 @@ + + + + + Lumiera Icon + + + + image/svg+xml + + + Lumiera Icon + August 2009 + + + Thorsten Wilms + + + + + CC By SA + + + + + Lumiera project + + + Lumiera Logo + After the Lumiera Logo contest, several flavours were created for use on posters, T-shirts and desktop icons + + + Raffaella Traniello, Thorsten Wilms, Odin Hørthe Omdal, Ichthyoste + + + + + + + + + + + + + + + + + + + + + diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 7abeb096c..adc960272 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -177763,8 +177763,8 @@ Since then others have made contributions, see the log for the history. - + @@ -180626,15 +180626,15 @@ Since then others have made contributions, see the log for the history. - + - + - + @@ -180647,8 +180647,17 @@ Since then others have made contributions, see the log for the history. - + + + + + + + + + + @@ -180892,6 +180901,137 @@ Since then others have made contributions, see the log for the history. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ Bei den GUI-Icons gibt es ein app-icon.svg — aber das sieht unfertig/kaputt aus; vermutlich hat sich da Joel damals daran versucht, aber er ist daran gescheitert, daß das Lumiera-Logo sich nicht ohne Weiteres in ein Icon übersetzen läßt. Außerdem folgen diese SVGs ja einem ganz bestimmten Schema, und enthalten daher mehrere Varianten auf einem gemeinsamen »Canvas« +

+ + + + + + + + + +

+ Tja... damals hat man zwar ein Lumiera-Logo designt — aber dann würde noch die Arbeit ausstehen, daraus eine Design-Linie zu entwickeln, die in verschiedensten Größen und in verschiedenem Umfeld konsistent funktioniert. Und ersatzweise hat dann jeder für jeden Einzelfall seine Variante gebastelt (und ich mach ja auch nix Anderes) +

+ + + + + + + + + + + + + + +

+ Deklarativität setzt etablierte Kategorien vorraus +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +