![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/ink-action.cpp b/src/ink-action.cpp
index 7764acc318de73679f4234b1a2c5955f1dd94f98..d8673a3ab04ac95c8a816a6cdf82c5211a9d430e 100644 (file)
--- a/src/ink-action.cpp
+++ b/src/ink-action.cpp
#include <glib/gi18n.h>
+#include <gtk/gtkalignment.h>
#include <gtk/gtktooltips.h>
#include <gtk/gtktoolitem.h>
#include <gtk/gtktoggletoolbutton.h>
#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtkimagemenuitem.h>
#include "icon-size.h"
#include "ink-action.h"
#include "widgets/button.h"
#include "widgets/icon.h"
-
-
static void ink_action_class_init( InkActionClass* klass );
static void ink_action_init( InkAction* action );
+static void ink_action_finalize( GObject* obj );
static void ink_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
static void ink_action_set_property( GObject* obj, guint propId, const GValue *value, GParamSpec* pspec );
static GtkActionClass* gInkActionParentClass = 0;
+struct _InkActionPrivate
+{
+ gchar* iconId;
+ Inkscape::IconSize iconSize;
+};
+
+#define INK_ACTION_GET_PRIVATE( o ) ( G_TYPE_INSTANCE_GET_PRIVATE( (o), INK_ACTION_TYPE, InkActionPrivate ) )
+
GType ink_action_get_type( void )
{
static GType myType = 0;
gInkActionParentClass = GTK_ACTION_CLASS( g_type_class_peek_parent( klass ) );
GObjectClass * objClass = G_OBJECT_CLASS( klass );
+ objClass->finalize = ink_action_finalize;
objClass->get_property = ink_action_get_property;
objClass->set_property = ink_action_set_property;
(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(InkActionClass) );
}
}
static void ink_action_init( InkAction* action )
{
+ action->private_data = INK_ACTION_GET_PRIVATE( action );
+ action->private_data->iconId = 0;
+ action->private_data->iconSize = Inkscape::ICON_SIZE_SMALL_TOOLBAR;
+}
+
+static void ink_action_finalize( GObject* obj )
+{
+ InkAction* action = INK_ACTION( obj );
+
+ g_free( action->private_data->iconId );
+ g_free( action->private_data );
+
}
+//Any strings passed in should already be localised
InkAction* ink_action_new( const gchar *name,
const gchar *label,
const gchar *tooltip,
@@ -117,13 +142,13 @@ static void ink_action_get_property( GObject* obj, guint propId, GValue* value,
switch ( propId ) {
case PROP_INK_ID:
{
- //g_value_set_pointer( value, action->private_data->adj );
+ g_value_set_string( value, action->private_data->iconId );
}
break;
case PROP_INK_SIZE:
{
- //g_value_set_pointer( value, action->private_data->adj );
+ g_value_set_int( value, action->private_data->iconSize );
}
break;
@@ -139,50 +164,80 @@ void ink_action_set_property( GObject* obj, guint propId, const GValue *value, G
switch ( propId ) {
case PROP_INK_ID:
{
-// gchar* tmp = action->private_data->iconId;
-// action->private_data->iconId = g_value_dup_string( value );
-// g_free( tmp );
+ 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 = g_value_get_( value );
+ action->private_data->iconSize = (Inkscape::IconSize)g_value_get_int( value );
}
break;
default:
+ {
G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
+ }
}
}
+#include <gtk/gtkstock.h>
+
static GtkWidget* ink_action_create_menu_item( GtkAction* action )
{
+ InkAction* act = INK_ACTION( action );
GtkWidget* item = 0;
- g_message("INK ACTION CREATE MENU ITEM");
- item = gInkActionParentClass->create_menu_item( action );
+
+ if ( act->private_data->iconId ) {
+ gchar* label = 0;
+ g_object_get( G_OBJECT(act), "label", &label, NULL );
+
+ item = gtk_image_menu_item_new_with_mnemonic( label );
+ GtkWidget* child = sp_icon_new( Inkscape::ICON_SIZE_MENU, act->private_data->iconId );
+ // TODO this work-around is until SPIcon will live properly inside of a popup menu
+ if ( SP_IS_ICON(child) ) {
+ SPIcon* icon = SP_ICON(child);
+ sp_icon_fetch_pixbuf( icon );
+ GdkPixbuf* target = icon->pb;
+ if ( target ) {
+ child = gtk_image_new_from_pixbuf( target );
+ gtk_widget_set_sensitive(child, gtk_action_is_sensitive(action));
+ gtk_widget_destroy( GTK_WIDGET(icon) );
+ }
+ }
+ gtk_widget_show_all( child );
+ gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(item), child );
+
+ g_free( label );
+ label = 0;
+ } else {
+ item = gInkActionParentClass->create_menu_item( action );
+ }
+
return item;
}
static GtkWidget* ink_action_create_tool_item( GtkAction* action )
{
- GtkWidget* item = 0;
- g_message("INK ACTION CREATE TOOL ITEM");
-
-
- //item = gInkActionParentClass->create_tool_item( action );
- GtkTooltips *tt = gtk_tooltips_new();
- GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
- SP_BUTTON_TYPE_NORMAL,
- NULL,
- "use_pressure",
- _("Use the pressure of the input device to alter the width of the pen"),
- tt);
- //g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (sp_ddc_pressure_state_changed), NULL);
- //gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), prefs_get_int_attribute ("tools.calligraphic", "usepressure", 1));
- item = GTK_WIDGET(gtk_tool_item_new());
- gtk_container_add( GTK_CONTAINER(item), button );
+ InkAction* act = INK_ACTION( action );
+ GtkWidget* item = gInkActionParentClass->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_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;
@@ -205,6 +260,8 @@ static void ink_toggle_action_set_property( GObject* obj, guint propId, const GV
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 );
+
static GtkToggleActionClass* gInkToggleActionParentClass = 0;
struct _InkToggleActionPrivate
"Icon Size",
"The size the icon",
(int)Inkscape::ICON_SIZE_MENU,
- (int)Inkscape::ICON_SIZE_DECORATION,
+ (int)99,
(int)Inkscape::ICON_SIZE_SMALL_TOOLBAR,
(GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
const gchar *label,
const gchar *tooltip,
const gchar *inkId,
- Inkscape::IconSize size )
+ Inkscape::IconSize size,
+ SPAttributeEnum attr)
{
GObject* obj = (GObject*)g_object_new( INK_TOGGLE_ACTION_TYPE,
"name", name,
"label", label,
"tooltip", tooltip,
"iconId", inkId,
- "iconSize", size,
+ "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;
@@ -343,6 +403,8 @@ void ink_toggle_action_set_property( GObject* obj, guint propId, const GValue *v
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;
static GtkWidget* ink_toggle_action_create_tool_item( GtkAction* action )
{
InkToggleAction* act = INK_TOGGLE_ACTION( action );
- GtkWidget* item = gInkToggleActionParentClass->parent_class.create_tool_item(action);
-
- if ( act->private_data->iconId ) {
- if ( GTK_IS_TOOL_BUTTON(item) ) {
- GtkToolButton* button = GTK_TOOL_BUTTON(item);
+ GtkWidget* item = gInkToggleActionParentClass->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_tool_button_set_icon_widget( button, child );
+ GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 );
+ gtk_container_add( GTK_CONTAINER(align), child );
+ gtk_tool_button_set_icon_widget( button, align );
} else {
- // For now trigger a warning but don't do anything else
- GtkToolButton* button = GTK_TOOL_BUTTON(item);
- (void)button;
+ gchar *label;
+ g_object_get (G_OBJECT(action), "short_label", &label, NULL);
+ gtk_tool_button_set_label( button, label );
}
+ } 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;
}
+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_show_all( child );
+ gtk_tool_button_set_icon_widget( button, child );
+ }
+ }
+
+ proxies = g_slist_next( proxies );
+ }
+ }
+}
+
/* --------------------------------------------------------------- */
/* --------------------------------------------------------------- */
"label", label,
"tooltip", tooltip,
"iconId", inkId,
- "iconSize", size,
+ "iconSize", Inkscape::getRegisteredIconSize(size),
NULL );
InkRadioAction* action = INK_RADIO_ACTION( obj );
GtkToolButton* button = GTK_TOOL_BUTTON(item);
GtkWidget* child = sp_icon_new( act->private_data->iconSize, act->private_data->iconId );
- gtk_tool_button_set_icon_widget( button, child );
+ GtkWidget* align = gtk_alignment_new( 0.5, 0.5, 0.0, 0.0 );
+ gtk_container_add( GTK_CONTAINER(align), child );
+ gtk_tool_button_set_icon_widget( button, align );
} else {
// For now trigger a warning but don't do anything else
GtkToolButton* button = GTK_TOOL_BUTTON(item);