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

libgimpwidgets: change GimpController's stock_id to icon_name

Browse Source 
This API change is OK since the entire controller API is marked as
unstable and needs a special #define to be visible at all.
This commit is contained in:
Michael Natterer
2014-05-09 09:19:06 +02:00
parent 88d2df0af8
commit 9331ef2456
10 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/widgets/gimpcontrollerinfo.c
View File

@ -212,8 +212,7 @@ gimp_controller_info_set_property (GObject *object,
controller_class = GIMP_CONTROLLER_GET_CLASS (info->controller); controller_class = GIMP_CONTROLLER_GET_CLASS (info->controller);
gimp_viewable_set_icon_name (GIMP_VIEWABLE (info), gimp_viewable_set_icon_name (GIMP_VIEWABLE (info),
/* FIXME icon name */ controller_class->icon_name);
controller_class->stock_id);
} }
break; break;
case PROP_MAPPING: case PROP_MAPPING:

2
app/widgets/gimpcontrollerkeyboard.c
View File

@ -175,7 +175,7 @@ gimp_controller_keyboard_class_init (GimpControllerKeyboardClass *klass)
controller_class->name = _("Keyboard"); controller_class->name = _("Keyboard");
controller_class->help_id = GIMP_HELP_CONTROLLER_KEYBOARD; controller_class->help_id = GIMP_HELP_CONTROLLER_KEYBOARD;
controller_class->stock_id = GIMP_STOCK_CONTROLLER_KEYBOARD; controller_class->icon_name = GIMP_STOCK_CONTROLLER_KEYBOARD;
controller_class->get_n_events = gimp_controller_keyboard_get_n_events; controller_class->get_n_events = gimp_controller_keyboard_get_n_events;
controller_class->get_event_name = gimp_controller_keyboard_get_event_name; controller_class->get_event_name = gimp_controller_keyboard_get_event_name;

2
app/widgets/gimpcontrollerlist.c
View File

@ -223,7 +223,7 @@ gimp_controller_list_init (GimpControllerList *list)
gtk_list_store_append (list->src, &iter); gtk_list_store_append (list->src, &iter);
gtk_list_store_set (list->src, &iter, gtk_list_store_set (list->src, &iter,
COLUMN_ICON, controller_class->stock_id, COLUMN_ICON, controller_class->icon_name,
COLUMN_NAME, controller_class->name, COLUMN_NAME, controller_class->name,
COLUMN_TYPE, controller_types[i], COLUMN_TYPE, controller_types[i],
-1); -1);

2
app/widgets/gimpcontrollermouse.c
View File

@ -203,7 +203,7 @@ gimp_controller_mouse_class_init (GimpControllerMouseClass *klass)
controller_class->name = _("Mouse Buttons"); controller_class->name = _("Mouse Buttons");
controller_class->help_id = GIMP_HELP_CONTROLLER_MOUSE; controller_class->help_id = GIMP_HELP_CONTROLLER_MOUSE;
controller_class->stock_id = GIMP_STOCK_CONTROLLER_MOUSE; controller_class->icon_name = GIMP_STOCK_CONTROLLER_MOUSE;
controller_class->get_n_events = gimp_controller_mouse_get_n_events; controller_class->get_n_events = gimp_controller_mouse_get_n_events;
controller_class->get_event_name = gimp_controller_mouse_get_event_name; controller_class->get_event_name = gimp_controller_mouse_get_event_name;

2
app/widgets/gimpcontrollerwheel.c
View File

@ -177,7 +177,7 @@ gimp_controller_wheel_class_init (GimpControllerWheelClass *klass)
controller_class->name = _("Mouse Wheel"); controller_class->name = _("Mouse Wheel");
controller_class->help_id = GIMP_HELP_CONTROLLER_WHEEL; controller_class->help_id = GIMP_HELP_CONTROLLER_WHEEL;
controller_class->stock_id = GIMP_STOCK_CONTROLLER_WHEEL; controller_class->icon_name = GIMP_STOCK_CONTROLLER_WHEEL;
controller_class->get_n_events = gimp_controller_wheel_get_n_events; controller_class->get_n_events = gimp_controller_wheel_get_n_events;
controller_class->get_event_name = gimp_controller_wheel_get_event_name; controller_class->get_event_name = gimp_controller_wheel_get_event_name;

2
libgimpwidgets/gimpcontroller.c
View File

@ -90,7 +90,7 @@ gimp_controller_class_init (GimpControllerClass *klass)
klass->name = "Unnamed"; klass->name = "Unnamed";
klass->help_domain = NULL; klass->help_domain = NULL;
klass->help_id = NULL; klass->help_id = NULL;
klass->stock_id = GIMP_STOCK_CONTROLLER; klass->icon_name = GIMP_STOCK_CONTROLLER;
klass->get_n_events = NULL; klass->get_n_events = NULL;
klass->get_event_name = NULL; klass->get_event_name = NULL;

2
libgimpwidgets/gimpcontroller.h
View File

@ -118,7 +118,7 @@ struct _GimpControllerClass
gboolean (* event) (GimpController *controller, gboolean (* event) (GimpController *controller,
const GimpControllerEvent *event); const GimpControllerEvent *event);
const gchar *stock_id; const gchar *icon_name;
/* Padding for future expansion */ /* Padding for future expansion */
void (* _gimp_reserved2) (void); void (* _gimp_reserved2) (void);

2
modules/controller-dx-dinput.c
View File

@ -205,7 +205,7 @@ controller_dx_dinput_class_init (ControllerDXDInputClass *klass)
controller_class->name = _("DirectX DirectInput"); controller_class->name = _("DirectX DirectInput");
controller_class->help_id = "gimp-controller-directx-directinput"; controller_class->help_id = "gimp-controller-directx-directinput";
controller_class->stock_id = GIMP_STOCK_CONTROLLER_LINUX_INPUT; controller_class->icon_name = GIMP_STOCK_CONTROLLER_LINUX_INPUT;
controller_class->get_n_events = dx_dinput_get_n_events; controller_class->get_n_events = dx_dinput_get_n_events;
controller_class->get_event_name = dx_dinput_get_event_name; controller_class->get_event_name = dx_dinput_get_event_name;

2
modules/controller-linux-input.c
View File

@ -229,7 +229,7 @@ controller_linux_input_class_init (ControllerLinuxInputClass *klass)
controller_class->name = _("Linux Input"); controller_class->name = _("Linux Input");
controller_class->help_id = "gimp-controller-linux-input"; controller_class->help_id = "gimp-controller-linux-input";
controller_class->stock_id = GIMP_STOCK_CONTROLLER_LINUX_INPUT; controller_class->icon_name = GIMP_STOCK_CONTROLLER_LINUX_INPUT;
controller_class->get_n_events = linux_input_get_n_events; controller_class->get_n_events = linux_input_get_n_events;
controller_class->get_event_name = linux_input_get_event_name; controller_class->get_event_name = linux_input_get_event_name;

2
modules/controller-midi.c
View File

@ -225,7 +225,7 @@ controller_midi_class_init (ControllerMidiClass *klass)
controller_class->name = _("MIDI"); controller_class->name = _("MIDI");
controller_class->help_id = "gimp-controller-midi"; controller_class->help_id = "gimp-controller-midi";
controller_class->stock_id = GIMP_STOCK_CONTROLLER_MIDI; controller_class->icon_name = GIMP_STOCK_CONTROLLER_MIDI;
controller_class->get_n_events = midi_get_n_events; controller_class->get_n_events = midi_get_n_events;
controller_class->get_event_name = midi_get_event_name; controller_class->get_event_name = midi_get_event_name;