projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
[pspp-builds.git]
/
src
/
ui
/
gui
/
find-dialog.c
diff --git
a/src/ui/gui/find-dialog.c
b/src/ui/gui/find-dialog.c
index 87c88bf6e227edb996042bf9204d61117a762f67..60d54e2679cb37d55c67c38f3c3b209fa1d1dedc 100644
(file)
--- a/
src/ui/gui/find-dialog.c
+++ b/
src/ui/gui/find-dialog.c
@@
-24,9
+24,10
@@
which match particular strings */
#include "psppire-selector.h"
#include "psppire-dialog.h"
#include "helper.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
#include "helper.h"
-#include "
data-editor
.h"
+#include "
psppire-data-window
.h"
#include "dict-display.h"
#include <data/value.h>
#include "dict-display.h"
#include <data/value.h>
+#include <data/format.h>
#include <data/datasheet.h>
#include <data/data-in.h>
#include "psppire-data-store.h"
#include <data/datasheet.h>
#include <data/data-in.h>
#include "psppire-data-store.h"
@@
-36,7
+37,6
@@
which match particular strings */
#include <libpspp/message.h>
#include <gtk/gtk.h>
#include <libpspp/message.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <stdlib.h>
#include "xalloc.h"
#include <stdlib.h>
#include "xalloc.h"
@@
-47,15
+47,14
@@
which match particular strings */
/* FIXME: These shouldn't be here */
/* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
#include "psppire-var-store.h"
struct find_dialog
{
#include "psppire-var-store.h"
struct find_dialog
{
- G
ladeXML
*xml;
+ G
tkBuilder
*xml;
PsppireDict *dict;
struct datasheet *data;
PsppireDict *dict;
struct datasheet *data;
-
struct data_editor
*de;
+
PsppireDataWindow
*de;
GtkWidget *variable_entry;
GtkWidget *value_entry;
GtkWidget *value_labels_checkbox;
GtkWidget *variable_entry;
GtkWidget *value_entry;
GtkWidget *value_labels_checkbox;
@@
-115,8
+114,8
@@
do_find (GObject *obj, const struct find_dialog *fd)
if ( x != -1)
{
if ( x != -1)
{
- gtk_notebook_set_page (GTK_NOTEBOOK (fd->de->data_editor),
- PSPPIRE_DATA_EDITOR_DATA_VIEW);
+ gtk_notebook_set_
current_
page (GTK_NOTEBOOK (fd->de->data_editor),
+
PSPPIRE_DATA_EDITOR_DATA_VIEW);
g_object_set (fd->de->data_editor,
"current-case", x,
g_object_set (fd->de->data_editor,
"current-case", x,
@@
-186,7
+185,7
@@
value_labels_toggled (GtkToggleButton *tb, gpointer data)
void
find_dialog (GObject *o, gpointer data)
{
void
find_dialog (GObject *o, gpointer data)
{
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
struct find_dialog fd;
struct find_dialog fd;
@@
-200,7
+199,7
@@
find_dialog (GObject *o, gpointer data)
PsppireVarStore *vs ;
PsppireDataStore *ds ;
PsppireVarStore *vs ;
PsppireDataStore *ds ;
- fd.xml =
XML_NEW ("psppire.glade
");
+ fd.xml =
builder_new ("psppire.ui
");
fd.de = de;
find_button = gtk_button_new_from_stock (GTK_STOCK_FIND);
fd.de = de;
find_button = gtk_button_new_from_stock (GTK_STOCK_FIND);
@@
-221,7
+220,7
@@
find_dialog (GObject *o, gpointer data)
NULL);
fd.dict = vs->dict;
NULL);
fd.dict = vs->dict;
- fd.data = ds->
case_file->
datasheet;
+ fd.data = ds->datasheet;
fd.variable_entry = get_widget_assert (fd.xml, "find-variable-entry");
fd.value_entry = get_widget_assert (fd.xml, "find-value-entry");
fd.variable_entry = get_widget_assert (fd.xml, "find-variable-entry");
fd.value_entry = get_widget_assert (fd.xml, "find-value-entry");
@@
-239,13
+238,12
@@
find_dialog (GObject *o, gpointer data)
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- fd.dict,
- GTK_SELECTION_SINGLE,
- NULL);
+ g_object_set (source, "model", fd.dict,
+ "selection-mode", GTK_SELECTION_SINGLE,
+ NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
@@
-464,7
+462,7
@@
value_compare (const struct comparator *cmptr,
const union value *v)
{
const struct value_comparator *vc = (const struct value_comparator *) cmptr;
const union value *v)
{
const struct value_comparator *vc = (const struct value_comparator *) cmptr;
- return 0 ==
compare_values
(v, vc->pattern, var_get_width (cmptr->var));
+ return 0 ==
value_compare_3way
(v, vc->pattern, var_get_width (cmptr->var));
}
}