![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index a2ea9ff0db9842fc8d3b28c2134351c8feeea71f..179f1f24877fce91f415b2ab05b6f457f553b216 100644 (file)
#include <gtk/gtklabel.h>
#include <gtk/gtkmisc.h>
#include <gtk/gtktoolbar.h>
+#include <gtk/gtkradiomenuitem.h>
#include "ege-adjustment-action.h"
static GtkActionClass* gParentClass = 0;
-
+static GQuark gDataName = 0;
struct _EgeAdjustmentActionPrivate
{
gdouble climbRate;
guint digits;
gchar* selfId;
+ EgeWidgetFixup toolPost;
gdouble lastVal;
gdouble step;
gdouble page;
PROP_FOCUS_WIDGET,
PROP_CLIMB_RATE,
PROP_DIGITS,
- PROP_SELFID
+ PROP_SELFID,
+ PROP_TOOL_POST
+};
+
+enum {
+ BUMP_TOP = 0,
+ BUMP_PAGE_UP,
+ BUMP_UP,
+ BUMP_NONE,
+ BUMP_DOWN,
+ BUMP_PAGE_DOWN,
+ BUMP_BOTTOM
};
GType ege_adjustment_action_get_type( void )
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->get_property = ege_adjustment_action_get_property;
objClass->set_property = ege_adjustment_action_set_property;
@@ -174,6 +189,13 @@ 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_type_class_add_private( klass, sizeof(EgeAdjustmentActionClass) );
}
}
action->private_data->climbRate = 0.0;
action->private_data->digits = 2;
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;
@@ -239,6 +262,10 @@ 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;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
}
@@ -288,6 +315,12 @@ 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;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
}
@@ -316,11 +349,142 @@ GtkWidget* ege_adjustment_action_get_focuswidget( EgeAdjustmentAction* action )
return action->private_data->focusWidget;
}
+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;
+ }
+ }
+}
+
+static void create_single_menu( GCallback toggleCb, int val, GtkWidget* menu, EgeAdjustmentAction* act, GtkWidget** dst, GSList** group, gdouble num, gboolean active )
+{
+ char* fmt = g_strdup_printf("%%0.%df", act->private_data->digits);
+ char *str = g_strdup_printf ( fmt, num );
+
+ *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);
+ g_free(fmt);
+}
+
+static GtkWidget* create_popup_number_menu( EgeAdjustmentAction* act )
+{
+ GtkWidget* menu = gtk_menu_new();
+
+ GSList* group = 0;
+ GtkWidget* single = 0;
+
+ 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 ) {
+ create_single_menu( G_CALLBACK(process_menu_action), BUMP_TOP, menu, act, &single, &group, upper, FALSE );
+ if ( (base + page) < upper ) {
+ create_single_menu( G_CALLBACK(process_menu_action), BUMP_PAGE_UP, menu, act, &single, &group, base + page, FALSE );
+ }
+ if ( (base + step) < upper ) {
+ create_single_menu( G_CALLBACK(process_menu_action), BUMP_UP, menu, act, &single, &group, base + step, FALSE );
+ }
+ }
+
+ create_single_menu( G_CALLBACK(process_menu_action), BUMP_NONE, menu, act, &single, &group, base, TRUE );
+ if ( base > lower ) {
+ if ( (base - step) > lower ) {
+ create_single_menu( G_CALLBACK(process_menu_action), BUMP_DOWN, menu, act, &single, &group, base - step, FALSE );
+ }
+ if ( (base - page) > lower ) {
+ create_single_menu( G_CALLBACK(process_menu_action), BUMP_PAGE_DOWN, menu, act, &single, &group, base - page, FALSE );
+ }
+ create_single_menu( G_CALLBACK(process_menu_action), BUMP_BOTTOM, menu, act, &single, &group, lower, FALSE );
+ }
+
+ 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 GtkWidget* create_tool_item( GtkAction* action )
{
GtkWidget* item = 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 );
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 );
}