projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused global variables
[pspp]
/
src
/
ui
/
gui
/
sort-cases-dialog.c
diff --git
a/src/ui/gui/sort-cases-dialog.c
b/src/ui/gui/sort-cases-dialog.c
index 62fac58379b7aaf71f0de9fed8672c98ee3ed74a..6977469b7ecdd6b101a3058b0e40c321495d896b 100644
(file)
--- a/
src/ui/gui/sort-cases-dialog.c
+++ b/
src/ui/gui/sort-cases-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 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
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
@@
-17,16
+17,16
@@
#include <config.h>
#include <gtk/gtk.h>
#include "sort-cases-dialog.h"
#include <config.h>
#include <gtk/gtk.h>
#include "sort-cases-dialog.h"
-#include "
helpe
r.h"
+#include "
executo
r.h"
#include "psppire-dialog.h"
#include "psppire-dialog.h"
-#include "data-editor.h"
-#include <gtksheet/gtksheet.h>
+#include "psppire-data-window.h"
#include "psppire-var-store.h"
#include "dialog-common.h"
#include "psppire-var-store.h"
#include "dialog-common.h"
+#include "psppire-selector.h"
#include "dict-display.h"
#include "dict-display.h"
+#include "psppire-var-view.h"
-#include <language/syntax-string-source.h>
-#include "syntax-editor.h"
+#include "helper.h"
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
@@
-40,7
+40,7
@@
refresh (PsppireDialog *dialog, GtkTreeView *dest)
struct sort_cases_dialog
{
struct sort_cases_dialog
{
-
GtkTree
View *tv;
+
PsppireVar
View *tv;
PsppireDict *dict;
GtkToggleButton *ascending;
};
PsppireDict *dict;
GtkToggleButton *ascending;
};
@@
-50,7
+50,7
@@
static gboolean
dialog_state_valid (gpointer data)
{
struct sort_cases_dialog *scd = data;
dialog_state_valid (gpointer data)
{
struct sort_cases_dialog *scd = data;
- GtkTreeModel *model = gtk_tree_view_get_model (
scd->tv
);
+ GtkTreeModel *model = gtk_tree_view_get_model (
GTK_TREE_VIEW (scd->tv)
);
gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
@@
-65,8
+65,8
@@
generate_syntax (const struct sort_cases_dialog *scd)
{
gchar *text;
GString *string = g_string_new ("SORT CASES BY ");
{
gchar *text;
GString *string = g_string_new ("SORT CASES BY ");
- gint n_vars = append_variable_names (string,
-
scd->dict, GTK_TREE_VIEW (scd->tv), 0
);
+
+
gint n_vars = psppire_var_view_append_names (scd->tv, 0, string
);
if ( n_vars == 0 )
g_string_assign (string, "");
if ( n_vars == 0 )
g_string_assign (string, "");
@@
-89,46
+89,31
@@
generate_syntax (const struct sort_cases_dialog *scd)
/* Pops up the Sort Cases dialog box */
void
/* Pops up the Sort Cases dialog box */
void
-sort_cases_dialog (
GObject *o, gpointer data
)
+sort_cases_dialog (
PsppireDataWindow *de
)
{
gint response;
{
gint response;
- struct data_editor *de = data;
struct sort_cases_dialog scd;
struct sort_cases_dialog scd;
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("sort.ui
");
GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "sort-cases-treeview1");
GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "sort-cases-treeview1");
- GtkWidget *selector = get_widget_assert (xml, "sort-cases-selector");
GtkWidget *dest = get_widget_assert (xml, "sort-cases-treeview2");
GtkWidget *dest = get_widget_assert (xml, "sort-cases-treeview2");
+ PsppireVarStore *vs = NULL;
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
- PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
-
- gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- dest,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ g_object_get (vs, "dictionary", &scd.dict, NULL);
+ g_object_set (source, "model", scd.dict, NULL);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest);
- scd.tv = GTK_TREE_VIEW (dest);
- scd.dict = vs->dict;
+ scd.tv = PSPPIRE_VAR_VIEW (dest);
scd.ascending =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-radiobutton0"));
scd.ascending =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-radiobutton0"));
@@
-143,25
+128,10
@@
sort_cases_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&scd);
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (&scd)));
break;
case PSPPIRE_RESPONSE_PASTE:
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
-
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;
break;
default:
break;