#include "gl/c-strcasestr.h"
#include "gl/xvasprintf.h"
-#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
+#include <ssw-sheet.h>
#include "find-dialog.h"
#include "options-dialog.h"
transformations_pending);
}
- if ( transformations_pending)
+ if (transformations_pending)
gtk_label_set_text (GTK_LABEL (status_label),
_("Transformations Pending"));
else
GtkWidget *filter_status_area =
get_widget_assert (de->builder, "filter-use-status-area");
- if ( filter_index == -1 )
+ if (filter_index == -1)
{
gtk_label_set_text (GTK_LABEL (filter_status_area), _("Filter off"));
}
GtkWidget *split_status_area =
get_widget_assert (de->builder, "split-file-status-area");
- if ( n_split_vars == 0 )
+ if (n_split_vars == 0)
{
gtk_label_set_text (GTK_LABEL (split_status_area), _("No Split"));
}
text = g_string_new (_("Split by "));
- for (i = 0 ; i < n_split_vars - 1; ++i )
+ for (i = 0 ; i < n_split_vars - 1; ++i)
{
g_string_append_printf (text, "%s, ", var_get_name (split_vars[i]));
}
GtkWidget *weight_status_area =
get_widget_assert (de->builder, "weight-status-area");
- if ( weight_index == -1 )
+ if (weight_index == -1)
{
gtk_label_set_text (GTK_LABEL (weight_status_area), _("Weights off"));
}
gtk_recent_info_get_mime_type (ri),
gtk_recent_info_get_description (ri),
gtk_recent_info_get_uri (ri)
- );
+ );
gtk_recent_info_unref (ri);
fnx = g_string_new (file_name);
- if ( ! name_has_suffix (fnx->str))
+ if (! name_has_suffix (fnx->str))
g_string_append (fnx, psppire_data_window_format_to_string (de->format));
ds_init_empty (&filename);
{
GtkWidget *dialog = psppire_window_file_chooser_dialog (PSPPIRE_WINDOW (de));
- if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
+ if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
{
struct string filename;
gchar *file_name =
g_string_new
(
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog))
- );
+ );
GtkTreeIter iter;
int format;
-1);
de->format = format;
- if ( ! name_has_suffix (filename->str))
+ if (! name_has_suffix (filename->str))
g_string_append (filename,
psppire_data_window_format_to_string (format));
gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (toplevel));
- if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
+ if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)))
{
PangoFontDescription* font_desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (dialog));
free (encoding);
- if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) )
+ if (psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL))
gtk_widget_show (se);
else
gtk_widget_destroy (se);
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);
+ int response = psppire_import_assistant_run (asst);
- if (!asst->file_name)
- goto end;
-
- switch (asst->response)
+ switch (response)
{
case GTK_RESPONSE_APPLY:
{
break;
}
- end:
gtk_widget_destroy (GTK_WIDGET (asst));
}
static void
-set_data_page (PsppireDataWindow *dw)
+on_realize (PsppireDataWindow *dw)
{
gtk_notebook_set_current_page (GTK_NOTEBOOK (dw->data_editor), 1);
- gtk_notebook_set_current_page (GTK_NOTEBOOK (dw->data_editor), 0);
}
g_object_get (dw->data_editor, "dictionary", &dict, NULL);
gint x, y;
- JmdSheet *sheet = JMD_SHEET (dw->data_editor->data_sheet);
- JmdRange sel = *sheet->selection;
+ SswSheet *sheet = SSW_SHEET (dw->data_editor->data_sheet);
+ SswRange sel = *sheet->selection;
GtkClipboard *clip =
gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)),
gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)),
GDK_SELECTION_CLIPBOARD);
- jmd_sheet_set_clip (JMD_SHEET (dw->data_editor->data_sheet), clip);
+ ssw_sheet_set_clip (SSW_SHEET (dw->data_editor->data_sheet), clip);
}
}
int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de));
if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW)
{
- JmdRange *range = JMD_SHEET(de->data_sheet)->selection;
+ SswRange *range = SSW_SHEET(de->data_sheet)->selection;
+ g_return_if_fail (range->start_y >= 0);
psppire_data_store_delete_cases (de->data_store, range->start_y,
range->end_y - range->start_y + 1);
gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet));
if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW)
{
- JmdRange *range = JMD_SHEET(de->data_sheet)->selection;
+ SswRange *range = SSW_SHEET(de->data_sheet)->selection;
psppire_data_editor_insert_new_variable_at_posn (de, range->start_x);
}
else
{
- JmdRange *range = JMD_SHEET(de->var_sheet)->selection;
- psppire_data_editor_insert_new_variable_at_posn (de, range->start_y);
+ SswRange *range = SSW_SHEET(de->var_sheet)->selection;
+ PsppireDict *dict = NULL;
+ g_object_get (de->var_sheet, "data-model", &dict, NULL);
+ psppire_dict_insert_variable (dict, range->start_y, NULL);
+ gtk_widget_queue_draw (GTK_WIDGET (de->var_sheet));
}
}
insert_case_at_row (PsppireDataWindow *dw)
{
PsppireDataEditor *de = dw->data_editor;
- JmdRange *range = JMD_SHEET(de->data_sheet)->selection;
+ SswRange *range = SSW_SHEET(de->data_sheet)->selection;
psppire_data_editor_insert_new_case_at_posn (de, range->start_y);
}
PSPPIRE_DATA_EDITOR (psppire_data_editor_new (de->dict, de->data_store));
g_signal_connect (de, "realize",
- G_CALLBACK (set_data_page), de);
+ G_CALLBACK (on_realize), de);
g_signal_connect_swapped (de->data_store, "case-changed",
G_CALLBACK (set_unsaved), de);
&& psppire_data_window_is_empty (PSPPIRE_DATA_WINDOW (victim)))
{
window = GTK_WIDGET (victim);
- gtk_widget_hide (GTK_WIDGET (PSPPIRE_DATA_WINDOW (window)->data_editor));
}
else
window = psppire_data_window_new (NULL);
psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint);
- gtk_widget_show_all (window);
return GTK_WINDOW (window);
}