gboolean res;
gint index, x, y;
- if(memo->type == Label) { ((ButtonCallback*) memo->target)(memo->value); return TRUE; } // only clock widgets use this
-
switch(event->type) { // figure out what's up
case GDK_MOTION_NOTIFY:
f = 0;
button = bevent->button;
shiftState = bevent->state & GDK_SHIFT_MASK;
controlState = bevent->state & GDK_CONTROL_MASK;
+ if(memo->type == Label) { // only clock widgets use this
+ ((ButtonCallback*) memo->target)(button == 1 ? memo->value : -memo->value);
+ return TRUE;
+ }
// GTK_TODO: is this really the most efficient way to get the character at the mouse cursor???
gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(widget), GTK_TEXT_WINDOW_WIDGET, w, h, &x, &y);
gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(widget), &start, x, y);
SameRow (Option *opt)
{
return (opt->min & SAME_ROW && (opt->type == Button || opt->type == SaveButton || opt->type == Label
- || opt->type == ListBox || opt->type == BoxBegin || opt->type == Icon));
+ || opt->type == ListBox || opt->type == BoxBegin || opt->type == Icon || opt->type == Graph));
}
static void
if(SameRow(&option[i+1])) {
GtkAttachOptions x = GTK_FILL;
// make sure hbox is always available when we have more options on same row
- hbox = gtk_hbox_new (option[i].type == Button && option[i].textValue, 0);
+ hbox = gtk_hbox_new (option[i].type == Button && option[i].textValue || option[i].type == Graph, 0);
if(!currentCps && option[i].value > 80) x |= GTK_EXPAND; // only vertically extended widgets should size vertically
if (strcmp(option[i].name, "") == 0 || option[i].type == Label || option[i].type == Button)
// for Label and Button name is contained inside option
label = frame;
}
gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1);
- Pack(hbox, table, label, left, left+2, top, 0);
if(option[i].target) { // allow user to specify event handler for button presses
+ button = gtk_event_box_new();
+ gtk_container_add(GTK_CONTAINER(button), label);
+ label = button;
gtk_widget_add_events(GTK_WIDGET(label), GDK_BUTTON_PRESS_MASK);
g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]);
+ gtk_widget_set_sensitive(label, TRUE);
}
+ Pack(hbox, table, label, left, left+2, top, 0);
break;
case SaveButton:
case Button:
g_signal_connect (graph, "button-press-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
g_signal_connect (graph, "button-release-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
g_signal_connect (graph, "motion-notify-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
- if(0) {
- GtkWidget *frame = gtk_aspect_frame_new(NULL, 0, 0, 1, FALSE);
-// gtk_frame_set_shadow_type(frame, GTK_SHADOW_NONE);
+ if(option[i].min & FIX_H) { // logo
+ GtkWidget *frame = gtk_aspect_frame_new(NULL, 0.5, 0.5, option[i].max/(float)option[i].value, FALSE);
+ gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);
gtk_container_add(GTK_CONTAINER(frame), graph);
graph = frame;
}
gtk_widget_show_all( dialog );
/* hide OK/cancel buttons */
- if((option[i].min & 2)) {
+ if((option[i].min & NO_OK)) {
actionarea = gtk_dialog_get_action_area(GTK_DIALOG(dialog));
gtk_widget_hide(actionarea);
+ } else if((option[i].min & NO_CANCEL)) {
+ button = gtk_dialog_get_widget_for_response(GTK_DIALOG(dialog), GTK_RESPONSE_REJECT);
+ gtk_widget_hide(button);
}
g_signal_connect (dialog, "response",