forked from QubesOS/qubes-desktop-linux-xfce4
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
First of all Ctrl+Alt+P is too common key combo (for example conflicts with Firefox's "New Private Window"). But even if that wouldn't be true, in the current shape it does more harm than good, because it is not documented (hard to discover when actually needed), and also pause system VMs which in case of sys-usb and USB keyboard is fatal. Lets rethink this first. This reverts commit 9459331. QubesOS/qubes-issues#881 QubesOS/qubes-issues#4101 Fixes QubesOS/qubes-issues#4700
- Loading branch information
Showing
4 changed files
with
47 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| [Desktop Entry] | ||
| Name=Update Qubes specific xfce config | ||
| Exec=/usr/lib/qubes/update-xfce-config | ||
| Terminal=false | ||
| Type=Application | ||
| OnlyShowIn=XFCE; | ||
| StartupNotify=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -e | ||
|
|
||
| UPDATE_CONFIG_DONE_FILE="$HOME/.config/qubes-xfce-config-update" | ||
| UPDATE_CONFIG_DONE=$(cat "$UPDATE_CONFIG_DONE_FILE" 2>/dev/null || echo 0) | ||
|
|
||
| # reset xfconf property if it has given default value | ||
| reset_xfconf_if_default() { | ||
| local channel="$1" | ||
| local prop="$2" | ||
| local default="$3" | ||
| local current | ||
|
|
||
| current=$(xfconf-query -c "$channel" -p "$prop") || return 0 | ||
| if [ "$current" = "$default" ]; then | ||
| xfconf-query -c "$channel" -p "$prop" -r | ||
| fi | ||
| } | ||
|
|
||
| if [ "$UPDATE_CONFIG_DONE" -lt 1 ]; then | ||
| reset_xfconf_if_default \ | ||
| "xfce4-keyboard-shortcuts" \ | ||
| "/commands/custom/<Control><Shift>P" \ | ||
| "qvm-pause --all" | ||
| reset_xfconf_if_default \ | ||
| "xfce4-keyboard-shortcuts" \ | ||
| "/commands/custom/<Control><Alt><Shift>P" \ | ||
| "qvm-unpause --all" | ||
| fi | ||
|
|
||
| UPDATE_CONFIG_DONE=1 | ||
| echo "$UPDATE_CONFIG_DONE" > "$UPDATE_CONFIG_DONE_FILE" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters