![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index a2ea9ff0db9842fc8d3b28c2134351c8feeea71f..17e11db2d5c5e30f44cb0c54b4dfc52091d852ed 100644 (file)
*
* ***** END LICENSE BLOCK ***** */
-/* Note: this file should be kept compliable as both .cpp and .c */
+/* Note: this file should be kept compilable as both .cpp and .c */
+#include <cmath>
#include <string.h>
#include <gdk/gdkkeysyms.h>
+#include <gtk/gtkversion.h>
#include <gtk/gtktoolitem.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkhscale.h>
+#if GTK_CHECK_VERSION(2,12,0)
+#include <gtk/gtkscalebutton.h>
+#include <gtk/gtkstock.h>
+#endif /* GTK_CHECK_VERSION(2,12,0) */
#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmisc.h>
#include <gtk/gtktoolbar.h>
+#include <gtk/gtktooltips.h>
+#include <gtk/gtkradiomenuitem.h>
+#include "widgets/icon.h"
+#include "icon-size.h"
#include "ege-adjustment-action.h"
static void ege_adjustment_action_class_init( EgeAdjustmentActionClass* klass );
static void ege_adjustment_action_init( EgeAdjustmentAction* action );
+static void ege_adjustment_action_finalize( GObject* object );
static void ege_adjustment_action_get_property( GObject* obj, guint propId, GValue* value, GParamSpec * pspec );
static void ege_adjustment_action_set_property( GObject* obj, guint propId, const GValue *value, GParamSpec* pspec );
@@ -70,21 +82,60 @@ static gboolean keypress_cb( GtkWidget *widget, GdkEventKey *event, gpointer dat
static void ege_adjustment_action_defocus( EgeAdjustmentAction* action );
+static void egeAct_free_description( gpointer data, gpointer user_data );
+static void egeAct_free_all_descriptions( EgeAdjustmentAction* action );
+
static GtkActionClass* gParentClass = 0;
+static GQuark gDataName = 0;
+
+enum {
+ APPEARANCE_UNKNOWN = -1,
+ APPEARANCE_NONE = 0,
+ APPEARANCE_FULL, // label, then all choices represented by separate buttons
+ APPEARANCE_COMPACT, // label, then choices in a drop-down menu
+ APPEARANCE_MINIMAL, // no label, just choices in a drop-down menu
+};
+
+#if GTK_CHECK_VERSION(2,12,0)
+/* TODO need to have appropriate icons setup for these: */
+static const gchar *floogles[] = {
+ GTK_STOCK_REMOVE,
+ GTK_STOCK_ADD,
+ GTK_STOCK_GO_DOWN,
+ GTK_STOCK_ABOUT,
+ GTK_STOCK_GO_UP,
+ 0};
+#endif /* GTK_CHECK_VERSION(2,12,0) */
+typedef struct _EgeAdjustmentDescr EgeAdjustmentDescr;
+
+struct _EgeAdjustmentDescr
+{
+ gchar* descr;
+ gdouble value;
+};
struct _EgeAdjustmentActionPrivate
{
GtkAdjustment* adj;
+ GtkTooltips* toolTips;
GtkWidget* focusWidget;
gdouble climbRate;
guint digits;
+ gdouble epsilon;
+ gchar* format;
gchar* selfId;
+ EgeWidgetFixup toolPost;
gdouble lastVal;
gdouble step;
gdouble page;
+ gint appearanceMode;
gboolean transferFocus;
+ GList* descriptions;
+ gchar* appearance;
+ gchar* iconId;
+ Inkscape::IconSize iconSize;
};
#define EGE_ADJUSTMENT_ACTION_GET_PRIVATE( o ) ( G_TYPE_INSTANCE_GET_PRIVATE( (o), EGE_ADJUSTMENT_ACTION_TYPE, EgeAdjustmentActionPrivate ) )
PROP_FOCUS_WIDGET,
PROP_CLIMB_RATE,
PROP_DIGITS,
- PROP_SELFID
+ PROP_SELFID,
+ PROP_TOOL_POST,
+ PROP_APPEARANCE,
+ PROP_ICON_ID,
+ PROP_ICON_SIZE
+};
+
+enum {
+ BUMP_TOP = 0,
+ BUMP_PAGE_UP,
+ BUMP_UP,
+ BUMP_NONE,
+ BUMP_DOWN,
+ BUMP_PAGE_DOWN,
+ BUMP_BOTTOM,
+ BUMP_CUSTOM = 100
};
GType ege_adjustment_action_get_type( void )
@@ -127,6 +193,10 @@ static void ege_adjustment_action_class_init( EgeAdjustmentActionClass* klass )
gParentClass = GTK_ACTION_CLASS( g_type_class_peek_parent( klass ) );
GObjectClass * objClass = G_OBJECT_CLASS( klass );
+ gDataName = g_quark_from_string("ege-adj-action");
+
+ objClass->finalize = ege_adjustment_action_finalize;
+
objClass->get_property = ege_adjustment_action_get_property;
objClass->set_property = ege_adjustment_action_set_property;
@@ -174,6 +244,39 @@ static void ege_adjustment_action_class_init( EgeAdjustmentActionClass* klass )
0,
(GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
+ g_object_class_install_property( objClass,
+ PROP_TOOL_POST,
+ g_param_spec_pointer( "tool-post",
+ "Tool Widget post process",
+ "Function for final adjustments",
+ (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
+
+ g_object_class_install_property( objClass,
+ PROP_APPEARANCE,
+ g_param_spec_string( "appearance",
+ "Appearance hint",
+ "A hint for how to display",
+ "",
+ (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
+
+ g_object_class_install_property( objClass,
+ PROP_ICON_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_ICON_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(EgeAdjustmentActionClass) );
}
}
{
action->private_data = EGE_ADJUSTMENT_ACTION_GET_PRIVATE( action );
action->private_data->adj = 0;
+ action->private_data->toolTips = 0;
action->private_data->focusWidget = 0;
action->private_data->climbRate = 0.0;
action->private_data->digits = 2;
+ action->private_data->epsilon = 0.009;
+ action->private_data->format = g_strdup_printf("%%0.%df%%s%%s", action->private_data->digits);
action->private_data->selfId = 0;
+ action->private_data->toolPost = 0;
action->private_data->lastVal = 0.0;
action->private_data->step = 0.0;
action->private_data->page = 0.0;
+ action->private_data->appearanceMode = APPEARANCE_NONE;
action->private_data->transferFocus = FALSE;
+ action->private_data->descriptions = 0;
+ action->private_data->appearance = 0;
+ action->private_data->iconId = 0;
+ action->private_data->iconSize = Inkscape::ICON_SIZE_SMALL_TOOLBAR;
+}
+
+static void ege_adjustment_action_finalize( GObject* object )
+{
+ EgeAdjustmentAction* action = 0;
+ g_return_if_fail( object != NULL );
+ g_return_if_fail( IS_EGE_ADJUSTMENT_ACTION(object) );
+
+ action = EGE_ADJUSTMENT_ACTION( object );
+
+ if ( action->private_data->format ) {
+ g_free( action->private_data->format );
+ action->private_data->format = 0;
+ }
+
+ egeAct_free_all_descriptions( action );
+
+ if ( G_OBJECT_CLASS(gParentClass)->finalize ) {
+ (*G_OBJECT_CLASS(gParentClass)->finalize)(object);
+ }
}
EgeAdjustmentAction* ege_adjustment_action_new( GtkAdjustment* adjustment,
@@ -239,6 +371,22 @@ static void ege_adjustment_action_get_property( GObject* obj, guint propId, GVal
g_value_set_string( value, action->private_data->selfId );
break;
+ case PROP_TOOL_POST:
+ g_value_set_pointer( value, (void*)action->private_data->toolPost );
+ break;
+
+ case PROP_APPEARANCE:
+ g_value_set_string( value, action->private_data->appearance );
+ break;
+
+ case PROP_ICON_ID:
+ g_value_set_string( value, action->private_data->iconId );
+ break;
+
+ case PROP_ICON_SIZE:
+ g_value_set_int( value, action->private_data->iconSize );
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
}
@@ -276,6 +424,17 @@ void ege_adjustment_action_set_property( GObject* obj, guint propId, const GValu
{
/* TODO pass on */
action->private_data->digits = g_value_get_uint( value );
+ switch ( action->private_data->digits ) {
+ case 0: action->private_data->epsilon = 0.9; break;
+ case 1: action->private_data->epsilon = 0.09; break;
+ case 2: action->private_data->epsilon = 0.009; break;
+ case 3: action->private_data->epsilon = 0.0009; break;
+ case 4: action->private_data->epsilon = 0.00009; break;
+ }
+ if ( action->private_data->format ) {
+ g_free( action->private_data->format );
+ }
+ action->private_data->format = g_strdup_printf("%%0.%df%%s%%s", action->private_data->digits);
}
break;
@@ -288,6 +447,47 @@ void ege_adjustment_action_set_property( GObject* obj, guint propId, const GValu
}
break;
+ case PROP_TOOL_POST:
+ {
+ action->private_data->toolPost = (EgeWidgetFixup)g_value_get_pointer( value );
+ }
+ break;
+
+ case PROP_APPEARANCE:
+ {
+ gchar* tmp = action->private_data->appearance;
+ gchar* newVal = g_value_dup_string( value );
+ action->private_data->appearance = newVal;
+ g_free( tmp );
+
+ if ( !action->private_data->appearance || (strcmp("", newVal) == 0) ) {
+ action->private_data->appearanceMode = APPEARANCE_NONE;
+ } else if ( strcmp("full", newVal) == 0 ) {
+ action->private_data->appearanceMode = APPEARANCE_FULL;
+ } else if ( strcmp("compact", newVal) == 0 ) {
+ action->private_data->appearanceMode = APPEARANCE_COMPACT;
+ } else if ( strcmp("minimal", newVal) == 0 ) {
+ action->private_data->appearanceMode = APPEARANCE_MINIMAL;
+ } else {
+ action->private_data->appearanceMode = APPEARANCE_UNKNOWN;
+ }
+ }
+ break;
+
+ case PROP_ICON_ID:
+ {
+ gchar* tmp = action->private_data->iconId;
+ action->private_data->iconId = g_value_dup_string( value );
+ g_free( tmp );
+ }
+ break;
+
+ case PROP_ICON_SIZE:
+ {
+ action->private_data->iconSize = (Inkscape::IconSize)g_value_get_int( value );
+ }
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
}
@@ -316,11 +516,277 @@ GtkWidget* ege_adjustment_action_get_focuswidget( EgeAdjustmentAction* action )
return action->private_data->focusWidget;
}
+static void egeAct_free_description( gpointer data, gpointer user_data ) {
+ (void)user_data;
+ if ( data ) {
+ EgeAdjustmentDescr* descr = (EgeAdjustmentDescr*)data;
+ if ( descr->descr ) {
+ g_free( descr->descr );
+ descr->descr = 0;
+ }
+ g_free( descr );
+ }
+}
+
+static void egeAct_free_all_descriptions( EgeAdjustmentAction* action )
+{
+ if ( action->private_data->descriptions ) {
+ g_list_foreach( action->private_data->descriptions, egeAct_free_description, 0 );
+ g_list_free( action->private_data->descriptions );
+ action->private_data->descriptions = 0;
+ }
+}
+
+static gint egeAct_compare_descriptions( gconstpointer a, gconstpointer b )
+{
+ gint val = 0;
+
+ EgeAdjustmentDescr const * aa = (EgeAdjustmentDescr const *)a;
+ EgeAdjustmentDescr const * bb = (EgeAdjustmentDescr const *)b;
+
+ if ( aa && bb ) {
+ if ( aa->value < bb->value ) {
+ val = -1;
+ } else if ( aa->value > bb->value ) {
+ val = 1;
+ }
+ }
+
+ return val;
+}
+
+void ege_adjustment_action_set_descriptions( EgeAdjustmentAction* action, gchar const** descriptions, gdouble const* values, guint count )
+{
+ g_return_if_fail( IS_EGE_ADJUSTMENT_ACTION(action) );
+
+ egeAct_free_all_descriptions( action );
+
+ if ( count && descriptions && values ) {
+ guint i = 0;
+ for ( i = 0; i < count; i++ ) {
+ EgeAdjustmentDescr* descr = g_new0( EgeAdjustmentDescr, 1 );
+ descr->descr = descriptions[i] ? g_strdup( descriptions[i] ) : 0;
+ descr->value = values[i];
+ action->private_data->descriptions = g_list_insert_sorted( action->private_data->descriptions, (gpointer)descr, egeAct_compare_descriptions );
+ }
+ }
+}
+
+void ege_adjustment_action_set_appearance( EgeAdjustmentAction* action, gchar const* val )
+{
+ g_object_set( G_OBJECT(action), "appearance", val, NULL );
+}
+
+static void process_menu_action( GtkWidget* obj, gpointer data )
+{
+ GtkCheckMenuItem* item = GTK_CHECK_MENU_ITEM(obj);
+ if ( item->active ) {
+ EgeAdjustmentAction* act = (EgeAdjustmentAction*)g_object_get_qdata( G_OBJECT(obj), gDataName );
+ gint what = GPOINTER_TO_INT(data);
+
+
+ gdouble base = gtk_adjustment_get_value( act->private_data->adj );
+ gdouble lower = 0.0;
+ gdouble upper = 0.0;
+ gdouble step = 0.0;
+ gdouble page = 0.0;
+ g_object_get( G_OBJECT(act->private_data->adj),
+ "lower", &lower,
+ "upper", &upper,
+ "step-increment", &step,
+ "page-increment", &page,
+ NULL );
+
+ switch ( what ) {
+ case BUMP_TOP:
+ gtk_adjustment_set_value( act->private_data->adj, upper );
+ break;
+
+ case BUMP_PAGE_UP:
+ gtk_adjustment_set_value( act->private_data->adj, base + page );
+ break;
+
+ case BUMP_UP:
+ gtk_adjustment_set_value( act->private_data->adj, base + step );
+ break;
+
+ case BUMP_DOWN:
+ gtk_adjustment_set_value( act->private_data->adj, base - step );
+ break;
+
+ case BUMP_PAGE_DOWN:
+ gtk_adjustment_set_value( act->private_data->adj, base - page );
+ break;
+
+ case BUMP_BOTTOM:
+ gtk_adjustment_set_value( act->private_data->adj, lower );
+ break;
+
+ default:
+ if ( what >= BUMP_CUSTOM ) {
+ guint index = what - BUMP_CUSTOM;
+ if ( index < g_list_length( act->private_data->descriptions ) ) {
+ EgeAdjustmentDescr* descr = (EgeAdjustmentDescr*)g_list_nth_data( act->private_data->descriptions, index );
+ if ( descr ) {
+ gtk_adjustment_set_value( act->private_data->adj, descr->value );
+ }
+ }
+ }
+ }
+ }
+}
+
+static void create_single_menu_item( GCallback toggleCb, int val, GtkWidget* menu, EgeAdjustmentAction* act, GtkWidget** dst, GSList** group, gdouble num, gboolean active )
+{
+ char* str = 0;
+ EgeAdjustmentDescr* marker = 0;
+ GList* cur = act->private_data->descriptions;
+
+ while ( cur ) {
+ EgeAdjustmentDescr* descr = (EgeAdjustmentDescr*)cur->data;
+ gdouble delta = num - descr->value;
+ if ( delta < 0.0 ) {
+ delta = -delta;
+ }
+ if ( delta < act->private_data->epsilon ) {
+ marker = descr;
+ break;
+ }
+ cur = g_list_next( cur );
+ }
+
+ str = g_strdup_printf( act->private_data->format, num,
+ ((marker && marker->descr) ? ": " : ""),
+ ((marker && marker->descr) ? marker->descr : ""));
+
+ *dst = gtk_radio_menu_item_new_with_label( *group, str );
+ if ( !*group) {
+ *group = gtk_radio_menu_item_get_group( GTK_RADIO_MENU_ITEM(*dst) );
+ }
+ if ( active ) {
+ gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(*dst), TRUE );
+ }
+ gtk_menu_shell_append( GTK_MENU_SHELL(menu), *dst );
+ g_object_set_qdata( G_OBJECT(*dst), gDataName, act );
+
+ g_signal_connect( G_OBJECT(*dst), "toggled", toggleCb, GINT_TO_POINTER(val) );
+
+ g_free(str);
+}
+
+static GList* flush_explicit_items( GList* descriptions,
+ GCallback toggleCb,
+ int val,
+ GtkWidget* menu,
+ EgeAdjustmentAction* act,
+ GtkWidget** dst,
+ GSList** group,
+ gdouble num )
+{
+ GList* cur = descriptions;
+
+ if ( cur ) {
+ gdouble valUpper = num + act->private_data->epsilon;
+ gdouble valLower = num - act->private_data->epsilon;
+
+ EgeAdjustmentDescr* descr = (EgeAdjustmentDescr*)cur->data;
+
+ while ( cur && descr && (descr->value >= valLower) ) {
+ if ( descr->value > valUpper ) {
+ create_single_menu_item( toggleCb, val + g_list_position(act->private_data->descriptions, cur), menu, act, dst, group, descr->value, FALSE );
+ }
+
+ cur = g_list_previous( cur );
+ descr = cur ? (EgeAdjustmentDescr*)cur->data : 0;
+ }
+ }
+
+ return cur;
+}
+
+static GtkWidget* create_popup_number_menu( EgeAdjustmentAction* act )
+{
+ GtkWidget* menu = gtk_menu_new();
+
+ GSList* group = 0;
+ GtkWidget* single = 0;
+
+ GList* addOns = g_list_last( act->private_data->descriptions );
+
+ gdouble base = gtk_adjustment_get_value( act->private_data->adj );
+ gdouble lower = 0.0;
+ gdouble upper = 0.0;
+ gdouble step = 0.0;
+ gdouble page = 0.0;
+ g_object_get( G_OBJECT(act->private_data->adj),
+ "lower", &lower,
+ "upper", &upper,
+ "step-increment", &step,
+ "page-increment", &page,
+ NULL );
+
+
+ if ( base < upper ) {
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, upper );
+ create_single_menu_item( G_CALLBACK(process_menu_action), BUMP_TOP, menu, act, &single, &group, upper, FALSE );
+ if ( (base + page) < upper ) {
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, base + page );
+ create_single_menu_item( G_CALLBACK(process_menu_action), BUMP_PAGE_UP, menu, act, &single, &group, base + page, FALSE );
+ }
+ if ( (base + step) < upper ) {
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, base + step );
+ create_single_menu_item( G_CALLBACK(process_menu_action), BUMP_UP, menu, act, &single, &group, base + step, FALSE );
+ }
+ }
+
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, base );
+ create_single_menu_item( G_CALLBACK(process_menu_action), BUMP_NONE, menu, act, &single, &group, base, TRUE );
+
+ if ( base > lower ) {
+ if ( (base - step) > lower ) {
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, base - step );
+ create_single_menu_item( G_CALLBACK(process_menu_action), BUMP_DOWN, menu, act, &single, &group, base - step, FALSE );
+ }
+ if ( (base - page) > lower ) {
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, base - page );
+ create_single_menu_item( G_CALLBACK(process_menu_action), BUMP_PAGE_DOWN, menu, act, &single, &group, base - page, FALSE );
+ }
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, lower );
+ create_single_menu_item( G_CALLBACK(process_menu_action), BUMP_BOTTOM, menu, act, &single, &group, lower, FALSE );
+ }
+
+ if ( act->private_data->descriptions ) {
+ gdouble value = ((EgeAdjustmentDescr*)act->private_data->descriptions->data)->value;
+ addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, value );
+ }
+
+ return menu;
+}
+
static GtkWidget* create_menu_item( GtkAction* action )
{
GtkWidget* item = 0;
- item = gParentClass->create_menu_item( action );
+ if ( IS_EGE_ADJUSTMENT_ACTION(action) ) {
+ EgeAdjustmentAction* act = EGE_ADJUSTMENT_ACTION( action );
+ GValue value;
+ const gchar* sss = 0;
+ GtkWidget* subby = 0;
+
+ memset( &value, 0, sizeof(value) );
+ g_value_init( &value, G_TYPE_STRING );
+ g_object_get_property( G_OBJECT(action), "label", &value );
+
+ sss = g_value_get_string( &value );
+
+ item = gtk_menu_item_new_with_label( sss );
+
+ subby = create_popup_number_menu( act );
+ gtk_menu_item_set_submenu( GTK_MENU_ITEM(item), subby );
+ gtk_widget_show_all( subby );
+ } else {
+ item = gParentClass->create_menu_item( action );
+ }
return item;
}
}
}
+static gboolean event_cb( EgeAdjustmentAction* act, GdkEvent* evt )
+{
+ gboolean handled = FALSE;
+ if ( evt->type == GDK_BUTTON_PRESS ) {
+ if ( evt->button.button == 3 ) {
+ if ( IS_EGE_ADJUSTMENT_ACTION(act) ) {
+ GdkEventButton* btnevt = (GdkEventButton*)evt;
+ GtkWidget* menu = create_popup_number_menu(act);
+ gtk_widget_show_all( menu );
+ gtk_menu_popup( GTK_MENU(menu), NULL, NULL, NULL, NULL, btnevt->button, btnevt->time );
+ }
+ handled = TRUE;
+ }
+ }
+
+ return handled;
+}
+
+static gchar*
+slider_format_falue (GtkScale* scale, gdouble value, gchar *label)
+{
+ (void)scale;
+ return g_strdup_printf("%s %d", label, (int) round(value));
+}
+
static GtkWidget* create_tool_item( GtkAction* action )
{
GtkWidget* item = 0;
if ( IS_EGE_ADJUSTMENT_ACTION(action) ) {
EgeAdjustmentAction* act = EGE_ADJUSTMENT_ACTION( action );
- GtkWidget* spinbutton = gtk_spin_button_new( act->private_data->adj, act->private_data->climbRate, act->private_data->digits );
+ GtkWidget* spinbutton = 0;
GtkWidget* hb = gtk_hbox_new( FALSE, 5 );
- GValue value;
-
- item = GTK_WIDGET( gtk_tool_item_new() );
+ GValue value;
memset( &value, 0, sizeof(value) );
g_value_init( &value, G_TYPE_STRING );
- g_object_get_property( G_OBJECT(action), "label", &value );
+ g_object_get_property( G_OBJECT(action), "short_label", &value );
const gchar* sss = g_value_get_string( &value );
- GtkWidget* lbl = gtk_label_new( sss ? sss : "wwww" );
- gtk_misc_set_alignment( GTK_MISC(lbl), 1.0, 0.5 );
+ if ( act->private_data->appearanceMode == APPEARANCE_FULL ) {
+ // Slider
+ spinbutton = gtk_hscale_new( act->private_data->adj);
+ gtk_widget_set_size_request(spinbutton, 100, -1);
+ gtk_scale_set_digits (GTK_SCALE(spinbutton), 0);
+ gtk_signal_connect(GTK_OBJECT(spinbutton), "format-value", GTK_SIGNAL_FUNC(slider_format_falue), (void *) sss);
+
+#if GTK_CHECK_VERSION(2,12,0)
+ } else if ( act->private_data->appearanceMode == APPEARANCE_MINIMAL ) {
+ spinbutton = gtk_scale_button_new( GTK_ICON_SIZE_MENU, 0, 100, 2, 0 );
+ gtk_scale_button_set_adjustment( GTK_SCALE_BUTTON(spinbutton), act->private_data->adj );
+ gtk_scale_button_set_icons( GTK_SCALE_BUTTON(spinbutton), floogles );
+#endif /* GTK_CHECK_VERSION(2,12,0) */
+ } else {
+ spinbutton = gtk_spin_button_new( act->private_data->adj, act->private_data->climbRate, act->private_data->digits );
+ }
+
+ item = GTK_WIDGET( gtk_tool_item_new() );
+
+ {
+ GValue tooltip;
+ memset( &tooltip, 0, sizeof(tooltip) );
+ g_value_init( &tooltip, G_TYPE_STRING );
+ g_object_get_property( G_OBJECT(action), "tooltip", &tooltip );
+ const gchar* tipstr = g_value_get_string( &tooltip );
+ if ( tipstr && *tipstr ) {
+ if ( !act->private_data->toolTips ) {
+ act->private_data->toolTips = gtk_tooltips_new();
+ }
+ gtk_tooltips_set_tip( act->private_data->toolTips, spinbutton, tipstr, 0 );
+ }
+ }
+
+ if ( act->private_data->appearanceMode != APPEARANCE_FULL ) {
+ GtkWidget* filler1 = gtk_label_new(" ");
+ gtk_box_pack_start( GTK_BOX(hb), filler1, FALSE, FALSE, 0 );
+
+ // Use an icon if available or use short-label
+ if ( act->private_data->iconId && strcmp( act->private_data->iconId, "" ) != 0 ) {
+ GtkWidget* icon = sp_icon_new( act->private_data->iconSize, act->private_data->iconId );
+ gtk_box_pack_start( GTK_BOX(hb), icon, FALSE, FALSE, 0 );
+ } else {
+ GtkWidget* lbl = gtk_label_new( sss ? sss : "wwww" );
+ gtk_misc_set_alignment( GTK_MISC(lbl), 1.0, 0.5 );
+ gtk_box_pack_start( GTK_BOX(hb), lbl, FALSE, FALSE, 0 );
+ }
+ }
+
+ if ( act->private_data->appearanceMode == APPEARANCE_FULL ) {
+ gtk_box_pack_start( GTK_BOX(hb), spinbutton, TRUE, TRUE, 0 );
+ } else {
+ gtk_box_pack_start( GTK_BOX(hb), spinbutton, FALSE, FALSE, 0 );
+ }
- gtk_box_pack_start( GTK_BOX(hb), lbl, FALSE, FALSE, 0 );
- gtk_box_pack_end( GTK_BOX(hb), spinbutton, FALSE, FALSE, 0 );
gtk_container_add( GTK_CONTAINER(item), hb );
if ( act->private_data->selfId ) {
- gtk_object_set_data( GTK_OBJECT(spinbutton), act->private_data->selfId, spinbutton );
+ g_object_set_data( G_OBJECT(spinbutton), act->private_data->selfId, spinbutton );
}
g_signal_connect( G_OBJECT(spinbutton), "focus-in-event", G_CALLBACK(focus_in_cb), action );
g_signal_connect( G_OBJECT(spinbutton), "key-press-event", G_CALLBACK(keypress_cb), action );
g_signal_connect( G_OBJECT(spinbutton), "value-changed", G_CALLBACK(value_changed_cb), action );
-/* g_signal_connect( G_OBJECT(EGE_ADJUSTMENT_ACTION(action)->private_data->adj), "value-changed", G_CALLBACK(flippy), action ); */
+ g_signal_connect_swapped( G_OBJECT(spinbutton), "event", G_CALLBACK(event_cb), action );
+ if ( act->private_data->appearanceMode == APPEARANCE_FULL ) {
+ /* */
+#if GTK_CHECK_VERSION(2,12,0)
+ } else if ( act->private_data->appearanceMode == APPEARANCE_MINIMAL ) {
+ /* */
+#endif /* GTK_CHECK_VERSION(2,12,0) */
+ } else {
+ gtk_entry_set_width_chars( GTK_ENTRY(spinbutton), act->private_data->digits + 3 );
+ }
gtk_widget_show_all( item );
+
+ /* Shrink or whatnot after shown */
+ if ( act->private_data->toolPost ) {
+ act->private_data->toolPost( item );
+ }
} else {
item = gParentClass->create_tool_item( action );
}
(void)event;
if ( IS_EGE_ADJUSTMENT_ACTION(data) ) {
EgeAdjustmentAction* action = EGE_ADJUSTMENT_ACTION( data );
- action->private_data->lastVal = gtk_spin_button_get_value( GTK_SPIN_BUTTON(widget) );
+ if ( GTK_IS_SPIN_BUTTON(widget) ) {
+ action->private_data->lastVal = gtk_spin_button_get_value( GTK_SPIN_BUTTON(widget) );
+#if GTK_CHECK_VERSION(2,12,0)
+ } else if ( GTK_IS_SCALE_BUTTON(widget) ) {
+ action->private_data->lastVal = gtk_scale_button_get_value( GTK_SCALE_BUTTON(widget) );
+#endif /* GTK_CHECK_VERSION(2,12,0) */
+ } else if (GTK_IS_RANGE(widget) ) {
+ action->private_data->lastVal = gtk_range_get_value( GTK_RANGE(widget) );
+ }
action->private_data->transferFocus = TRUE;
}