Merge pull request #76 from vojtapolasek/deduplicate_lios_shortcut

update keyboard shortcuts

ks/vojtux_common.ks

@@ -118,6 +118,7 @@ toggle-monitor
 
 # settings and shortcuts
 vojtux-settings
+sox
 # OCR desktop
 ocrdesktop
 

rpm/vojtux-settings/03-keybindings

@@ -1,39 +1,34 @@
-[org/mate/desktop/keybindings/custom0]
+[org/mate/desktop/keybindings/vojtux-firefox]
 action='firefox'
 binding='<Alt><Mod4>f'
 name='Firefox'
 
-[org/mate/desktop/keybindings/custom1]
+[org/mate/desktop/keybindings/vojtux-mate-terminal]
 action='mate-terminal'
 binding='<Primary><Alt>t'
 name='Launch terminal'
 
-[org/mate/desktop/keybindings/custom2]
-action='sh -c "amixer set Master 5%%+ && play /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga"'
+[org/mate/desktop/keybindings/vojtux-volume-up]
+action='sh -c "wpctl  set-volume @DEFAULT_AUDIO_SINK@ 5%+ && play /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga"'
 binding='<Alt><Mod4>Up'
 name='Volume up'
 
-[org/mate/desktop/keybindings/custom3]
-action='sh -c "amixer set Master 5%%- && play /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga"'
+[org/mate/desktop/keybindings/vojtux-volume-down]
+action='sh -c "wpctl  set-volume @DEFAULT_AUDIO_SINK@ 5%- && play /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga"'
 binding='<Alt><Mod4>Down'
 name='Volume down'
 
-[org/mate/desktop/keybindings/custom4]
-action='sh -c "amixer set Master toggle && play /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga"'
+[org/mate/desktop/keybindings/vojtux-volumemute]
+action='sh -c "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && play /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga"'
 binding='<Alt><Mod4>Left'
 name='Toggle mute'
 
-[org/mate/desktop/keybindings/custom5]
+[org/mate/desktop/keybindings/vojtux-home]
 action='caja .'
 binding='<Mod4>Home'
 name='Home folder'
 
-[org/mate/desktop/keybindings/custom6]
+[org/mate/desktop/keybindings/vojtux-restart-orca]
 action='orca -r'
 binding='<Alt><Mod4>o'
 name='Restart Orca'
-
-[org/mate/desktop/keybindings/custom7]
-action='lios'
-binding='<Alt><Mod4>l'
-name='Linux Intelligent OCR Software'

rpm/vojtux-settings/vojtux-settings.spec

@@ -1,6 +1,6 @@
 Name:     vojtux-settings
 Version:  1
-Release:  2
+Release:  3%{?dist}
 Summary:  Settings for Vojtux
 License:  Public Domain
 
@@ -24,7 +24,7 @@ install  %{SOURCE3} %{buildroot}%{_sysconfdir}/dconf/db/distro.d/03-keybindings
 %post
 dconf update
 
-%postrm
+%postun
 dconf update
 
 %files
@@ -33,6 +33,11 @@ dconf update
 %{_sysconfdir}/dconf/db/distro.d/03-keybindings
 
 %changelog
+* Fri Dec 20 2024 Vojtech Polasek <[email protected]> - 1-3
+- change entry names not to occupy names reserved for user-created keyboard shortcuts
+- remove lios keyboard shortcut
+- update keybindings related to audio volume to use wpctl
+
 * Mon Sep 18 2023 Vojtech Polasek <[email protected]> - 1-2
 - update dconf database in the %post phase
 - install files into distro.d directory as we are a package