X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;fp=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=3918f2f2553314be3cc03686d10e24cafe8a10da;hb=cf63d499efd5e6ca3a7dcc6386b3b87bd31bfda9;hp=28293808a4ee884ae2465bf73253f5e771c5202a;hpb=48b54234689ebdff3c34b280ec6780bef8a9f526;p=pspp-builds.git diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index 28293808..3918f2f2 100644 --- a/src/ui/gui/val-labs-dialog.c +++ b/src/ui/gui/val-labs-dialog.c @@ -32,35 +32,35 @@ /* This callback occurs when the text in the label entry box is changed */ static void -on_label_entry_change(GtkEntry *entry, gpointer data) +on_label_entry_change (GtkEntry *entry, gpointer data) { union value v; const gchar *text ; struct val_labs_dialog *dialog = data; - g_assert(dialog->labs); + g_assert (dialog->labs); - text = gtk_entry_get_text(GTK_ENTRY(dialog->value_entry)); + text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry)); - text_to_value(text, &v, + text_to_value (text, &v, *var_get_write_format (dialog->pv)); if ( val_labs_find (dialog->labs, v) ) { - gtk_widget_set_sensitive(dialog->change_button, TRUE); - gtk_widget_set_sensitive(dialog->add_button, FALSE); + gtk_widget_set_sensitive (dialog->change_button, TRUE); + gtk_widget_set_sensitive (dialog->add_button, FALSE); } else { - gtk_widget_set_sensitive(dialog->change_button, FALSE); - gtk_widget_set_sensitive(dialog->add_button, TRUE); + gtk_widget_set_sensitive (dialog->change_button, FALSE); + gtk_widget_set_sensitive (dialog->add_button, TRUE); } } /* Set the TREEVIEW list cursor to the item which has the value VAL */ static void -select_treeview_from_value(GtkTreeView *treeview, union value *val) +select_treeview_from_value (GtkTreeView *treeview, union value *val) { GtkTreePath *path ; @@ -69,31 +69,31 @@ select_treeview_from_value(GtkTreeView *treeview, union value *val) efficient, but the list is short ... */ GtkTreeIter iter; - GtkTreeModel * model = gtk_tree_view_get_model(treeview); + GtkTreeModel * model = gtk_tree_view_get_model (treeview); gboolean success; - for (success = gtk_tree_model_get_iter_first(model, &iter); + for (success = gtk_tree_model_get_iter_first (model, &iter); success; - success = gtk_tree_model_iter_next(model, &iter)) + success = gtk_tree_model_iter_next (model, &iter)) { union value v; GValue gvalue = {0}; - gtk_tree_model_get_value(model, &iter, 1, &gvalue); + gtk_tree_model_get_value (model, &iter, 1, &gvalue); - v.f = g_value_get_double(&gvalue); + v.f = g_value_get_double (&gvalue); - if ( 0 == memcmp(&v, val, sizeof (union value))) + if ( 0 == memcmp (&v, val, sizeof (union value))) { break; } } - path = gtk_tree_model_get_path(model, &iter); + path = gtk_tree_model_get_path (model, &iter); if ( path ) { - gtk_tree_view_set_cursor(treeview, path, 0, 0); - gtk_tree_path_free(path); + gtk_tree_view_set_cursor (treeview, path, 0, 0); + gtk_tree_path_free (path); } } @@ -102,39 +102,39 @@ select_treeview_from_value(GtkTreeView *treeview, union value *val) /* This callback occurs when the text in the value entry box is changed */ static void -on_value_entry_change(GtkEntry *entry, gpointer data) +on_value_entry_change (GtkEntry *entry, gpointer data) { char *s; struct val_labs_dialog *dialog = data; - const gchar *text = gtk_entry_get_text(GTK_ENTRY(dialog->value_entry)); + const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry)); union value v; - text_to_value(text, &v, + text_to_value (text, &v, *var_get_write_format (dialog->pv)); - g_signal_handler_block(GTK_ENTRY(dialog->label_entry), + g_signal_handler_block (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); - gtk_entry_set_text(GTK_ENTRY(dialog->label_entry),""); + gtk_entry_set_text (GTK_ENTRY (dialog->label_entry),""); if ( (s = val_labs_find (dialog->labs, v)) ) { - gtk_entry_set_text(GTK_ENTRY(dialog->label_entry), s); - gtk_widget_set_sensitive(dialog->add_button, FALSE); - gtk_widget_set_sensitive(dialog->remove_button, TRUE); - select_treeview_from_value(GTK_TREE_VIEW(dialog->treeview), &v); + gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), s); + gtk_widget_set_sensitive (dialog->add_button, FALSE); + gtk_widget_set_sensitive (dialog->remove_button, TRUE); + select_treeview_from_value (GTK_TREE_VIEW (dialog->treeview), &v); } else { - gtk_widget_set_sensitive(dialog->remove_button, FALSE); - gtk_widget_set_sensitive(dialog->add_button, TRUE); + gtk_widget_set_sensitive (dialog->remove_button, FALSE); + gtk_widget_set_sensitive (dialog->add_button, TRUE); } - g_signal_handler_unblock(GTK_ENTRY(dialog->label_entry), + g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); } @@ -142,7 +142,7 @@ on_value_entry_change(GtkEntry *entry, gpointer data) /* Callback for when the Value Labels dialog is closed using the OK button.*/ static gint -val_labs_ok(GtkWidget *w, gpointer data) +val_labs_ok (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; @@ -158,7 +158,7 @@ val_labs_ok(GtkWidget *w, gpointer data) /* Callback for when the Value Labels dialog is closed using the Cancel button.*/ static gint -val_labs_cancel(GtkWidget *w, gpointer data) +val_labs_cancel (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; @@ -171,24 +171,24 @@ val_labs_cancel(GtkWidget *w, gpointer data) /* Return the value-label pair currently selected in the dialog box */ static struct val_lab * -get_selected_tuple(struct val_labs_dialog *dialog) +get_selected_tuple (struct val_labs_dialog *dialog) { - GtkTreeView *treeview = GTK_TREE_VIEW(dialog->treeview); + GtkTreeView *treeview = GTK_TREE_VIEW (dialog->treeview); static struct val_lab vl; GtkTreeIter iter ; GValue the_value = {0}; - GtkTreeSelection* sel = gtk_tree_view_get_selection(treeview); + GtkTreeSelection* sel = gtk_tree_view_get_selection (treeview); - GtkTreeModel * model = gtk_tree_view_get_model(treeview); + GtkTreeModel * model = gtk_tree_view_get_model (treeview); gtk_tree_selection_get_selected (sel, &model, &iter); - gtk_tree_model_get_value(model, &iter, 1, &the_value); + gtk_tree_model_get_value (model, &iter, 1, &the_value); - vl.value.f = g_value_get_double(&the_value); - g_value_unset(&the_value); + vl.value.f = g_value_get_double (&the_value); + g_value_unset (&the_value); vl.label = val_labs_find (dialog->labs, vl.value); @@ -196,42 +196,42 @@ get_selected_tuple(struct val_labs_dialog *dialog) } -static void repopulate_dialog(struct val_labs_dialog *dialog); +static void repopulate_dialog (struct val_labs_dialog *dialog); /* Callback which occurs when the "Change" button is clicked */ static gint -on_change(GtkWidget *w, gpointer data) +on_change (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; - const gchar *val_text = gtk_entry_get_text(GTK_ENTRY(dialog->value_entry)); + const gchar *val_text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry)); union value v; - text_to_value(val_text, &v, + text_to_value (val_text, &v, *var_get_write_format (dialog->pv)); val_labs_replace (dialog->labs, v, - gtk_entry_get_text (GTK_ENTRY(dialog->label_entry))); + gtk_entry_get_text (GTK_ENTRY (dialog->label_entry))); gtk_widget_set_sensitive (dialog->change_button, FALSE); - repopulate_dialog(dialog); + repopulate_dialog (dialog); return FALSE; } /* Callback which occurs when the "Add" button is clicked */ static gint -on_add(GtkWidget *w, gpointer data) +on_add (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; union value v; - const gchar *text = gtk_entry_get_text(GTK_ENTRY(dialog->value_entry)); + const gchar *text = gtk_entry_get_text (GTK_ENTRY (dialog->value_entry)); - text_to_value(text, &v, + text_to_value (text, &v, *var_get_write_format (dialog->pv)); @@ -240,26 +240,26 @@ on_add(GtkWidget *w, gpointer data) ( GTK_ENTRY (dialog->label_entry)) ) ) return FALSE; - gtk_widget_set_sensitive(dialog->add_button, FALSE); + gtk_widget_set_sensitive (dialog->add_button, FALSE); - repopulate_dialog(dialog); + repopulate_dialog (dialog); return FALSE; } /* Callback which occurs when the "Remove" button is clicked */ static gint -on_remove(GtkWidget *w, gpointer data) +on_remove (GtkWidget *w, gpointer data) { struct val_labs_dialog *dialog = data; - struct val_lab *vl = get_selected_tuple(dialog); + struct val_lab *vl = get_selected_tuple (dialog); val_labs_remove (dialog->labs, vl->value); - repopulate_dialog(dialog); + repopulate_dialog (dialog); - gtk_widget_set_sensitive(dialog->remove_button, FALSE); + gtk_widget_set_sensitive (dialog->remove_button, FALSE); return FALSE; } @@ -275,65 +275,65 @@ on_select_row (GtkTreeView *treeview, gchar *labeltext; struct val_labs_dialog *dialog = data; - struct val_lab * vl = get_selected_tuple(dialog); + struct val_lab * vl = get_selected_tuple (dialog); - gchar *const text = value_to_text(vl->value, + gchar *const text = value_to_text (vl->value, *var_get_write_format (dialog->pv)); - g_signal_handler_block(GTK_ENTRY(dialog->value_entry), + g_signal_handler_block (GTK_ENTRY (dialog->value_entry), dialog->value_handler_id); - gtk_entry_set_text(GTK_ENTRY(dialog->value_entry), text); + gtk_entry_set_text (GTK_ENTRY (dialog->value_entry), text); - g_signal_handler_unblock(GTK_ENTRY(dialog->value_entry), + g_signal_handler_unblock (GTK_ENTRY (dialog->value_entry), dialog->value_handler_id); - g_free(text); + g_free (text); - g_signal_handler_block(GTK_ENTRY(dialog->label_entry), + g_signal_handler_block (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); - labeltext = pspp_locale_to_utf8(vl->label, -1, 0); - gtk_entry_set_text(GTK_ENTRY(dialog->label_entry), + labeltext = pspp_locale_to_utf8 (vl->label, -1, 0); + gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), labeltext); - g_free(labeltext); + g_free (labeltext); - g_signal_handler_unblock(GTK_ENTRY(dialog->label_entry), + g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); - gtk_widget_set_sensitive(dialog->remove_button, TRUE); - gtk_widget_set_sensitive(dialog->change_button, FALSE); + gtk_widget_set_sensitive (dialog->remove_button, TRUE); + gtk_widget_set_sensitive (dialog->change_button, FALSE); } /* Create a new dialog box (there should normally be only one)*/ struct val_labs_dialog * -val_labs_dialog_create(GladeXML *xml) +val_labs_dialog_create (GladeXML *xml) { GtkTreeViewColumn *column; GtkCellRenderer *renderer ; - struct val_labs_dialog *dialog = g_malloc(sizeof(*dialog)); + struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog)); - dialog->window = get_widget_assert(xml,"val_labs_dialog"); - dialog->value_entry = get_widget_assert(xml,"value_entry"); - dialog->label_entry = get_widget_assert(xml,"label_entry"); + dialog->window = get_widget_assert (xml,"val_labs_dialog"); + dialog->value_entry = get_widget_assert (xml,"value_entry"); + dialog->label_entry = get_widget_assert (xml,"label_entry"); gtk_window_set_transient_for - (GTK_WINDOW(dialog->window), - GTK_WINDOW(get_widget_assert(xml, "data_editor"))); + (GTK_WINDOW (dialog->window), + GTK_WINDOW (get_widget_assert (xml, "data_editor"))); - dialog->ok = get_widget_assert(xml, "val_labs_ok"); - dialog->add_button = get_widget_assert(xml, "val_labs_add"); - dialog->remove_button = get_widget_assert(xml, "val_labs_remove"); - dialog->change_button = get_widget_assert(xml, "val_labs_change"); + dialog->ok = get_widget_assert (xml, "val_labs_ok"); + dialog->add_button = get_widget_assert (xml, "val_labs_add"); + dialog->remove_button = get_widget_assert (xml, "val_labs_remove"); + dialog->change_button = get_widget_assert (xml, "val_labs_change"); - dialog->treeview = get_widget_assert(xml,"treeview1"); + dialog->treeview = get_widget_assert (xml,"treeview1"); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(dialog->treeview), FALSE); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (dialog->treeview), FALSE); - renderer = gtk_cell_renderer_text_new(); + renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Title", renderer, @@ -343,40 +343,40 @@ val_labs_dialog_create(GladeXML *xml) gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->treeview), column); - g_signal_connect(GTK_OBJECT(get_widget_assert(xml, "val_labs_cancel")), + g_signal_connect (GTK_OBJECT (get_widget_assert (xml, "val_labs_cancel")), "clicked", - GTK_SIGNAL_FUNC(val_labs_cancel), dialog); + GTK_SIGNAL_FUNC (val_labs_cancel), dialog); dialog->change_handler_id = - g_signal_connect(GTK_OBJECT(dialog->label_entry), + g_signal_connect (GTK_OBJECT (dialog->label_entry), "changed", - GTK_SIGNAL_FUNC(on_label_entry_change), dialog); + GTK_SIGNAL_FUNC (on_label_entry_change), dialog); dialog->value_handler_id = - g_signal_connect(GTK_OBJECT(dialog->value_entry), + g_signal_connect (GTK_OBJECT (dialog->value_entry), "changed", - GTK_SIGNAL_FUNC(on_value_entry_change), dialog); + GTK_SIGNAL_FUNC (on_value_entry_change), dialog); - g_signal_connect(GTK_OBJECT(dialog->change_button), + g_signal_connect (GTK_OBJECT (dialog->change_button), "clicked", - GTK_SIGNAL_FUNC(on_change), dialog); + GTK_SIGNAL_FUNC (on_change), dialog); - g_signal_connect(GTK_OBJECT(get_widget_assert(xml, "val_labs_ok")), + g_signal_connect (GTK_OBJECT (get_widget_assert (xml, "val_labs_ok")), "clicked", - GTK_SIGNAL_FUNC(val_labs_ok), dialog); + GTK_SIGNAL_FUNC (val_labs_ok), dialog); - g_signal_connect(GTK_OBJECT(dialog->treeview), "cursor-changed", - GTK_SIGNAL_FUNC(on_select_row), dialog); + g_signal_connect (GTK_OBJECT (dialog->treeview), "cursor-changed", + GTK_SIGNAL_FUNC (on_select_row), dialog); - g_signal_connect(GTK_OBJECT(dialog->remove_button), "clicked", - GTK_SIGNAL_FUNC(on_remove), dialog); + g_signal_connect (GTK_OBJECT (dialog->remove_button), "clicked", + GTK_SIGNAL_FUNC (on_remove), dialog); - g_signal_connect(GTK_OBJECT(dialog->add_button), "clicked", - GTK_SIGNAL_FUNC(on_add), dialog); + g_signal_connect (GTK_OBJECT (dialog->add_button), "clicked", + GTK_SIGNAL_FUNC (on_add), dialog); dialog->labs = 0; @@ -387,7 +387,7 @@ val_labs_dialog_create(GladeXML *xml) /* Populate the components of the dialog box, from the 'labs' member variable */ static void -repopulate_dialog(struct val_labs_dialog *dialog) +repopulate_dialog (struct val_labs_dialog *dialog) { struct val_labs_iterator *vli = 0; struct val_lab *vl; @@ -398,33 +398,33 @@ repopulate_dialog(struct val_labs_dialog *dialog) G_TYPE_STRING, G_TYPE_DOUBLE); - g_signal_handler_block(GTK_ENTRY(dialog->label_entry), + g_signal_handler_block (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); - g_signal_handler_block(GTK_ENTRY(dialog->value_entry), + g_signal_handler_block (GTK_ENTRY (dialog->value_entry), dialog->value_handler_id); - gtk_entry_set_text(GTK_ENTRY(dialog->value_entry), ""); - gtk_entry_set_text(GTK_ENTRY(dialog->label_entry), ""); + gtk_entry_set_text (GTK_ENTRY (dialog->value_entry), ""); + gtk_entry_set_text (GTK_ENTRY (dialog->label_entry), ""); - g_signal_handler_unblock(GTK_ENTRY(dialog->value_entry), + g_signal_handler_unblock (GTK_ENTRY (dialog->value_entry), dialog->value_handler_id); - g_signal_handler_unblock(GTK_ENTRY(dialog->label_entry), + g_signal_handler_unblock (GTK_ENTRY (dialog->label_entry), dialog->change_handler_id); - for(vl = val_labs_first_sorted (dialog->labs, &vli); + for (vl = val_labs_first_sorted (dialog->labs, &vli); vl; - vl = val_labs_next(dialog->labs, &vli)) + vl = val_labs_next (dialog->labs, &vli)) { gchar *const vstr = - value_to_text(vl->value, + value_to_text (vl->value, *var_get_write_format (dialog->pv)); gchar *labeltext = - pspp_locale_to_utf8(vl->label, -1, 0); + pspp_locale_to_utf8 (vl->label, -1, 0); - gchar *const text = g_strdup_printf("%s = \"%s\"", + gchar *const text = g_strdup_printf ("%s = \"%s\"", vstr, labeltext); @@ -434,25 +434,25 @@ repopulate_dialog(struct val_labs_dialog *dialog) 1, vl->value.f, -1); - g_free(labeltext); - g_free(text); - g_free(vstr); + g_free (labeltext); + g_free (text); + g_free (vstr); } - gtk_tree_view_set_model(GTK_TREE_VIEW(dialog->treeview), - GTK_TREE_MODEL(list_store)); + gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview), + GTK_TREE_MODEL (list_store)); - g_object_unref(list_store); + g_object_unref (list_store); } /* Initialise and display the dialog box */ void -val_labs_dialog_show(struct val_labs_dialog *dialog) +val_labs_dialog_show (struct val_labs_dialog *dialog) { const struct val_labs *value_labels; - g_assert(!dialog->labs); + g_assert (!dialog->labs); value_labels = var_get_value_labels (dialog->pv); @@ -460,12 +460,12 @@ val_labs_dialog_show(struct val_labs_dialog *dialog) dialog->labs = val_labs_copy ( value_labels ); else dialog->labs = val_labs_create ( var_get_width (dialog->pv)); - - gtk_widget_set_sensitive(dialog->remove_button, FALSE); - gtk_widget_set_sensitive(dialog->change_button, FALSE); - gtk_widget_set_sensitive(dialog->add_button, FALSE); - repopulate_dialog(dialog); - gtk_widget_show(dialog->window); + gtk_widget_set_sensitive (dialog->remove_button, FALSE); + gtk_widget_set_sensitive (dialog->change_button, FALSE); + gtk_widget_set_sensitive (dialog->add_button, FALSE); + + repopulate_dialog (dialog); + gtk_widget_show (dialog->window); }