#include "language/lexer/lexer.h"
#include "libpspp/message.h"
#include "libpspp/str.h"
-#include "ui/gui/aggregate-dialog.h"
-#include "ui/gui/autorecode-dialog.h"
#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/comments-dialog.h"
#include "ui/gui/entry-dialog.h"
#include "ui/gui/executor.h"
#include "ui/gui/help-menu.h"
#include "ui/gui/helper.h"
#include "ui/gui/helper.h"
+#include "ui/gui/psppire-import-assistant.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-dialog-action.h"
#include "ui/gui/psppire-encoding-selector.h"
#include "ui/gui/recode-dialog.h"
#include "ui/gui/select-cases-dialog.h"
#include "ui/gui/split-file-dialog.h"
-#include "ui/gui/text-data-import-dialog.h"
-#include "ui/gui/weight-cases-dialog.h"
#include "ui/syntax-gen.h"
#include "gl/c-strcase.h"
{
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)
}
static gboolean
-load_file (PsppireWindow *de, const gchar *file_name, gpointer syn)
+load_file (PsppireWindow *de, const gchar *file_name, const char *encoding,
+ gpointer syn)
{
const char *mime_type = NULL;
gchar *syntax = NULL;
syntax_gen_string (&filename, ss_cstr (utf8_file_name));
g_free (utf8_file_name);
-
- syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
+
+ if (encoding && encoding[0])
+ syntax = g_strdup_printf ("GET FILE=%s ENCODING='%s'.",
+ ds_cstr (&filename), encoding);
+ else
+ syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
ds_destroy (&filename);
}
else
}
ok = execute_syntax (PSPPIRE_DATA_WINDOW (de),
- lex_reader_for_string (syntax));
+ lex_reader_for_string (syntax, "UTF-8"));
g_free (syntax);
if (ok && syn == NULL)
else if (name_has_sav_suffix (file_name))
mime_type = "application/x-spss-sav";
- add_most_recent (file_name, mime_type);
+ add_most_recent (file_name, mime_type, encoding);
}
return ok;
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));
- PangoFontDescription *current_font;
- gchar *font_name;
- GtkWidget *dialog =
- gtk_font_selection_dialog_new (_("Font Selection"));
-
-
- current_font = GTK_WIDGET(de->data_editor)->style->font_desc;
- font_name = pango_font_description_to_string (current_font);
-
- gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (dialog), font_name);
+ 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;
- 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);
}
g_free (uri);
- open_data_window (window, file, NULL);
+ open_data_window (window, file, NULL, NULL);
g_free (file);
}
free (encoding);
- if ( psppire_window_load (PSPPIRE_WINDOW (se), file, NULL) )
+ if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) )
gtk_widget_show (se);
else
gtk_widget_destroy (se);
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);
}
static void
psppire_data_window_init (PsppireDataWindow *de)
{
+ GtkWidget *w ;
de->builder = builder_new ("data-editor.ui");
de->ui_manager = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
- PSPPIRE_WINDOW (de)->menu =
- GTK_MENU_SHELL (gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/windows/windows_minimise_all")->parent);
+ w = gtk_ui_manager_get_widget (de->ui_manager, "/ui/menubar/windows/windows_minimise_all");
+
+ PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (gtk_widget_get_parent (w));
de->uim = NULL;
de->merge_id = 0;
}
+static void
+file_import (PsppireDataWindow *dw)
+{
+ GtkWidget *w = psppire_import_assistant_new (GTK_WINDOW (dw));
+ PsppireImportAssistant *asst = PSPPIRE_IMPORT_ASSISTANT (w);
+ gtk_widget_show_all (w);
+
+ asst->main_loop = g_main_loop_new (NULL, TRUE);
+ g_main_loop_run (asst->main_loop);
+ g_main_loop_unref (asst->main_loop);
+
+ if (!asst->file_name)
+ goto end;
+
+ switch (asst->response)
+ {
+ case GTK_RESPONSE_APPLY:
+ {
+ g_debug ("HERE");
+ gchar *fn = g_path_get_basename (asst->file_name);
+ open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, psppire_import_assistant_generate_syntax (asst));
+ g_free (fn);
+ }
+ break;
+ case PSPPIRE_RESPONSE_PASTE:
+ g_debug ("THERE");
+ free (paste_syntax_to_window (psppire_import_assistant_generate_syntax (asst)));
+ break;
+ default:
+ break;
+ }
+
+ end:
+ gtk_widget_destroy (GTK_WIDGET (asst));
+}
+
static void
psppire_data_window_finish_init (PsppireDataWindow *de,
struct dataset *ds)
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;
enable_save (de);
connect_action (de, "file_new_data", G_CALLBACK (create_data_window));
- connect_action (de, "file_import", G_CALLBACK (text_data_import_assistant));
+ connect_action (de, "file_import", G_CALLBACK (file_import));
+
connect_action (de, "file_save", G_CALLBACK (psppire_window_save));
connect_action (de, "file_open", G_CALLBACK (psppire_window_open));
connect_action (de, "file_save_as", G_CALLBACK (psppire_window_save_as));
g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "toggled", G_CALLBACK (toggle_value_labels), de);
connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog));
- connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog));
- connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog));
connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog));
- connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog));
- connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog));
connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog));
connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog));
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);
}
void
-open_data_window (PsppireWindow *victim, const char *file_name, gpointer hint)
+open_data_window (PsppireWindow *victim, const char *file_name,
+ const char *encoding, gpointer hint)
{
GtkWidget *window;
else
window = psppire_data_window_new (NULL);
- psppire_window_load (PSPPIRE_WINDOW (window), file_name, hint);
+ psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint);
gtk_widget_show_all (window);
}
projects / pspp / blobdiff