projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not rely on user to specify all variables in VARIABLE subcommand. Fixes bug 30389.
[pspp]
/
src
/
ui
/
gui
/
select-cases-dialog.c
diff --git
a/src/ui/gui/select-cases-dialog.c
b/src/ui/gui/select-cases-dialog.c
index d953308a09fbe8b27c92c84ff54c045e8eac4e27..5834bcc71f5b733c12f0acb51c26309bb73e59fb 100644
(file)
--- a/
src/ui/gui/select-cases-dialog.c
+++ b/
src/ui/gui/select-cases-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008
, 2009
Free Software Foundation, Inc.
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
@@
-18,14
+18,16
@@
#include "select-cases-dialog.h"
#include <gtk/gtk.h>
#include "select-cases-dialog.h"
#include <gtk/gtk.h>
-#include "
helpe
r.h"
+#include "
executo
r.h"
#include "psppire-dialog.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "psppire-data-window.h"
-#include "
dialog-common
.h"
+#include "
psppire-selector
.h"
#include "dict-display.h"
#include "dict-display.h"
+#include "dialog-common.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
#include "helper.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
#include "helper.h"
+#include <xalloc.h>
#include <gettext.h>
#include <gettext.h>
@@
-109,7
+111,7
@@
sample_subdialog (GtkButton *b, gpointer data)
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox1, 1, 2, 0, 1);
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox1, 1, 2, 0, 1);
- g_signal_connect (
G_OBJECT (percent)
, "toggled",
+ g_signal_connect (
percent
, "toggled",
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (percent), TRUE);
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (percent), TRUE);
@@
-133,7
+135,7
@@
sample_subdialog (GtkButton *b, gpointer data)
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox2, 1, 2, 1, 2);
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox2, 1, 2, 1, 2);
- g_signal_connect (
G_OBJECT (sample_n_cases)
, "toggled",
+ g_signal_connect (
sample_n_cases
, "toggled",
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox2);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sample_n_cases), FALSE);
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox2);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sample_n_cases), FALSE);
@@
-235,18
+237,17
@@
set_radiobutton (GtkWidget *button, gpointer data)
/* Pops up the Select Cases dialog box */
void
/* Pops up the Select Cases dialog box */
void
-select_cases_dialog (
GObject *o, gpointer data
)
+select_cases_dialog (
PsppireDataWindow *de
)
{
gint response;
struct select_cases_dialog scd = {0,0,0,0,0,0};
GtkWidget *dialog ;
{
gint response;
struct select_cases_dialog scd = {0,0,0,0,0,0};
GtkWidget *dialog ;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
GtkWidget *entry = NULL;
GtkWidget *selector ;
GtkWidget *button_range;
GtkWidget *button_sample;
GtkWidget *entry = NULL;
GtkWidget *selector ;
GtkWidget *button_range;
GtkWidget *button_sample;
- scd.xml = builder_new ("
psppire
.ui");
+ scd.xml = builder_new ("
select-cases
.ui");
g_object_get (de->data_editor, "data-store", &scd.data_store, NULL);
g_object_get (de->data_editor, "data-store", &scd.data_store, NULL);
@@
-324,16
+325,13
@@
select_cases_dialog (GObject *o, gpointer data)
{
GtkWidget *source = get_widget_assert (scd.xml, "select-cases-treeview");
{
GtkWidget *source = get_widget_assert (scd.xml, "select-cases-treeview");
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- scd.data_store->dict,
- GTK_SELECTION_SINGLE, NULL);
+ g_object_set (source, "model",
+ scd.data_store->dict,
+ "selection-mode",
+ GTK_SELECTION_SINGLE, NULL);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- entry,
- insert_source_row_into_entry,
- is_currently_in_entry,
- NULL);
+ psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector),
+ is_currently_in_entry);
}
}
@@
-363,7
+361,7
@@
select_cases_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
- paste_syntax_
in_new
_window (syntax);
+ paste_syntax_
to
_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
@@
-386,7
+384,7
@@
generate_syntax (const struct select_cases_dialog *scd)
(GTK_TOGGLE_BUTTON (get_widget_assert (scd->xml,
"radiobutton-all"))))
{
(GTK_TOGGLE_BUTTON (get_widget_assert (scd->xml,
"radiobutton-all"))))
{
- return strdup ("\n");
+ return
x
strdup ("\n");
}
string = g_string_new ("");
}
string = g_string_new ("");