From c660404b3ed5f8fb67e0786579a0e2e4fa8153fc Mon Sep 17 00:00:00 2001 From: Olaf Schulz Date: Wed, 13 Nov 2019 11:37:00 +0100 Subject: [PATCH] Minor changes and svg source for layer added. --- Makefile | 3 +- assets/svg/convert_svg.py | 72 + assets/svg/info.txt | 7 + assets/svg/tastatur_neo_alle_Ebenen.svg | 18065 ++++++++++++++++++++++ release | 2 +- src/main.vala | 2 +- src/neo-window.vala | 2 +- 7 files changed, 18149 insertions(+), 4 deletions(-) create mode 100755 assets/svg/convert_svg.py create mode 100644 assets/svg/info.txt create mode 100644 assets/svg/tastatur_neo_alle_Ebenen.svg diff --git a/Makefile b/Makefile index f66ef24..d2a7fa4 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,8 @@ UBUNTU ?= 0 DISTDIR = dist TMPDIR = tmp -ARCHS = amd64 # i386 # armhf arm64 +# ARCHS = amd64 # i386 # armhf arm64 +ARCHS = amd64 i386 # armhf arm64 BASETGZ_DIR = /var/cache/pbuilder ifeq ($(UBUNTU),1) diff --git a/assets/svg/convert_svg.py b/assets/svg/convert_svg.py new file mode 100755 index 0000000..b751f6e --- /dev/null +++ b/assets/svg/convert_svg.py @@ -0,0 +1,72 @@ +#!/usr/bin/python3 +# +# Helper script to generate images of all layers. +# Note that the svg file contain all layers, but they +# are hidden. +# + +import os +import os.path +import sys + +SIZE = r"-resize 2000\!x" # Fixed width +INPUT_SVG = "tastatur_neo_alle_Ebenen.svg" +CONVERT_ARGS = "-background transparent" + +LAYER_NAMES = "Ebene 1|Ebene 2|Ebene 3|Ebene 4|Ebene 5|Ebene 6".split("|") + +def gen_pngs(): + try: + if not os.path.isdir("out"): + os.mkdir("out") + except Exception as e: + print(e) + + + for layer_name in LAYER_NAMES: + print(layer_name) + cmd1 = r'''\ + sed "/inkscape:label=\"{layer_name}\"/ {{ \ + N; s/display:none/display:inline/ }} " \ + "{input_svg}" > tmp.svg'''.format( + layer_name=layer_name, + input_svg=INPUT_SVG, + ) + + print(cmd1) + os.system(cmd1) + + cmd2 = r'''\ + convert {convert_args} "tmp.svg" {size} \ + "out/tastatur_neo_{l}.png"'''.format( + convert_args=CONVERT_ARGS, + size=SIZE, + l=layer_name.replace(" ", ""), + ) + + print(cmd2) + os.system(cmd2) + + break + +def update_pngs(): + # Put symbols on cursor keys and block above cursors + # Use keys from layer 3/4 with the same character/function. + for layer_name in LAYER_NAMES: + + + break + + # TODO Hm, im map_viewer schauen, wie man Bilder zusammensetzt. + + + +def clean(): + if os.path.isfile("tmp.svg"): + os.unlink("tmp.svg") + + +if __name__ == "__main__": + # gen_pngs() + update_pngs() + clean() diff --git a/assets/svg/info.txt b/assets/svg/info.txt new file mode 100644 index 0000000..f4425a7 --- /dev/null +++ b/assets/svg/info.txt @@ -0,0 +1,7 @@ +convert_svg.sh erstellt PNGs, aber diese enthalten keine +Reihe mit Funktionstasten. + + +Quelle: +https://github.com/neo-layout/neo-layout/grafik/tastatur3d + diff --git a/assets/svg/tastatur_neo_alle_Ebenen.svg b/assets/svg/tastatur_neo_alle_Ebenen.svg new file mode 100644 index 0000000..d773985 --- /dev/null +++ b/assets/svg/tastatur_neo_alle_Ebenen.svg @@ -0,0 +1,18065 @@ + + + + + Neo-Tastaturlayout + + + + image/svg+xml + + 3D-Darstellung der Belegung des Neo-Layouts + Neo-Tastaturlayout + + + + Martin Engel + + + + + N/A + + + + + NEO + tastatur3d + + + N/A + + + Matthias Berg, Martin Roppelt, Dennis Heidsiek, Benjamin Kellermann + + + 16. Juni 2008 + de + https://svn.neo-layout.org/grafik/tastatur3d/tastatur_neo_alle_Ebenen.svg + https://svn.neo-layout.org/A-REFERENZ-A/neo20.txt + + + Urheber und Mitwirkende + + + alle Ebenen einzeln einblendbar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _ + _ + + + + + + + + + + + diff --git a/release b/release index 881b70d..7b86337 100755 --- a/release +++ b/release @@ -168,7 +168,7 @@ perform_release() { git commit -m "[release] Prepare next development version" --allow-empty && \ git push && \ git push origin $new_version_tag && \ - gh_upload_release $new_version_tag dist/* && \ + gh_upload_release $new_version_tag dist/*$new_version* && \ rm release_info #TODO: Provide changelog to gh_upload_release } || { diff --git a/src/main.vala b/src/main.vala index 52d75da..3aa456c 100644 --- a/src/main.vala +++ b/src/main.vala @@ -62,7 +62,7 @@ namespace NeoLayoutViewer{ var monitor_shortcut = configm.getConfig().get("monitor_shortcut").strip(); string tmp = ""; - if (show_shortcut == monitor_shortcut && false) { + if (show_shortcut == monitor_shortcut) { tmp = "Monitor wechseln/Ausblenden - %s".printf(show_shortcut); } else { tmp = """Ein-/Ausblenden - %s diff --git a/src/neo-window.vala b/src/neo-window.vala index ac61a8e..f6ea4ca 100644 --- a/src/neo-window.vala +++ b/src/neo-window.vala @@ -539,7 +539,7 @@ namespace NeoLayoutViewer { } public Gdk.Pixbuf open_image (int layer) { - var bildpfad = @"$(config.get("asset_folder"))/neo2.0/tastatur_neo_Ebene$(layer).png"; + var bildpfad = @"$(config.get("asset_folder"))/neo2.0_hires/tastatur_neo_Ebene$(layer).png"; return open_image_str(bildpfad); }