From: Ben Pfaff Date: Mon, 12 Nov 2012 16:57:34 +0000 (-0800) Subject: Merge 'master' into 'psppsheet'. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6493cbb201307a2a5d1ff840a8347d75548cb85;hp=-c;p=pspp Merge 'master' into 'psppsheet'. --- b6493cbb201307a2a5d1ff840a8347d75548cb85 diff --combined src/ui/gui/compute-dialog.c index 9ddb66d48e,30456a3818..46f9fbe078 --- a/src/ui/gui/compute-dialog.c +++ b/src/ui/gui/compute-dialog.c @@@ -21,6 -21,7 +21,6 @@@ #include "psppire-dialog.h" #include "psppire-keypad.h" #include "psppire-data-window.h" -#include "psppire-var-store.h" #include "psppire-selector.h" #include "dialog-common.h" #include @@@ -304,6 -305,24 +304,24 @@@ run_type_label_dialog (GtkButton *b, gp cd->use_type = TRUE; } + static void + on_type_toggled (GtkToggleButton *button, gpointer data) + { + struct compute_dialog *cd = data; + + GtkWidget *entry = + get_widget_assert (cd->xml, "type-and-label-width"); + + if ( gtk_toggle_button_get_active (button)) + { + gtk_widget_set_sensitive (entry, TRUE); + gtk_widget_grab_focus (entry); + } + else + { + gtk_widget_set_sensitive (entry, FALSE); + } + } static void on_expression_toggle (GtkToggleButton *button, gpointer data) @@@ -320,7 -339,6 +338,6 @@@ } else { - const char *label; struct variable *target_var; const gchar *target_name = gtk_entry_get_text (GTK_ENTRY (get_widget_assert (cd->xml, "compute-entry1"))); @@@ -328,7 -346,7 +345,7 @@@ target_var = psppire_dict_lookup_var (cd->dict, target_name); if ( target_var ) { - label = var_get_label (target_var); + const char *label = var_get_label (target_var); if ( label ) gtk_entry_set_text (GTK_ENTRY (entry), label); @@@ -337,6 -355,7 +354,7 @@@ gtk_entry_set_text (GTK_ENTRY (entry), ""); gtk_widget_set_sensitive (entry, TRUE); + gtk_widget_grab_focus (entry); } } @@@ -368,6 -387,7 +386,6 @@@ compute_dialog (PsppireDataWindow *de { gint response; - PsppireVarStore *vs = NULL; struct compute_dialog scd; GtkBuilder *xml = builder_new ("compute.ui"); @@@ -385,13 -405,20 +403,19 @@@ GtkWidget *expression = get_widget_assert (xml, "radio-button-expression-label"); + GtkWidget *str_btn = + get_widget_assert (xml, "radio-button-string"); + - g_object_get (de->data_editor, "var-store", &vs, NULL); - g_object_get (vs, "dictionary", &scd.dict, NULL); + g_object_get (de->data_editor, "dictionary", &scd.dict, NULL); scd.use_type = FALSE; g_signal_connect (expression, "toggled", G_CALLBACK(on_expression_toggle), &scd); + g_signal_connect (str_btn, "toggled", + G_CALLBACK(on_type_toggled), &scd); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); diff --combined src/ui/gui/recode-dialog.c index 543286094d,73787b4051..05984dd44b --- a/src/ui/gui/recode-dialog.c +++ b/src/ui/gui/recode-dialog.c @@@ -37,6 -37,7 +37,6 @@@ #include #include "helper.h" #include -#include #include "psppire-val-chooser.h" @@@ -550,6 -551,14 +550,14 @@@ on_change_clicked (GObject *obj, gpoint } + static void + focus_value_entry (GtkWidget *w, struct recode_dialog *rd) + { + if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w))) + gtk_widget_grab_focus (rd->new_value_entry); + } + + /* Callback for the new_value_entry and new_value_togglebutton widgets. It's used to enable/disable the acr. */ static void @@@ -611,6 -620,9 +619,6 @@@ recode_dialog (PsppireDataWindow *de, g GtkWidget *output_variable_box = get_widget_assert (builder,"frame4"); - PsppireVarStore *vs = NULL; - g_object_get (de->data_editor, "var-store", &vs, NULL); - rd.change_button = get_widget_assert (builder, "change-button"); rd.varmap = NULL; rd.dialog = get_widget_assert (builder, "recode-dialog"); @@@ -619,7 -631,7 +627,7 @@@ rd.new_name_entry = get_widget_assert (builder, "dest-name-entry"); rd.new_label_entry = get_widget_assert (builder, "dest-label-entry"); - g_object_get (vs, "dictionary", &rd.dict, NULL); + g_object_get (de->data_editor, "dictionary", &rd.dict, NULL); rd.value_map = gtk_list_store_new (2, old_value_get_type (), @@@ -710,6 -722,9 +718,9 @@@ g_signal_connect_swapped (rd.toggle[BUTTON_NEW_VALUE], "toggled", G_CALLBACK (set_acr), &rd); + g_signal_connect_after (rd.toggle[BUTTON_NEW_VALUE], "toggled", + G_CALLBACK (focus_value_entry), &rd); + g_signal_connect_swapped (rd.new_value_entry, "changed", G_CALLBACK (set_acr), &rd); diff --combined src/ui/gui/t-test-paired-samples.c index 1b1cfbc87f,6ad281c337..4f8baeeb0d --- a/src/ui/gui/t-test-paired-samples.c +++ b/src/ui/gui/t-test-paired-samples.c @@@ -1,5 -1,5 +1,5 @@@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2011 Free Software Foundation + Copyright (C) 2011, 2012 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@@ -26,6 -26,7 +26,6 @@@ #include "psppire-var-view.h" #include "psppire-dict.h" -#include "psppire-var-store.h" #include "dialog-common.h" #include "psppire-dialog.h" @@@ -89,7 -90,7 +89,7 @@@ t_test_paired_samples_dialog (PsppireDa struct tt_options_dialog *opts = tt_options_dialog_create (GTK_WINDOW (de)); GtkWidget *bb = gtk_hbutton_box_new (); - GtkWidget *opt = gtk_button_new_with_mnemonic (_("_Options")); + GtkWidget *opt = gtk_button_new_with_mnemonic (_("O_ptions...")); gtk_box_pack_start (GTK_BOX (bb), opt, TRUE, TRUE, 5); gtk_widget_show_all (bb);