deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-13 17:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make modifier buttons truly abstract

Browse Source
This commit is contained in:
Berke Viktor
2012-10-21 03:03:38 +02:00
parent ef18ded827
commit 0c04cfed7f
7 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fe-gtk/menu.c
View File

@@ -2097,8 +2097,8 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
GtkWidget *menu_bar;
GtkWidget *usermenu = 0;
GtkWidget *submenu = 0;
int close_mask = GDK_CONTROL_MASK;
int away_mask = GDK_MOD1_MASK;
int close_mask = STATE_CTRL;
int away_mask = STATE_ALT;
char *key_theme = NULL;
GtkSettings *settings;
GSList *group = NULL;
@@ -2162,7 +2162,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
{
if (!g_ascii_strcasecmp (key_theme, "Emacs"))
{
close_mask = GDK_SHIFT_MASK | GDK_CONTROL_MASK;
close_mask = STATE_SHIFT | STATE_CTRL;
mymenu[SEARCH_OFFSET].key = 0;
}
g_free (key_theme);
@@ -2174,7 +2174,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
char *help = _("_Help");
char *under = strchr (help, '_');
if (under && (under[1] == 'a' || under[1] == 'A'))
away_mask = GDK_MOD1_MASK | GDK_CONTROL_MASK;
away_mask = STATE_ALT | STATE_CTRL;
}
if (!toplevel)
@@ -2229,8 +2229,8 @@ normalitem:
mymenu[i].key == GDK_F1 ? 0 :
mymenu[i].key == GDK_w ? close_mask :
(g_ascii_isupper (mymenu[i].key)) ?
GDK_SHIFT_MASK | GDK_CONTROL_MASK :
GDK_CONTROL_MASK,
STATE_SHIFT | STATE_CTRL :
STATE_CTRL,
GTK_ACCEL_VISIBLE);
if (mymenu[i].callback)
g_signal_connect (G_OBJECT (item), "activate",
@@ -2252,7 +2252,7 @@ togitem:
if (mymenu[i].key != 0)
gtk_widget_add_accelerator (item, "activate", accel_group,
mymenu[i].key, mymenu[i].id == MENU_ID_AWAY ?
away_mask : GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
away_mask : STATE_CTRL, GTK_ACCEL_VISIBLE);
if (mymenu[i].callback)
g_signal_connect (G_OBJECT (item), "toggled",
G_CALLBACK (mymenu[i].callback), 0);