projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
desktop: reversed mimetype to application/x-spss-sps
[pspp]
/
src
/
ui
/
gui
/
goto-case-dialog.c
diff --git
a/src/ui/gui/goto-case-dialog.c
b/src/ui/gui/goto-case-dialog.c
index ad10b256868cd4ab5c82ba0531073dc9869733e3..dfb059a4aabb21a9420399f966926a1ad4429920 100644
(file)
--- a/
src/ui/gui/goto-case-dialog.c
+++ b/
src/ui/gui/goto-case-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2011, 2012 Free Software Foundation
+ Copyright (C) 2007, 2011, 2012
, 2016
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
@@
-19,19
+19,19
@@
#include "goto-case-dialog.h"
#include "builder-wrapper.h"
#include "psppire-dialog.h"
#include "goto-case-dialog.h"
#include "builder-wrapper.h"
#include "psppire-dialog.h"
-#include "psppire-data-window.h"
#include "psppire-data-store.h"
#include "psppire-data-store.h"
+#include "psppire-data-sheet.h"
static void
refresh (PsppireDataSheet *ds, GtkBuilder *xml)
{
static void
refresh (PsppireDataSheet *ds, GtkBuilder *xml)
{
-
PsppireDataStore *data_store = psppire_data_sheet_get_data_store (ds)
;
-
casenumber case_count
;
+
GtkTreeModel *tm = NULL
;
+
g_object_get (ds, "data-model", &tm, NULL)
;
GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
-
-
case_count = psppire_data_store_get_case_count (data_store
);
+ gint case_count = gtk_tree_model_iter_n_children (tm, NULL);
+
g_object_unref (tm
);
gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry), 1, case_count);
}
gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry), 1, case_count);
}
@@
-51,15
+51,25
@@
goto_case_dialog (PsppireDataSheet *ds)
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
- if (
response == PSPPIRE_RESPONSE_GOTO
)
+ if (
response == PSPPIRE_RESPONSE_GOTO
)
{
{
- glong case_num;
+ GtkTreeModel *tm = NULL;
+ g_object_get (ds, "data-model", &tm, NULL);
+
GtkWidget *case_num_entry =
GtkWidget *case_num_entry =
- get_widget_assert (xml, "goto-case-case-num-entry");
+ get_widget_assert (xml, "goto-case-case-num-entry");
+
+ gint case_num =
+ gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
+ - FIRST_CASE_NUMBER ;
- case_num = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
-
- FIRST_CASE_NUMBER
;
+ gint case_count = gtk_tree_model_iter_n_children (tm, NULL);
+
g_object_unref (tm)
;
- psppire_data_sheet_goto_case (ds, case_num);
+ if (case_num >= 0 && case_num < case_count)
+ {
+ ssw_sheet_scroll_to (SSW_SHEET (ds), -1, case_num);
+ ssw_sheet_set_active_cell (SSW_SHEET (ds), -1, case_num, 0);
+ }
}
}
}
}