applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wacom: Update from gnome-settings-daemon

Browse source
This commit is contained in:
Bastien Nocera 2016-03-24 16:41:41 +01:00
parent 70672c3658
commit 97c2a880c8
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
panels/wacom/gsd-wacom-device.c
View file

@ -1213,7 +1213,6 @@ static GList *
gsd_wacom_device_add_buttons_dir (WacomDevice *wacom_device, gsd_wacom_device_add_buttons_dir (WacomDevice *wacom_device,
const char *settings_path, const char *settings_path,
WacomButtonFlags direction, WacomButtonFlags direction,
const char *button_str,
const char *button_str_id) const char *button_str_id)
{ {
GList *l; GList *l;
@ -1234,7 +1233,23 @@ gsd_wacom_device_add_buttons_dir (WacomDevice *wacom_device,
if (flags & WACOM_BUTTON_MODESWITCH) if (flags & WACOM_BUTTON_MODESWITCH)
continue; continue;
name = g_strdup_printf (button_str, button_num++); switch (direction) {
case WACOM_BUTTON_POSITION_LEFT:
name = g_strdup_printf (_("Left Button #%d"), button_num++);
break;
case WACOM_BUTTON_POSITION_RIGHT:
name = g_strdup_printf (_("Right Button #%d"), button_num++);
break;
case WACOM_BUTTON_POSITION_TOP:
name = g_strdup_printf (_("Top Button #%d"), button_num++);
break;
case WACOM_BUTTON_POSITION_BOTTOM:
name = g_strdup_printf (_("Bottom Button #%d"), button_num++);
break;
default:
g_assert_not_reached ();
}
id = g_strdup_printf ("%s%c", button_str_id, i); id = g_strdup_printf ("%s%c", button_str_id, i);
has_oled = (libwacom_get_button_flag (wacom_device, i) & WACOM_BUTTON_OLED) != 0; has_oled = (libwacom_get_button_flag (wacom_device, i) & WACOM_BUTTON_OLED) != 0;
l = g_list_append (l, gsd_wacom_tablet_button_new (name, l = g_list_append (l, gsd_wacom_tablet_button_new (name,
@ -1297,16 +1312,16 @@ gsd_wacom_device_add_buttons (GsdWacomDevice *device,
ret = NULL; ret = NULL;
l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_LEFT, _("Left Button #%d"), "button"); l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_LEFT, "button");
if (l) if (l)
ret = l; ret = l;
l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_RIGHT, _("Right Button #%d"), "button"); l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_RIGHT, "button");
if (l) if (l)
ret = g_list_concat (ret, l); ret = g_list_concat (ret, l);
l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_TOP, _("Top Button #%d"), "button"); l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_TOP, "button");
if (l) if (l)
ret = g_list_concat (ret, l); ret = g_list_concat (ret, l);
l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_BOTTOM, _("Bottom Button #%d"), "button"); l = gsd_wacom_device_add_buttons_dir (wacom_device, settings_path, WACOM_BUTTON_POSITION_BOTTOM, "button");
if (l) if (l)
ret = g_list_concat (ret, l); ret = g_list_concat (ret, l);