{
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)
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);
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);
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);
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);
}
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));
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;
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);