X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=b1526ac95af529f0c875208f061caf181cf4f8fe;hb=bea96fcb5c8cf6ffb179a830ecb39f52ff2c5db8;hp=b5f22735cf64de54bf440370952b9084cdb43c26;hpb=d4ae90b2fe74d2d1427afad35d32c9e5584211ed;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index b5f22735cf..b1526ac95a 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -24,6 +24,7 @@ #include "data/datasheet.h" #include "data/value-labels.h" #include "libpspp/range-set.h" +#include "libpspp/str.h" #include "ui/gui/helper.h" #include "ui/gui/pspp-sheet-selection.h" #include "ui/gui/psppire-data-sheet.h" @@ -31,6 +32,7 @@ #include "ui/gui/psppire-value-entry.h" #include "ui/gui/psppire-var-sheet.h" #include "ui/gui/psppire.h" +#include "ui/gui/psppire-conf.h" #include #define _(msgid) gettext (msgid) @@ -223,7 +225,11 @@ psppire_data_editor_get_property (GObject *object, static void psppire_data_editor_switch_page (GtkNotebook *notebook, +#if GTK_DISABLE_DEPRECATED && GTK_CHECK_VERSION(2,20,0) + gpointer page, +#else GtkNotebookPage *page, +#endif guint page_num) { GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook, page, page_num); @@ -338,7 +344,7 @@ on_var_sheet_var_double_clicked (PsppireVarSheet *var_sheet, gint dict_index, PSPPIRE_DATA_EDITOR_DATA_VIEW); data_sheet = psppire_data_editor_get_active_data_sheet (de); - psppire_data_sheet_show_variable (data_sheet, dict_index); + psppire_data_sheet_goto_variable (data_sheet, dict_index); return TRUE; } @@ -427,21 +433,21 @@ refresh_entry (PsppireDataEditor *de) } else { - GString *string; - - string = g_string_sized_new (25); - g_string_append_printf (string, - ngettext ("%'d case", "%'d cases", n_cases), - n_cases); - g_string_append_c (string, ' '); - g_string_append_unichar (string, 0xd7); /* U+00D7 MULTIPLICATION SIGN */ - g_string_append_c (string, ' '); - g_string_append_printf (string, - ngettext ("%'d variable", "%'d variables", - n_vars), - n_vars); - ref_cell_text = string->str; - g_string_free (string, FALSE); + struct string s; + + /* The glib string library does not understand the ' printf modifier + on all platforms, but the "struct string" library does (because + Gnulib fixes that problem), so use the latter. */ + ds_init_empty (&s); + ds_put_format (&s, ngettext ("%'d case", "%'d cases", n_cases), + n_cases); + ds_put_byte (&s, ' '); + ds_put_unichar (&s, 0xd7); /* U+00D7 MULTIPLICATION SIGN */ + ds_put_byte (&s, ' '); + ds_put_format (&s, ngettext ("%'d variable", "%'d variables", + n_vars), + n_vars); + ref_cell_text = ds_steal_cstr (&s); } psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (de->datum_entry), @@ -563,13 +569,16 @@ disconnect_data_sheets (PsppireDataEditor *de) } static GtkWidget * -make_data_sheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines) +make_data_sheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines, + gboolean show_value_labels) { PsppSheetSelection *selection; GtkWidget *ds; ds = psppire_data_sheet_new (); pspp_sheet_view_set_grid_lines (PSPP_SHEET_VIEW (ds), grid_lines); + psppire_data_sheet_set_value_labels (PSPPIRE_DATA_SHEET (ds), + show_value_labels); g_signal_connect_swapped (ds, "notify::value-labels", G_CALLBACK (refresh_entry), de); @@ -584,11 +593,12 @@ make_data_sheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines) } static GtkWidget * -make_single_datasheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines) +make_single_datasheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines, + gboolean show_value_labels) { GtkWidget *data_sheet_scroller; - de->data_sheets[0] = make_data_sheet (de, grid_lines); + de->data_sheets[0] = make_data_sheet (de, grid_lines, show_value_labels); de->data_sheets[1] = de->data_sheets[2] = de->data_sheets[3] = NULL; /* Put data sheet in scroller. */ @@ -601,7 +611,8 @@ make_single_datasheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines) } static GtkWidget * -make_split_datasheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines) +make_split_datasheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines, + gboolean show_value_labels) { /* Panes, in the order in which we want to create them. */ enum @@ -624,7 +635,7 @@ make_split_datasheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines) GtkPolicyType hpolicy, vpolicy; GtkWidget *scroller; - de->data_sheets[i] = make_data_sheet (de, grid_lines); + de->data_sheets[i] = make_data_sheet (de, grid_lines, show_value_labels); ds[i] = PSPP_SHEET_VIEW (de->data_sheets[i]); if (i == BL) @@ -687,14 +698,18 @@ make_split_datasheet (PsppireDataEditor *de, GtkTreeViewGridLines grid_lines) return GTK_WIDGET (xpaned); } +static void set_font_recursively (GtkWidget *w, gpointer data); + static void psppire_data_editor_init (PsppireDataEditor *de) { GtkWidget *var_sheet_scroller; GtkWidget *hbox; + gchar *fontname = NULL; de->font = NULL; de->ui_manager = NULL; + de->old_vbox_widget = NULL; g_object_set (de, "tab-pos", GTK_POS_BOTTOM, NULL); @@ -712,7 +727,7 @@ psppire_data_editor_init (PsppireDataEditor *de) de->split = FALSE; de->datasheet_vbox_widget - = make_single_datasheet (de, GTK_TREE_VIEW_GRID_LINES_BOTH); + = make_single_datasheet (de, GTK_TREE_VIEW_GRID_LINES_BOTH, FALSE); de->vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (de->vbox), hbox, FALSE, FALSE, 0); @@ -740,6 +755,15 @@ psppire_data_editor_init (PsppireDataEditor *de) g_object_set (de, "can-focus", FALSE, NULL); + if (psppire_conf_get_string (psppire_conf_new (), + "Data Editor", "font", + &fontname) ) + { + de->font = pango_font_description_from_string (fontname); + g_free (fontname); + set_font_recursively (GTK_WIDGET (de), de->font); + } + psppire_data_editor_update_ui_manager (de); } @@ -791,11 +815,18 @@ set_font_recursively (GtkWidget *w, gpointer data) void psppire_data_editor_set_font (PsppireDataEditor *de, PangoFontDescription *font_desc) { + gchar *font_name; set_font_recursively (GTK_WIDGET (de), font_desc); if (de->font) pango_font_description_free (de->font); de->font = pango_font_description_copy (font_desc); + font_name = pango_font_description_to_string (de->font); + + psppire_conf_set_string (psppire_conf_new (), + "Data Editor", "font", + font_name); + } /* If SPLIT is TRUE, splits DE's data sheet into four panes. @@ -804,6 +835,7 @@ void psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split) { GtkTreeViewGridLines grid_lines; + gboolean labels; if (split == de->split) return; @@ -811,14 +843,24 @@ psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split) grid_lines = pspp_sheet_view_get_grid_lines ( PSPP_SHEET_VIEW (de->data_sheets[0])); + labels = psppire_data_sheet_get_value_labels (PSPPIRE_DATA_SHEET ( + de->data_sheets[0])); disconnect_data_sheets (de); - gtk_widget_destroy (de->datasheet_vbox_widget); + if (de->old_vbox_widget) + g_object_unref (de->old_vbox_widget); + de->old_vbox_widget = de->datasheet_vbox_widget; + g_object_ref (de->old_vbox_widget); + /* FIXME: old_vbox_widget needs to be unreffed in dispose. + (currently it seems to provoke an error if I do that. + I don't know why. */ + gtk_container_remove (GTK_CONTAINER (de->vbox), de->datasheet_vbox_widget); if (split) - de->datasheet_vbox_widget = make_split_datasheet (de, grid_lines); + de->datasheet_vbox_widget = make_split_datasheet (de, grid_lines, labels); else - de->datasheet_vbox_widget = make_single_datasheet (de, grid_lines); + de->datasheet_vbox_widget = make_single_datasheet (de, grid_lines, labels); + psppire_data_editor_refresh_model (de); gtk_box_pack_start (GTK_BOX (de->vbox), de->datasheet_vbox_widget, @@ -844,7 +886,7 @@ psppire_data_editor_goto_variable (PsppireDataEditor *de, gint dict_index) { case PSPPIRE_DATA_EDITOR_DATA_VIEW: data_sheet = psppire_data_editor_get_active_data_sheet (de); - psppire_data_sheet_show_variable (data_sheet, dict_index); + psppire_data_sheet_goto_variable (data_sheet, dict_index); break; case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: