X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmenu-actions.c;h=bd56691dc60dda5141c65df39c14e20908eb7d8e;hb=75aeeafa67aa460512683311566a83917d399c70;hp=0271837063f7e80376432c1f3424c1b663ba04a7;hpb=573068f2bdcd3f8796e9646668fed910a90f890b;p=pspp-builds.git diff --git a/src/ui/gui/menu-actions.c b/src/ui/gui/menu-actions.c index 02718370..bd56691d 100644 --- a/src/ui/gui/menu-actions.c +++ b/src/ui/gui/menu-actions.c @@ -20,6 +20,10 @@ #include #include +#include +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + #include #include @@ -40,8 +44,6 @@ #include "psppire-var-store.h" #include "psppire-data-store.h" -#define _(A) A -#define N_(A) A extern GladeXML *xml; @@ -55,9 +57,9 @@ static struct file_handle *psppire_handle = 0; static const gchar handle_name[] = "psppire_handle"; -static const gchar untitled[] = _("Untitled"); +static const gchar untitled[] = N_("Untitled"); -static const gchar window_title[]=_("PSPP Data Editor"); +static const gchar window_title[] = N_("PSPP Data Editor"); static void @@ -65,7 +67,7 @@ psppire_set_window_title(const gchar *text) { GtkWidget *data_editor = get_widget_assert(xml, "data_editor"); - gchar *title = g_strdup_printf("%s --- %s", text, window_title); + gchar *title = g_strdup_printf("%s --- %s", text, gettext(window_title)); gtk_window_set_title(GTK_WINDOW(data_editor), title); @@ -76,16 +78,24 @@ void on_new1_activate (GtkMenuItem *menuitem, gpointer user_data) { + GtkWidget *data_sheet = get_widget_assert(xml, "data_sheet"); + GtkWidget *var_sheet = get_widget_assert(xml, "variable_sheet"); + + gtk_sheet_set_active_cell(GTK_SHEET(data_sheet), -1, -1); + + gtk_sheet_set_active_cell(GTK_SHEET(var_sheet), 0, 0); + psppire_dict_clear(the_dictionary); psppire_case_array_clear(the_cases); - - psppire_set_window_title(untitled); + + psppire_set_window_title(gettext(untitled)); if (psppire_handle) fh_free(psppire_handle); psppire_handle = 0 ; } + static gboolean populate_case_from_reader(struct ccase *c, gpointer aux) { @@ -95,6 +105,86 @@ populate_case_from_reader(struct ccase *c, gpointer aux) } +/* Load a system file. + Return TRUE if successfull +*/ +gboolean +load_system_file(const gchar *file_name) +{ + int ni ; + gint case_num; + + PsppireVarStore *var_store ; + PsppireDataStore *data_store ; + struct dictionary *new_dict; + struct sfm_read_info ri; + struct sfm_reader *reader ; + + GtkWidget *data_sheet = get_widget_assert(xml, "data_sheet"); + GtkWidget *var_sheet = get_widget_assert(xml, "variable_sheet"); + + + g_assert(data_sheet); + g_assert(var_sheet); + + if ( psppire_handle ) + fh_free(psppire_handle); + + psppire_handle = + fh_create_file (handle_name, file_name, fh_default_properties()); + + if ( !psppire_handle ) + { + g_warning("Cannot read handle for reading system file \"%s\"\n", + file_name); + return FALSE; + } + + + reader = sfm_open_reader (psppire_handle, &new_dict, &ri); + + if ( ! reader ) + return FALSE; + + /* FIXME: We need a better way of updating a dictionary than this */ + the_dictionary = psppire_dict_new_from_dict(new_dict); + + var_store = + PSPPIRE_VAR_STORE(gtk_sheet_get_model(GTK_SHEET(var_sheet))); + + psppire_var_store_set_dictionary(var_store, the_dictionary); + + + data_store = + PSPPIRE_DATA_STORE(gtk_sheet_get_model(GTK_SHEET(data_sheet))); + + psppire_data_store_set_dictionary(data_store, + the_dictionary); + + psppire_case_array_clear(data_store->cases); + + + psppire_set_window_title(basename(file_name)); + + ni = dict_get_next_value_idx(the_dictionary->dict); + if ( ni == 0 ) + return FALSE; + + for(case_num=0;;case_num++) + { + if (!psppire_case_array_append_case(the_cases, + populate_case_from_reader, + reader)) + break; + } + + + sfm_close_reader(reader); + + return TRUE; +} + + void on_open1_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -129,94 +219,22 @@ on_open1_activate (GtkMenuItem *menuitem, gtk_file_filter_add_pattern(filter, "*"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog), filter); - do { if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - PsppireVarStore *var_store ; - PsppireDataStore *data_store ; - struct dictionary *new_dict; - struct sfm_read_info ri; - struct sfm_reader *reader ; - - GtkWidget *data_sheet = get_widget_assert(xml, "data_sheet"); - GtkWidget *var_sheet = get_widget_assert(xml, "variable_sheet"); - gchar *filename; - - g_assert(data_sheet); - g_assert(var_sheet); - - filename = gtk_file_chooser_get_filename - (GTK_FILE_CHOOSER (dialog)); - - if ( psppire_handle ) - fh_free(psppire_handle); - - psppire_handle = - fh_create_file (handle_name, filename, fh_default_properties()); - - if ( !psppire_handle ) - { - g_warning("Cannot read handle for reading system file \"%s\"\n", - filename); - continue; - } - - - reader = sfm_open_reader (psppire_handle, &new_dict, &ri); - - if ( ! reader ) - continue; - - the_dictionary = psppire_dict_new_from_dict(new_dict); - - var_store = - PSPPIRE_VAR_STORE(gtk_sheet_get_model(GTK_SHEET(var_sheet))); + gchar *file_name = + gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (dialog)); - psppire_var_store_set_dictionary(var_store, the_dictionary); - - - data_store = - PSPPIRE_DATA_STORE(gtk_sheet_get_model(GTK_SHEET(data_sheet))); - - - psppire_data_store_set_dictionary(data_store, - the_dictionary); - - psppire_case_array_clear(data_store->cases); + finished = load_system_file(file_name) ; - - psppire_set_window_title(basename(filename)); - - g_free (filename); - - { - const int ni = dict_get_next_value_idx(the_dictionary->dict); - gint case_num; - if ( ni == 0 ) - goto done; - - - for(case_num=0;;case_num++) - { - if (!psppire_case_array_add_case(the_cases, - populate_case_from_reader, - reader)) - break; - } - } - - sfm_close_reader(reader); - finished = TRUE; + g_free(file_name); } else - { - finished = TRUE; - } + finished = TRUE; + } while ( ! finished ) ; - done: gtk_widget_destroy (dialog); } @@ -238,18 +256,18 @@ recreate_save_handle(struct file_handle **handle) if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { - char *filename = gtk_file_chooser_get_filename + char *file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); #if 0 if ( *handle ) destroy_file_handle(*handle, 0); #endif - *handle = fh_create_file (handle_name, filename, fh_default_properties()); + *handle = fh_create_file (handle_name, file_name, fh_default_properties()); - psppire_set_window_title(basename(filename)); + psppire_set_window_title(basename(file_name)); - g_free (filename); + g_free (file_name); } gtk_widget_destroy (dialog); @@ -325,6 +343,35 @@ on_paste1_activate (GtkMenuItem *menuitem, } +/* Fill a case with SYSMIS for numeric and whitespace for string + variables respectively */ +static gboolean +blank_case(struct ccase *cc, gpointer _dict) +{ + gint i; + PsppireDict *dict = _dict; + + for(i = 0 ; i < psppire_dict_get_var_cnt(dict); ++i ) + { + union value *val ; + + const struct PsppireVariable *var = psppire_dict_get_variable(dict, i); + + gint idx = psppire_variable_get_index(var); + + val = case_data_rw(cc, idx) ; + + if ( psppire_variable_get_type(var) == ALPHA ) + memset(val->s, ' ', psppire_variable_get_width(var)); + else + val->f = SYSMIS; + + case_unshare(cc); + } + + return TRUE; +} + void on_insert1_activate (GtkMenuItem *menuitem, @@ -343,7 +390,9 @@ on_insert1_activate (GtkMenuItem *menuitem, PsppireDataStore *data_store = PSPPIRE_DATA_STORE(gtk_sheet_get_model(data_sheet)); - psppire_case_array_insert_case(data_store->cases, data_sheet->range.row0); + psppire_case_array_insert_case(data_store->cases, + data_sheet->range.row0, + blank_case, the_dictionary); } break; case PAGE_VAR_SHEET: @@ -582,7 +631,7 @@ on_variables1_activate(GtkMenuItem *menuitem, gboolean callbacks_on_init(gpointer data) { - psppire_set_window_title(untitled); + psppire_set_window_title(gettext(untitled)); var_data_selection_init();