From 59d3d926e816d2d57b00c8c0930880eec82905f3 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 20 Jun 2024 03:18:58 +0200 Subject: [PATCH 1/3] misc/cirun: add comments on howto run and view electron inside docker Signed-off-by: Tim Janik --- misc/cirun | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/misc/cirun b/misc/cirun index 019536c0..9c2865c9 100755 --- a/misc/cirun +++ b/misc/cirun @@ -57,7 +57,12 @@ fi # Sense interactive TTY support, prepare $RUN tty -s && INTERACTIVE=-i || INTERACTIVE= -RUN="docker run $INTERACTIVE -t --rm -v $PWD:/cirun -w /cirun cirun:$CITAG" +RUN="docker run $INTERACTIVE -t --rm -v $PWD:/cirun" +#RUN="$RUN -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro -v $HOME/.Xauthority:/home/builder/.Xauthority:ro" # X11 connect +#RUN="$RUN --net host" # needed to connect to AnklangSynthEngine *outside* docker +#RUN="$RUN -e DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS -v /run/user/1000/bus:/run/user/1000/bus -v /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket" +#RUN="$RUN --privileged --cap-add SYS_ADMIN --device /dev/fuse -v /var/run/docker.sock:/var/run/docker.sock" # run as root with fuse, docker +RUN="$RUN -w /cirun cirun:$CITAG" # Change ownership, needed if the caller of this script has $UID different from the Dockerfile USER test -z "$CHOWNID" || { From b8a4961e6378dce7a2b3d10bbb30c8481357f9bf Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 21 Jun 2024 12:31:18 +0200 Subject: [PATCH 2/3] ui/startup.js: open project state grep dialog on Alt+F12 Signed-off-by: Tim Janik --- ui/startup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/startup.js b/ui/startup.js index fba519ca..a2115221 100644 --- a/ui/startup.js +++ b/ui/startup.js @@ -62,8 +62,8 @@ function window_keydown (event) // Shift+Ctrl+I for devTools if (event.keyCode == 73 && event.shiftKey && event.ctrlKey && window.Electron) window.Electron.call ('toggle_dev_tools'); - // F12 fro __DEV__ mode test results - if (event.keyCode == 123 /*F12*/ && !event.shiftKey && !event.ctrlKey && __DEV__) + // Alt+F12 for project state grep dialog + if (event.keyCode == 123 /*F12*/ && event.altKey && !event.shiftKey && !event.ctrlKey) (async () => { if (!grep_dialog) grep_dialog = await import ('/grepdialog.js'); From a111f64bf303b824c4e78c483b086494d17192b9 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 21 Jun 2024 12:31:48 +0200 Subject: [PATCH 3/3] x11test/trackrename.json: hit Alt+F12 for project state grep dialog Signed-off-by: Tim Janik --- x11test/trackrename.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/x11test/trackrename.json b/x11test/trackrename.json index 6d31edd2..ab2a70d4 100644 --- a/x11test/trackrename.json +++ b/x11test/trackrename.json @@ -133,13 +133,23 @@ { "type": "keyDown", "target": "main", - "key": "F12" + "key": "Alt" }, { - "type": "keyUp", + "type": "keyDown", "target": "main", "key": "F12" }, + { + "type": "keyUp", + "key": "F12", + "target": "main" + }, + { + "type": "keyUp", + "key": "Alt", + "target": "main" + }, { "type": "change", "value": "(?s)\"tracks\":.*\"name\":\\s*\"(Master2)\"",