callisto-debian/xpad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Callisto patches (mnemonic delete, command key)

Browse Source
This commit is contained in:
Maia
2025-06-09 18:59:33 -07:00
parent dcc8fb896d
commit 7cc16216d1
3 changed files with 1269 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1206
debian/patches/30_no_mnemonics.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

61
debian/patches/31_command_key.patch vendored Normal file
View File

@ -0,0 +1,61 @@
Description: Use Command key as the primary modifier
Origin: Callisto Desktop
Author: Maia <maia@tsundoku.ne.jp>
Last-Update: 2023-06-19 xpad 5.8.0
diff -urN a/src/xpad-pad.c b/src/xpad-pad.c
--- a/src/xpad-pad.c 2022-05-18 00:42:43.000000000 -0700
+++ b/src/xpad-pad.c 2022-06-09 07:00:29.146969445 -0700
@@ -355,7 +355,7 @@
gtk_window_add_accel_group (pad_window, pad->priv->accel_group);
pad->priv->menu = menu_get_popup_no_highlight (pad, pad->priv->accel_group);
pad->priv->highlight_menu = menu_get_popup_highlight (pad, pad->priv->accel_group);
- gtk_accel_group_connect (pad->priv->accel_group, GDK_KEY_Q, GDK_CONTROL_MASK, 0, g_cclosure_new_swap (G_CALLBACK (xpad_app_quit), pad, NULL));
+ gtk_accel_group_connect (pad->priv->accel_group, GDK_KEY_Q, GDK_SUPER_MASK, 0, g_cclosure_new_swap (G_CALLBACK (xpad_app_quit), pad, NULL));
/* GtkBox with overlay and toolbar */
GtkBox *vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
@@ -1605,25 +1605,25 @@
uppermenu = gtk_menu_new ();
gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group);
menu = uppermenu;
- MENU_ADD (_("_New"), "document-new", GDK_KEY_N, GDK_CONTROL_MASK, xpad_pad_spawn);
+ MENU_ADD (_("_New"), "document-new", GDK_KEY_N, GDK_SUPER_MASK, xpad_pad_spawn);
MENU_ADD (_("_Delete"), "edit-delete", GDK_KEY_Delete, GDK_SHIFT_MASK, xpad_pad_delete);
MENU_ADD (_("_Reload"), "reload-pad-content", GDK_KEY_F5, 0, xpad_pad_load_content);
- MENU_ADD (_("_Close"), "window-close", GDK_KEY_W, GDK_CONTROL_MASK, xpad_pad_close);
+ MENU_ADD (_("_Close"), "window-close", GDK_KEY_W, GDK_SUPER_MASK, xpad_pad_close);
/* Edit submenu */
item = gtk_menu_item_new_with_mnemonic (_("_Edit"));
gtk_container_add (GTK_CONTAINER (uppermenu), item);
menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
- MENU_ADD (_("_Undo"), "edit-undo", GDK_KEY_Z, GDK_CONTROL_MASK, xpad_pad_undo);
+ MENU_ADD (_("_Undo"), "edit-undo", GDK_KEY_Z, GDK_SUPER_MASK, xpad_pad_undo);
g_object_set_data (G_OBJECT (uppermenu), "undo", item);
- MENU_ADD (_("_Redo"), "edit-redo", GDK_KEY_Y, GDK_CONTROL_MASK, xpad_pad_redo);
+ MENU_ADD (_("_Redo"), "edit-redo", GDK_KEY_Y, GDK_SUPER_MASK, xpad_pad_redo);
g_object_set_data (G_OBJECT (uppermenu), "redo", item);
MENU_ADD_SEP();
MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste);
g_object_set_data (G_OBJECT (uppermenu), "paste", item);
MENU_ADD_SEP();
- MENU_ADD (_("_Find"), "edit-find", GDK_KEY_F, GDK_CONTROL_MASK, xpad_pad_search);
+ MENU_ADD (_("_Find"), "edit-find", GDK_KEY_F, GDK_SUPER_MASK, xpad_pad_search);
MENU_ADD_SEP();
MENU_ADD (_("_Layout"), "document-properties", 0, 0, xpad_pad_open_properties);
MENU_ADD (_("_Read only"), "editable", 0, 0, xpad_pad_open_properties);
@@ -1763,9 +1763,9 @@
MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste);
g_object_set_data (G_OBJECT (menu), "paste", item);
MENU_ADD_SEP ();
- MENU_ADD (_("_Bold"), "format-text-bold", GDK_KEY_b, GDK_CONTROL_MASK, menu_bold);
- MENU_ADD (_("_Italic"), "format-text-italic", GDK_KEY_i, GDK_CONTROL_MASK, menu_italic);
- MENU_ADD (_("_Underline"), "format-text-underline", GDK_KEY_u, GDK_CONTROL_MASK, menu_underline);
+ MENU_ADD (_("_Bold"), "format-text-bold", GDK_KEY_b, GDK_SUPER_MASK, menu_bold);
+ MENU_ADD (_("_Italic"), "format-text-italic", GDK_KEY_i, GDK_SUPER_MASK, menu_italic);
+ MENU_ADD (_("_Underline"), "format-text-underline", GDK_KEY_u, GDK_SUPER_MASK, menu_underline);
MENU_ADD (_("_Strikethrough"), "format-text-strikethrough", 0, 0, menu_strikethrough);
gtk_widget_show_all (menu);

2
debian/patches/series vendored
View File

@ -1 +1,3 @@
01_allow_build_with_newer_gettext.diff
30_no_mnemonics.patch
31_command_key.patch