X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fgoto-case-dialog.c;h=713c1e354a5d2f5cb2b9b422f9d0066b9fe7c050;hb=bf62643ef9f4f991acd777b26aa747adc7886d8f;hp=9a523943b1c5686e639d4df34b56530d4f1b55a5;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp

diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 9a523943b1..713c1e354a 100644
--- 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.
-   Copyright (C) 2007  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
@@ -17,53 +17,57 @@
 
 #include <config.h>
 #include "goto-case-dialog.h"
-#include "helper.h"
+#include "builder-wrapper.h"
 #include "psppire-dialog.h"
 #include "psppire-data-window.h"
 #include "psppire-data-store.h"
+#include "psppire-data-sheet.h"
 
 
 static void
-refresh (const PsppireDataWindow *de, GtkBuilder *xml)
+refresh (PsppireDataSheet *ds, GtkBuilder *xml)
 {
-  PsppireDataStore *ds = NULL;
-  casenumber case_count ;
+  PsppireDataStore *store = NULL;
+  g_object_get (ds, "data-model", &store, NULL);
 
   GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
+  casenumber case_count =  gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
 
-  g_object_get (de->data_editor, "data-store", &ds, NULL);
-
-  case_count =  psppire_data_store_get_case_count (ds);
-
-  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);
 }
 
 void
-goto_case_dialog (GObject *o, gpointer data)
+goto_case_dialog (PsppireDataSheet *ds)
 {
+  GtkWindow *top_level;
   gint response;
-  GtkBuilder *xml = builder_new ("psppire.ui");
-  PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
+  GtkBuilder *xml = builder_new ("goto-case.ui");
   GtkWidget *dialog = get_widget_assert   (xml, "goto-case-dialog");
 
+  top_level = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (ds)));
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), top_level);
 
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
-
-  refresh (de, xml);
+  refresh (ds, xml);
 
   response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
 
-  if ( response == PSPPIRE_RESPONSE_GOTO )
+  if (response == PSPPIRE_RESPONSE_GOTO)
     {
-      glong case_num;
-      GtkWidget *case_num_entry =
-	get_widget_assert (xml, "goto-case-case-num-entry");
-
-      case_num = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
-	- FIRST_CASE_NUMBER ;
+      PsppireDataStore *store = NULL;
+      g_object_get (ds, "data-model", &store, NULL);
 
-      g_object_set (de->data_editor, "current-case", case_num, NULL);
+      GtkWidget *case_num_entry =
+  	get_widget_assert (xml, "goto-case-case-num-entry");
+
+      glong case_num =
+	gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
+  	- FIRST_CASE_NUMBER ;
+
+      if (case_num >= 0 &&
+	  case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL))
+      {
+	ssw_sheet_scroll_to (SSW_SHEET (ds), -1, case_num);
+	ssw_sheet_set_active_cell (SSW_SHEET (ds), -1, case_num, 0);
+      }
     }
 }