X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=a301dda27d813747b8d4eb952fbd005f86df2bf4;hb=40ed0fae9e8d01019be469fb6133c26cd2b5a0f4;hp=126980c8bb6f6e4fa1ac2a95dbd1022aa6836f07;hpb=ab97e700f033db654e2f44919c73973d13b0c522;p=pspp

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 126980c8bb..a301dda27d 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -156,15 +156,18 @@ transformation_change_callback (bool transformations_pending,
 {
   PsppireDataWindow  *de = PSPPIRE_DATA_WINDOW (data);
 
-  GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
-
-  GtkWidget *menuitem =
-    gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending");
-
   GtkWidget *status_label  =
     get_widget_assert (de->builder, "case-counter-area");
 
-  gtk_widget_set_sensitive (menuitem, transformations_pending);
+  { /* Set the sensitivity of the "Transformations Pending" menuitem */
+    GtkUIManager *uim = 
+      GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
+
+    GtkWidget *menuitem =
+      gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending");
+    
+    gtk_widget_set_sensitive (menuitem, transformations_pending);
+  }
 
 
   if ( transformations_pending)
@@ -490,8 +493,8 @@ data_pick_filename (PsppireWindow *window)
     gtk_file_chooser_dialog_new (_("Save"),
 				 GTK_WINDOW (de),
 				 GTK_FILE_CHOOSER_ACTION_SAVE,
-				 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				 GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+				 _("Cancel"), GTK_RESPONSE_CANCEL,
+				 _("Save"), GTK_RESPONSE_ACCEPT,
 				 NULL);
 
   g_object_set (dialog, "local-only", FALSE, NULL);
@@ -552,7 +555,7 @@ data_pick_filename (PsppireWindow *window)
     gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box), cell,
                                    "text", 1);
 
-    hbox = gtk_hbox_new (FALSE, 0);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
     gtk_box_pack_start (GTK_BOX (hbox), combo_box, FALSE, FALSE, 0);
     gtk_widget_show_all (hbox);
@@ -618,8 +621,8 @@ confirm_delete_dataset (PsppireDataWindow *de,
     old_dataset, new_dataset, existing_dataset);
 
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                          GTK_STOCK_DELETE, GTK_RESPONSE_OK,
+                          _("Cancel"), GTK_RESPONSE_CANCEL,
+                          _("Delete"), GTK_RESPONSE_OK,
                           NULL);
 
   g_object_set (dialog, "icon-name", "pspp", NULL);
@@ -698,25 +701,18 @@ static void
 fonts_activate (PsppireDataWindow  *de)
 {
   GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de));
-  GtkWidget *dialog =  gtk_font_selection_dialog_new (_("Font Selection"));
+  GtkWidget *dialog =  gtk_font_chooser_dialog_new (NULL, GTK_WINDOW (toplevel));
   GtkStyle *style = gtk_widget_get_style (GTK_WIDGET(de->data_editor));
   PangoFontDescription *current_font = style->font_desc;
-  gchar *font_name = pango_font_description_to_string (current_font);
 
-  gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (dialog), font_name);
-
-  g_free (font_name);
+  gtk_font_chooser_set_font_desc (GTK_FONT_CHOOSER (dialog), current_font);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog),
 				GTK_WINDOW (toplevel));
 
   if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
     {
-      const gchar *font = gtk_font_selection_dialog_get_font_name
-	(GTK_FONT_SELECTION_DIALOG (dialog));
-
-      PangoFontDescription* font_desc =
-	pango_font_description_from_string (font);
+      PangoFontDescription* font_desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (dialog));
 
       psppire_data_editor_set_font (de->data_editor, font_desc);
     }
@@ -844,15 +840,16 @@ static void
 on_switch_page (PsppireDataEditor *de, gpointer p,
 		gint pagenum, PsppireDataWindow *dw)
 {
-  GtkWidget *page_menu_item;
-  gboolean is_ds;
-  const char *path;
+  /* Set the appropriate ui_manager according to the selected page.
+     This is necessary, because the menus for the variable view and
+     the data view are different (slightly). */
 
-  is_ds = pagenum == PSPPIRE_DATA_EDITOR_DATA_VIEW;
-  path = (is_ds
+  gboolean is_ds = pagenum == PSPPIRE_DATA_EDITOR_DATA_VIEW;
+  const char *path = (is_ds
           ? "/ui/menubar/view/view_data"
           : "/ui/menubar/view/view_variables");
-  page_menu_item = gtk_ui_manager_get_widget (dw->ui_manager, path);
+
+  GtkWidget *page_menu_item = gtk_ui_manager_get_widget (dw->ui_manager, path);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (page_menu_item), TRUE);
 }
 
@@ -943,7 +940,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
   GtkWidget *hb ;
   GtkWidget *sb ;
 
-  GtkWidget *box = gtk_vbox_new (FALSE, 0);
+  GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
   de->dataset = ds;
   de->dict = psppire_dict_new_from_dict (dataset_dict (ds));
@@ -951,7 +948,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
   psppire_data_store_set_reader (de->data_store, NULL);
 
   menubar = get_widget_assert (de->builder, "menubar");
-  hb = get_widget_assert (de->builder, "handlebox1");
+  hb = get_widget_assert (de->builder, "toolbar");
   sb = get_widget_assert (de->builder, "status-bar");
 
   de->uim = NULL;
@@ -1096,8 +1093,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
 
   g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de);
 
-  merge_help_menu (de->ui_manager);
-
+  gtk_menu_shell_append (GTK_MENU_SHELL (menubar),  create_help_menu (GTK_WINDOW (de)));
+  
   g_signal_connect (de->data_editor, "notify::ui-manager",
                     G_CALLBACK (on_ui_manager_changed), de);
   on_ui_manager_changed (de->data_editor, NULL, de);