Split InkAction classes into separate files

(bzr r15043)

1 files changed, 10 insertions, 430 deletions

diff --git a/src/widgets/ink-action.cpp b/src/widgets/ink-action.cpp
index 501aeaa74..2f1bf94e4 100644
--- a/src/widgets/ink-action.cpp
+++ b/src/widgets/ink-action.cpp
@@ -205,433 +205,13 @@ static GtkWidget* ink_action_create_tool_item( GtkAction* action )
     return item;
 }
 
-
-
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-
-
-static void ink_toggle_action_finalize( GObject* obj );
-static void ink_toggle_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
-static void ink_toggle_action_set_property( GObject* obj, guint propId, const GValue *value, GParamSpec* pspec );
-
-static GtkWidget* ink_toggle_action_create_menu_item( GtkAction* action );
-static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action );
-
-static void ink_toggle_action_update_icon( InkToggleAction* action );
-
-struct _InkToggleActionPrivate
-{
-    gchar* iconId;
-    Inkscape::IconSize iconSize;
-};
-
-#define INK_TOGGLE_ACTION_GET_PRIVATE( o ) ( G_TYPE_INSTANCE_GET_PRIVATE( (o), INK_TOGGLE_ACTION_TYPE, InkToggleActionPrivate ) )
-
-G_DEFINE_TYPE(InkToggleAction, ink_toggle_action, GTK_TYPE_TOGGLE_ACTION);
-
-static void ink_toggle_action_class_init( InkToggleActionClass* klass )
-{
-    if ( klass ) {
-        GObjectClass * objClass = G_OBJECT_CLASS( klass );
-
-        objClass->finalize = ink_toggle_action_finalize;
-        objClass->get_property = ink_toggle_action_get_property;
-        objClass->set_property = ink_toggle_action_set_property;
-
-        klass->parent_class.parent_class.create_menu_item = ink_toggle_action_create_menu_item;
-        klass->parent_class.parent_class.create_tool_item = ink_toggle_action_create_tool_item;
-        /*klass->parent_class.connect_proxy = connect_proxy;*/
-        /*klass->parent_class.disconnect_proxy = disconnect_proxy;*/
-
-        g_object_class_install_property( objClass,
-                                         PROP_INK_ID,
-                                         g_param_spec_string( "iconId",
-                                                              "Icon ID",
-                                                              "The id for the icon",
-                                                              "",
-                                                              (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
-
-        g_object_class_install_property( objClass,
-                                         PROP_INK_SIZE,
-                                         g_param_spec_int( "iconSize",
-                                                           "Icon Size",
-                                                           "The size the icon",
-                                                           (int)Inkscape::ICON_SIZE_MENU,
-                                                           (int)99,
-                                                           (int)Inkscape::ICON_SIZE_SMALL_TOOLBAR,
-                                                           (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
-
-        g_type_class_add_private( klass, sizeof(InkToggleActionClass) );
-    }
-}
-
-static void ink_toggle_action_init( InkToggleAction* action )
-{
-    action->private_data = INK_TOGGLE_ACTION_GET_PRIVATE( action );
-    action->private_data->iconId = 0;
-    action->private_data->iconSize = Inkscape::ICON_SIZE_SMALL_TOOLBAR;
-}
-
-static void ink_toggle_action_finalize( GObject* obj )
-{
-    InkToggleAction* action = INK_TOGGLE_ACTION( obj );
-
-    g_free( action->private_data->iconId );
-    g_free( action->private_data );
-
-}
-
-InkToggleAction* ink_toggle_action_new( const gchar *name,
-                           const gchar *label,
-                           const gchar *tooltip,
-                           const gchar *inkId,
-                           Inkscape::IconSize size,
-                           SPAttributeEnum attr)
-{
-    GObject* obj = (GObject*)g_object_new( INK_TOGGLE_ACTION_TYPE,
-                                           "name", name,
-                                           "label", label,
-                                           "tooltip", tooltip,
-                                           "iconId", inkId,
-                                           "iconSize", Inkscape::getRegisteredIconSize(size),
-                                           //"SP_ATTR_INKSCAPE", attr, // Why doesn't this work and do I need to use g_object_set_data below?
-                                           NULL );
-
-    g_object_set_data(obj, "SP_ATTR_INKSCAPE", GINT_TO_POINTER(attr));
-    InkToggleAction* action = INK_TOGGLE_ACTION( obj );
-
-    return action;
-}
-
-static void ink_toggle_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec )
-{
-    InkToggleAction* action = INK_TOGGLE_ACTION( obj );
-    (void)action;
-    switch ( propId ) {
-        case PROP_INK_ID:
-        {
-            g_value_set_string( value, action->private_data->iconId );
-        }
-        break;
-
-        case PROP_INK_SIZE:
-        {
-            g_value_set_int( value, action->private_data->iconSize );
-        }
-        break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
-    }
-}
-
-void ink_toggle_action_set_property( GObject* obj, guint propId, const GValue *value, GParamSpec* pspec )
-{
-    InkToggleAction* action = INK_TOGGLE_ACTION( obj );
-    (void)action;
-    switch ( propId ) {
-        case PROP_INK_ID:
-        {
-            gchar* tmp = action->private_data->iconId;
-            action->private_data->iconId = g_value_dup_string( value );
-            g_free( tmp );
-
-            ink_toggle_action_update_icon( action );
-        }
-        break;
-
-        case PROP_INK_SIZE:
-        {
-            action->private_data->iconSize = (Inkscape::IconSize)g_value_get_int( value );
-        }
-        break;
-
-        default:
-        {
-            G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
-        }
-    }
-}
-
-static GtkWidget* ink_toggle_action_create_menu_item( GtkAction* action )
-{
-    GtkWidget* item = GTK_TOGGLE_ACTION_CLASS(ink_toggle_action_parent_class)->parent_class.create_menu_item(action);
-
-    return item;
-}
-
-static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action )
-{
-    InkToggleAction* act = INK_TOGGLE_ACTION( action );
-
-    GtkWidget* item = GTK_TOGGLE_ACTION_CLASS(ink_toggle_action_parent_class)->parent_class.create_tool_item(action);
-    if ( GTK_IS_TOOL_BUTTON(item) ) {
-        GtkToolButton* button = GTK_TOOL_BUTTON(item);
-        if ( act->private_data->iconId ) {
-            GtkWidget* child = sp_icon_new( act->private_data->iconSize, act->private_data->iconId );
-
-	    gtk_widget_set_hexpand(child, FALSE);
-	    gtk_widget_set_vexpand(child, FALSE);
-	    gtk_tool_button_set_icon_widget(button, child);
-        } else {
-            gchar *label = 0;
-            g_object_get( G_OBJECT(action), "short_label", &label, NULL );
-            gtk_tool_button_set_label( button, label );
-            g_free( label );
-            label = 0;
-        }
-    } else {
-        // For now trigger a warning but don't do anything else
-        GtkToolButton* button = GTK_TOOL_BUTTON(item);
-        (void)button;
-    }
-    gtk_widget_show_all( item );
-
-    return item;
-}
-
-
-static void ink_toggle_action_update_icon( InkToggleAction* action )
-{
-    if ( action ) {
-        GSList* proxies = gtk_action_get_proxies( GTK_ACTION(action) );
-        while ( proxies ) {
-            if ( GTK_IS_TOOL_ITEM(proxies->data) ) {
-                if ( GTK_IS_TOOL_BUTTON(proxies->data) ) {
-                    GtkToolButton* button = GTK_TOOL_BUTTON(proxies->data);
-
-                    GtkWidget* child = sp_icon_new( action->private_data->iconSize, action->private_data->iconId );
-		    gtk_widget_set_hexpand(child, FALSE);
-		    gtk_widget_set_vexpand(child, FALSE);
-		    gtk_widget_show_all(child);
-		    gtk_tool_button_set_icon_widget(button, child);
-                }
-            }
-
-            proxies = g_slist_next( proxies );
-        }
-    }
-}
-
-
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-
-
-static void ink_radio_action_finalize( GObject* obj );
-static void ink_radio_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
-static void ink_radio_action_set_property( GObject* obj, guint propId, const GValue *value, GParamSpec* pspec );
-
-static GtkWidget* ink_radio_action_create_menu_item( GtkAction* action );
-static GtkWidget* ink_radio_action_create_tool_item( GtkAction* action );
-
-struct _InkRadioActionPrivate
-{
-    gchar* iconId;
-    Inkscape::IconSize iconSize;
-};
-
-#define INK_RADIO_ACTION_GET_PRIVATE( o ) ( G_TYPE_INSTANCE_GET_PRIVATE( (o), INK_RADIO_ACTION_TYPE, InkRadioActionPrivate ) )
-
-G_DEFINE_TYPE(InkRadioAction, ink_radio_action, GTK_TYPE_RADIO_ACTION);
-
-static void ink_radio_action_class_init( InkRadioActionClass* klass )
-{
-    if ( klass ) {
-        GObjectClass * objClass = G_OBJECT_CLASS( klass );
-
-        objClass->finalize = ink_radio_action_finalize;
-        objClass->get_property = ink_radio_action_get_property;
-        objClass->set_property = ink_radio_action_set_property;
-
-        klass->parent_class.parent_class.parent_class.create_menu_item = ink_radio_action_create_menu_item;
-        klass->parent_class.parent_class.parent_class.create_tool_item = ink_radio_action_create_tool_item;
-        /*klass->parent_class.connect_proxy = connect_proxy;*/
-        /*klass->parent_class.disconnect_proxy = disconnect_proxy;*/
-
-        g_object_class_install_property( objClass,
-                                         PROP_INK_ID,
-                                         g_param_spec_string( "iconId",
-                                                              "Icon ID",
-                                                              "The id for the icon",
-                                                              "",
-                                                              (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
-
-        g_object_class_install_property( objClass,
-                                         PROP_INK_SIZE,
-                                         g_param_spec_int( "iconSize",
-                                                           "Icon Size",
-                                                           "The size the icon",
-                                                           (int)Inkscape::ICON_SIZE_MENU,
-                                                           (int)Inkscape::ICON_SIZE_DECORATION,
-                                                           (int)Inkscape::ICON_SIZE_SMALL_TOOLBAR,
-                                                           (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
-
-        g_type_class_add_private( klass, sizeof(InkRadioActionClass) );
-    }
-}
-
-static void ink_radio_action_init( InkRadioAction* action )
-{
-    action->private_data = INK_RADIO_ACTION_GET_PRIVATE( action );
-    action->private_data->iconId = 0;
-    action->private_data->iconSize = Inkscape::ICON_SIZE_SMALL_TOOLBAR;
-}
-
-static void ink_radio_action_finalize( GObject* obj )
-{
-    InkRadioAction* action = INK_RADIO_ACTION( obj );
-
-    g_free( action->private_data->iconId );
-    g_free( action->private_data );
-
-}
-
-InkRadioAction* ink_radio_action_new( const gchar *name,
-                           const gchar *label,
-                           const gchar *tooltip,
-                           const gchar *inkId,
-                           Inkscape::IconSize size )
-{
-    GObject* obj = (GObject*)g_object_new( INK_RADIO_ACTION_TYPE,
-                                           "name", name,
-                                           "label", label,
-                                           "tooltip", tooltip,
-                                           "iconId", inkId,
-                                           "iconSize", Inkscape::getRegisteredIconSize(size),
-                                           NULL );
-
-    InkRadioAction* action = INK_RADIO_ACTION( obj );
-
-    return action;
-}
-
-static void ink_radio_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec )
-{
-    InkRadioAction* action = INK_RADIO_ACTION( obj );
-    (void)action;
-    switch ( propId ) {
-        case PROP_INK_ID:
-        {
-            g_value_set_string( value, action->private_data->iconId );
-        }
-        break;
-
-        case PROP_INK_SIZE:
-        {
-            g_value_set_int( value, action->private_data->iconSize );
-        }
-        break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
-    }
-}
-
-void ink_radio_action_set_property( GObject* obj, guint propId, const GValue *value, GParamSpec* pspec )
-{
-    InkRadioAction* action = INK_RADIO_ACTION( obj );
-    (void)action;
-    switch ( propId ) {
-        case PROP_INK_ID:
-        {
-            gchar* tmp = action->private_data->iconId;
-            action->private_data->iconId = g_value_dup_string( value );
-            g_free( tmp );
-        }
-        break;
-
-        case PROP_INK_SIZE:
-        {
-            action->private_data->iconSize = (Inkscape::IconSize)g_value_get_int( value );
-        }
-        break;
-
-        default:
-        {
-            G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
-        }
-    }
-}
-
-static GtkWidget* ink_radio_action_create_menu_item( GtkAction* action )
-{
-    GtkWidget* item = GTK_RADIO_ACTION_CLASS(ink_radio_action_parent_class)->parent_class.parent_class.create_menu_item(action);
-
-    return item;
-}
-
-static GtkWidget* ink_radio_action_create_tool_item( GtkAction* action )
-{
-    InkRadioAction* act = INK_RADIO_ACTION( action );
-    GtkWidget* item = GTK_RADIO_ACTION_CLASS(ink_radio_action_parent_class)->parent_class.parent_class.create_tool_item(action);
-
-    if ( act->private_data->iconId ) {
-        if ( GTK_IS_TOOL_BUTTON(item) ) {
-            GtkToolButton* button = GTK_TOOL_BUTTON(item);
-
-            GtkWidget* child = sp_icon_new( act->private_data->iconSize, act->private_data->iconId );
-	    gtk_widget_set_hexpand(child, FALSE);
-	    gtk_widget_set_vexpand(child, FALSE);
-            gtk_tool_button_set_icon_widget(button, child);
-        } else {
-            // For now trigger a warning but don't do anything else
-            GtkToolButton* button = GTK_TOOL_BUTTON(item);
-            (void)button;
-        }
-    }
-
-    // TODO investigate if needed
-    gtk_widget_show_all( item );
-
-    return item;
-}
-
-
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-/* --------------------------------------------------------------- */
-
-// ToolMenu Action is happily derived from http://www.gtkforums.com/viewtopic.php?t=4215
-
-G_DEFINE_TYPE(InkToolMenuAction, ink_tool_menu_action, INK_ACTION_TYPE);
-
-static void
-ink_tool_menu_action_class_init (InkToolMenuActionClass *klass)
-{
-   GtkActionClass *action_class = GTK_ACTION_CLASS (klass);
-   action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
-}
-
-static void
-ink_tool_menu_action_init (InkToolMenuAction* /*tma*/)
-{
-}
-
-InkToolMenuAction *
-ink_tool_menu_action_new (const gchar *name,
-                          const gchar *label,
-                          const gchar *tooltip,
-                          const gchar *inkId,
-                          Inkscape::IconSize size )
-{
-    g_return_val_if_fail (name != NULL, NULL);
-
-    GObject* obj = (GObject*)g_object_new( INK_TOOL_MENU_ACTION_TYPE,
-                                           "name", name,
-                                           "label", label,
-                                           "tooltip", tooltip,
-                                           "iconId", inkId,
-                                           "iconSize", size,
-                                           NULL );
-
-    InkToolMenuAction* action = INK_TOOL_MENU_ACTION( obj );
-
-    return action;
-}
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :