/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2010 Free Software Foundation
+ Copyright (C) 2010, 2011 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
#include "dialog-common.h"
-#include <language/syntax-string-source.h>
#include <language/stats/aggregate.h>
GtkWidget *sorted_button;
GtkWidget *needs_sort_button;
+
+ GtkWidget *pane;
};
gtk_entry_set_text (GTK_ENTRY (agg->summary_arg1_entry), "");
gtk_entry_set_text (GTK_ENTRY (agg->summary_arg2_entry), "");
gtk_entry_set_text (GTK_ENTRY (agg->summary_var_label_entry), "");
- gtk_entry_set_text (GTK_ENTRY (agg->summary_var_name_entry), "");
+ gtk_entry_set_text (GTK_ENTRY (agg->summary_var_name_entry), "N_BREAK");
+ gtk_editable_select_region (GTK_EDITABLE (agg->summary_var_name_entry), 0, -1);
- gtk_combo_box_set_active (GTK_COMBO_BOX (agg->function_combo), -1);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (agg->function_combo), N);
gtk_list_store_clear (PSPPIRE_ACR (agg->summary_acr)->list_store);
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
NULL);
+ g_object_set (dialog, "local-only", FALSE, NULL);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
- gtk_file_filter_add_pattern (filter, "*.sav");
- gtk_file_filter_add_pattern (filter, "*.SAV");
+ gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
- gtk_file_filter_add_pattern (filter, "*.por");
- gtk_file_filter_add_pattern (filter, "*.POR");
+ gtk_file_filter_add_mime_type (filter, "application/x-spss-por");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
gtk_list_store_append (list, &iter);
gtk_list_store_set (list, &iter,
- COMBO_MODEL_COL_DESC, s,
+ COMBO_MODEL_COL_DESC, gettext (s),
COMBO_MODEL_COL_SYNTAX, af->name,
COMBO_MODEL_COL_SRC_VARS, af->src_vars,
COMBO_MODEL_COL_ARITY, af->n_args,
}
+/* Set the pane to 50% of its maximum size */
+static void
+set_initial_pos (GtkPaned *pane)
+{
+ int max_pos;
+ g_object_get (pane,
+ "max-position", &max_pos,
+ NULL);
+
+ gtk_paned_set_position (pane, max_pos);
+}
+
+
+
/* Pops up the Aggregate dialog box */
void
aggregate_dialog (PsppireDataWindow *dw)
source = get_widget_assert (fd.xml, "dict-view");
break_selector = get_widget_assert (fd.xml, "break-selector");
+ fd.pane = get_widget_assert (fd.xml, "hbox1");
+
fd.break_variables = get_widget_assert (fd.xml, "psppire-var-view1");
fd.filename_radiobutton = get_widget_assert (fd.xml, "filename-radiobutton");
fd.filename_button = get_widget_assert (fd.xml, "filename-button");
column = gtk_tree_view_get_column (PSPPIRE_ACR (fd.summary_acr)->tv, 0);
- l = gtk_tree_view_column_get_cell_renderers (column);
+ l = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
cell_renderer = l->data;
g_signal_connect_swapped (fd.summary_arg1_entry, "changed", G_CALLBACK (update_acr), &fd);
g_signal_connect_swapped (fd.summary_arg2_entry, "changed", G_CALLBACK (update_acr), &fd);
+
+ g_signal_connect (fd.pane, "realize", G_CALLBACK (set_initial_pos), &fd);
+
+
g_signal_connect_swapped (fd.function_combo, "changed",
G_CALLBACK (update_arguments), &fd);
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&fd);
-
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (dw, generate_syntax (&fd)));
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&fd);
- paste_syntax_to_window (syntax);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&fd)));
break;
default:
break;