Convert psppire.glade to psppire.ui

[pspp-builds.git] / src / ui / gui / comments-dialog.c

diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c
index fb4496917cefa1222c452b8a6a3f07547fa5ebc4..f425fac2364d2d285429b6fdd48a4db9485d2b8d 100644 (file)
--- a/src/ui/gui/comments-dialog.c
+++ b/src/ui/gui/comments-dialog.c
@@ -1,39 +1,34 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2007  Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2007  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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
-#include <gtksheet/gtksheet.h>
 #include "psppire-dialog.h"
 #include "helper.h"
 #include "data-editor.h"
 #include <language/syntax-string-source.h>
 #include "syntax-editor.h"
 #include "psppire-var-store.h"
-#include <libpspp/syntax-gen.h>
+#include <ui/syntax-gen.h>
 
 #include "comments-dialog.h"
 
 #include "dialog-common.h"
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
 
 #include <gettext.h>
 
@@ -43,7 +38,7 @@
 
 struct comment_dialog
 {
-  GladeXML *xml;
+  GtkBuilder *xml;
   PsppireDict *dict;
 };
 
@@ -102,17 +97,16 @@ comments_dialog (GObject *o, gpointer data)
   struct data_editor *de = data;
   struct comment_dialog cd;
 
-  GladeXML *xml = XML_NEW ("psppire.glade");
+  GtkBuilder *xml = builder_new ("psppire.ui");
 
   GtkWidget *dialog = get_widget_assert (xml, "comments-dialog");
   GtkWidget *textview = get_widget_assert (xml, "comments-textview1");
   GtkWidget *label = get_widget_assert (xml, "column-number-label");
   GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+  PsppireVarStore *vs = NULL;
 
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
 
@@ -249,27 +243,27 @@ generate_syntax (const struct comment_dialog *cd)
 
   for (i = 0 ; i < gtk_text_buffer_get_line_count (buffer) ; ++i )
     {
-      struct string line;
-      GtkTextIter start, end;
-      gtk_text_buffer_get_iter_at_line (buffer, &start, i);
-
-      end = start;
+      struct string tmp;
+      GtkTextIter start;
+      char *line;
 
-      gtk_text_iter_forward_to_line_end (&end);
-
-      if ( gtk_text_iter_ends_line (&start))
-       ds_init_cstr (&line, "");
+      gtk_text_buffer_get_iter_at_line (buffer, &start, i);
+      if (gtk_text_iter_ends_line (&start))
+       line = g_strdup ("");
       else
-       ds_init_cstr (&line,
-                     gtk_text_buffer_get_text (buffer,
-                                               &start, &end,
-                                               FALSE));
+        {
+          GtkTextIter end = start;
+          gtk_text_iter_forward_to_line_end (&end);
+          line = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+        }
 
-      gen_quoted_string (&line);
+      ds_init_empty (&tmp);
+      syntax_gen_string (&tmp, ss_cstr (line));
+      g_free (line);
 
-      g_string_append_printf (str, " %s\n", ds_cstr (&line));
+      g_string_append_printf (str, " %s\n", ds_cstr (&tmp));
 
-      ds_destroy (&line);
+      ds_destroy (&tmp);
     }
   g_string_append (str, " .\n");