X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=18fd5e8e8d81d294f0557ecb8de1b6cb2b852ed0;hb=a232eb40325b126daabcdf28ca54da794bd6a29f;hp=5fb04b7ea109656ddf2149516d6846472a43c716;hpb=14c065be90af77f2661d4bf4d35f3ec943fd99bd;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 5fb04b7ea1..18fd5e8e8d 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -31,7 +31,7 @@ #include "ui/gui/psppire-data-store.h" #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) @@ -224,10 +224,10 @@ psppire_data_editor_get_property (GObject *object, static void psppire_data_editor_switch_page (GtkNotebook *notebook, - GtkNotebookPage *page, + GtkWidget *w, guint page_num) { - GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook, page, page_num); + GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook, w, page_num); psppire_data_editor_update_ui_manager (PSPPIRE_DATA_EDITOR (notebook)); } @@ -339,7 +339,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; } @@ -564,13 +564,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); @@ -585,11 +588,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. */ @@ -602,7 +606,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 @@ -625,7 +630,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) @@ -688,34 +693,38 @@ 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); de->cell_ref_label = gtk_label_new (""); gtk_label_set_width_chars (GTK_LABEL (de->cell_ref_label), 25); - gtk_misc_set_alignment (GTK_MISC (de->cell_ref_label), 0.0, 0.5); + gtk_widget_set_valign (de->cell_ref_label, GTK_ALIGN_CENTER); de->datum_entry = psppire_value_entry_new (); g_signal_connect (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (de->datum_entry))), "activate", G_CALLBACK (on_datum_entry_activate), de); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (hbox), de->cell_ref_label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), de->datum_entry, TRUE, TRUE, 0); 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); + de->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (de->vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (de->vbox), de->datasheet_vbox_widget, TRUE, TRUE, 0); @@ -741,6 +750,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); } @@ -777,12 +795,8 @@ static void set_font_recursively (GtkWidget *w, gpointer data) { PangoFontDescription *font_desc = data; - GtkRcStyle *style = gtk_widget_get_modifier_style (w); - pango_font_description_free (style->font_desc); - style->font_desc = pango_font_description_copy (font_desc); - - gtk_widget_modify_style (w, style); + gtk_widget_override_font (w, font_desc); if ( GTK_IS_CONTAINER (w)) gtk_container_foreach (GTK_CONTAINER (w), set_font_recursively, font_desc); @@ -792,11 +806,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. @@ -805,6 +826,7 @@ void psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split) { GtkTreeViewGridLines grid_lines; + gboolean labels; if (split == de->split) return; @@ -812,14 +834,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, @@ -845,7 +877,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: