[gimp] libgimpwidgets: change GimpController's stock_id to icon_name
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpwidgets: change GimpController's stock_id to icon_name
- Date: Fri, 9 May 2014 07:22:09 +0000 (UTC)
commit 9331ef24562b78045a567518874a6c55a578ffc2
Author: Michael Natterer <mitch gimp org>
Date: Fri May 9 09:19:06 2014 +0200
libgimpwidgets: change GimpController's stock_id to icon_name
This API change is OK since the entire controller API is marked as
unstable and needs a special #define to be visible at all.
app/widgets/gimpcontrollerinfo.c | 3 +--
app/widgets/gimpcontrollerkeyboard.c | 2 +-
app/widgets/gimpcontrollerlist.c | 2 +-
app/widgets/gimpcontrollermouse.c | 2 +-
app/widgets/gimpcontrollerwheel.c | 2 +-
libgimpwidgets/gimpcontroller.c | 2 +-
libgimpwidgets/gimpcontroller.h | 2 +-
modules/controller-dx-dinput.c | 2 +-
modules/controller-linux-input.c | 2 +-
modules/controller-midi.c | 2 +-
10 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/app/widgets/gimpcontrollerinfo.c b/app/widgets/gimpcontrollerinfo.c
index cab6e2a..7d3ec24 100644
--- a/app/widgets/gimpcontrollerinfo.c
+++ b/app/widgets/gimpcontrollerinfo.c
@@ -212,8 +212,7 @@ gimp_controller_info_set_property (GObject *object,
controller_class = GIMP_CONTROLLER_GET_CLASS (info->controller);
gimp_viewable_set_icon_name (GIMP_VIEWABLE (info),
- /* FIXME icon name */
- controller_class->stock_id);
+ controller_class->icon_name);
}
break;
case PROP_MAPPING:
diff --git a/app/widgets/gimpcontrollerkeyboard.c b/app/widgets/gimpcontrollerkeyboard.c
index 1402e65..a2db149 100644
--- a/app/widgets/gimpcontrollerkeyboard.c
+++ b/app/widgets/gimpcontrollerkeyboard.c
@@ -175,7 +175,7 @@ gimp_controller_keyboard_class_init (GimpControllerKeyboardClass *klass)
controller_class->name = _("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_event_name = gimp_controller_keyboard_get_event_name;
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
index 2ff1e12..7aeef79 100644
--- a/app/widgets/gimpcontrollerlist.c
+++ b/app/widgets/gimpcontrollerlist.c
@@ -223,7 +223,7 @@ gimp_controller_list_init (GimpControllerList *list)
gtk_list_store_append (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_TYPE, controller_types[i],
-1);
diff --git a/app/widgets/gimpcontrollermouse.c b/app/widgets/gimpcontrollermouse.c
index ad53e81..9c471ed 100644
--- a/app/widgets/gimpcontrollermouse.c
+++ b/app/widgets/gimpcontrollermouse.c
@@ -203,7 +203,7 @@ gimp_controller_mouse_class_init (GimpControllerMouseClass *klass)
controller_class->name = _("Mouse Buttons");
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_event_name = gimp_controller_mouse_get_event_name;
diff --git a/app/widgets/gimpcontrollerwheel.c b/app/widgets/gimpcontrollerwheel.c
index b45827a..e97ce93 100644
--- a/app/widgets/gimpcontrollerwheel.c
+++ b/app/widgets/gimpcontrollerwheel.c
@@ -177,7 +177,7 @@ gimp_controller_wheel_class_init (GimpControllerWheelClass *klass)
controller_class->name = _("Mouse 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_event_name = gimp_controller_wheel_get_event_name;
diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c
index d867284..4e2ce95 100644
--- a/libgimpwidgets/gimpcontroller.c
+++ b/libgimpwidgets/gimpcontroller.c
@@ -90,7 +90,7 @@ gimp_controller_class_init (GimpControllerClass *klass)
klass->name = "Unnamed";
klass->help_domain = NULL;
klass->help_id = NULL;
- klass->stock_id = GIMP_STOCK_CONTROLLER;
+ klass->icon_name = GIMP_STOCK_CONTROLLER;
klass->get_n_events = NULL;
klass->get_event_name = NULL;
diff --git a/libgimpwidgets/gimpcontroller.h b/libgimpwidgets/gimpcontroller.h
index da48a3a..0022d98 100644
--- a/libgimpwidgets/gimpcontroller.h
+++ b/libgimpwidgets/gimpcontroller.h
@@ -118,7 +118,7 @@ struct _GimpControllerClass
gboolean (* event) (GimpController *controller,
const GimpControllerEvent *event);
- const gchar *stock_id;
+ const gchar *icon_name;
/* Padding for future expansion */
void (* _gimp_reserved2) (void);
diff --git a/modules/controller-dx-dinput.c b/modules/controller-dx-dinput.c
index e192edb..18ec3cd 100644
--- a/modules/controller-dx-dinput.c
+++ b/modules/controller-dx-dinput.c
@@ -205,7 +205,7 @@ controller_dx_dinput_class_init (ControllerDXDInputClass *klass)
controller_class->name = _("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_event_name = dx_dinput_get_event_name;
diff --git a/modules/controller-linux-input.c b/modules/controller-linux-input.c
index 58c44e1..8759d10 100644
--- a/modules/controller-linux-input.c
+++ b/modules/controller-linux-input.c
@@ -229,7 +229,7 @@ controller_linux_input_class_init (ControllerLinuxInputClass *klass)
controller_class->name = _("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_event_name = linux_input_get_event_name;
diff --git a/modules/controller-midi.c b/modules/controller-midi.c
index 5e68f8f..501206d 100644
--- a/modules/controller-midi.c
+++ b/modules/controller-midi.c
@@ -225,7 +225,7 @@ controller_midi_class_init (ControllerMidiClass *klass)
controller_class->name = _("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_event_name = midi_get_event_name;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]