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

removed "enabled" property. Removed GIMP_CONTROLLER_PARAM_RERIALIZE from

Browse Source 
2004-06-17  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpcontroller.[ch]: removed "enabled"
	property. Removed GIMP_CONTROLLER_PARAM_RERIALIZE from the "name"
	property because it's the hardware-determined name of this
	controller instance.

	* app/widgets/gimpcontrollerwheel.c
	* modules/controller_linux_input.c: set the name.

	* libgimpwidgets/gimpwidgets.h: #include gimpcontroller.h.

	* app/widgets/gimpcontrollerinfo.[ch]: added "enabled" here
	instead.  Don't dispatch events if the controller is
	disabled. Made everything work (not crash) with info->mapping
	being NULL.

	* etc/controllerrc: updated again with the changed format.

	* app/widgets/gimpcontrollers.[ch]: added
	gimp_controllers_get_list() which returns the container of
	controllers.

	* app/widgets/gimphelp-ids.h
	* app/gui/preferences-dialog.c: added controller configuration
	(can't change anything yet, just view the current settings).
	Resurrected the "Input Devices" page and removed the "Session"
	page by moving its widgets to other pages. Pack the various
	"Save now"/"Clear now" buttons vertically, not horizontally.
	Fixes bug #139069.

	* themes/Default/images/preferences/Makefile.am
	* themes/Default/images/preferences/controllers.png
	* themes/Default/images/preferences/theme.png: new icons for new
	prefs pages. Someone needs to make them nice...
This commit is contained in:
Michael Natterer
2004-06-17 14:07:05 +00:00
committed by Michael Natterer
parent c3a0a277e7
commit 5f4eabdbcb
17 changed files with 677 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libgimpwidgets/gimpcontroller.c
View File

@ -35,8 +35,7 @@
enum
{
PROP_0,
PROP_NAME,
PROP_ENABLED
PROP_NAME
};
enum
@ -120,14 +119,7 @@ gimp_controller_class_init (GimpControllerClass *klass)
g_param_spec_string ("name", NULL, NULL,
"Unnamed Controller",
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
GIMP_CONTROLLER_PARAM_SERIALIZE));
g_object_class_install_property (object_class, PROP_ENABLED,
g_param_spec_boolean ("enabled", NULL, NULL,
TRUE,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
GIMP_CONTROLLER_PARAM_SERIALIZE));
G_PARAM_CONSTRUCT));
controller_signals[EVENT] =
g_signal_new ("event",
@ -162,9 +154,6 @@ gimp_controller_set_property (GObject *object,
g_free (controller->name);
controller->name = g_value_dup_string (value);
break;
case PROP_ENABLED:
controller->enabled = g_value_get_boolean (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -184,9 +173,6 @@ gimp_controller_get_property (GObject *object,
case PROP_NAME:
g_value_set_string (value, controller->name);
break;
case PROP_ENABLED:
g_value_set_boolean (value, controller->enabled);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -253,28 +239,6 @@ gimp_controller_get_event_blurb (GimpController *controller,
return blurb;
}
void
gimp_controller_set_enabled (GimpController *controller,
gboolean enabled)
{
g_return_if_fail (GIMP_IS_CONTROLLER (controller));
if (enabled != controller->enabled)
{
g_object_set (controller,
"enabled", enabled,
NULL);
}
}
gboolean
gimp_controller_get_enabled (GimpController *controller)
{
g_return_val_if_fail (GIMP_IS_CONTROLLER (controller), FALSE);
return controller->enabled;
}
gboolean
gimp_controller_event (GimpController *controller,
const GimpControllerEvent *event)
@ -284,9 +248,8 @@ gimp_controller_event (GimpController *controller,
g_return_val_if_fail (GIMP_IS_CONTROLLER (controller), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (controller->enabled)
g_signal_emit (controller, controller_signals[EVENT], 0,
event, &retval);
g_signal_emit (controller, controller_signals[EVENT], 0,
event, &retval);
return retval;
}