Merge branch 'main' of https://github.com/onflapp/gs-desktop

MxIris-GNUstep · Sep 17, 2024 · ef136d7 · ef136d7
2 parents aa2b196 + 45039a3
commit ef136d7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/Applications/Preferences/Modules/Keyboard/Keyboard.m b/Applications/Preferences/Modules/Keyboard/Keyboard.m
@@ -376,7 +376,8 @@ - (void)swapFNClicked:(id)sender
       [defaults setInteger:[sender state] forKey:OSEKeyboardFNforFkeys];
     }
 
-  [OSEKeyboard configureWithDefaults:defaults];
+  //[OSEKeyboard configureWithDefaults:defaults];
+  [[NSApp delegate]configureMouseAndKeyboard];
 }
 
 @end

diff --git a/Applications/Preferences/Modules/Keyboard/ModifierKeys.m b/Applications/Preferences/Modules/Keyboard/ModifierKeys.m
@@ -161,7 +161,8 @@ - (IBAction)swapAction:(id)sender
       [keydefaults setInteger:[sender state] forKey:OSEKeyboardAltCmdSwap];
     }
 
-  [OSEKeyboard configureWithDefaults:keydefaults];
+  //[OSEKeyboard configureWithDefaults:keydefaults];
+  [[NSApp delegate]configureMouseAndKeyboard];
 }
 
 - (IBAction)popupsAction:(id)sender

diff --git a/config/etc/skel/Library/StepTalk/Scripts/Preferences/edit-xmodmap.st b/config/etc/skel/Library/StepTalk/Scripts/Preferences/edit-xmodmap.st
@@ -0,0 +1,5 @@
+Environment loadModule:'SystemShell'.
+
+Shell executeCommand:'touch' withArguments:#('~/.Xmodmap').
+
+NSWorkspace sharedWorkspace openFile:('~/.Xmodmap' stringByExpandingTildeInPath).
diff --git a/config/etc/skel/Library/StepTalk/Scripts/Preferences/edit-xmodmap.st.stinfo b/config/etc/skel/Library/StepTalk/Scripts/Preferences/edit-xmodmap.st.stinfo
@@ -0,0 +1,5 @@
+{
+    Default = {
+	Name = "Edit User's Xmodmap";
+    };
+}