X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fcomments-dialog.c;h=58cf7e7f2ab12d6621edf4acadbff00eb25c8234;hb=7a2bc16d86f90a796e4c42a6c3f3908231bbe8e9;hp=b584c0b5c78b9b771017e3157a1396f6022a37e6;hpb=db2b1501c7ef5912183d51340740dd4bd2ee45ac;p=pspp diff --git a/src/ui/gui/comments-dialog.c b/src/ui/gui/comments-dialog.c index b584c0b5c7..58cf7e7f2a 100644 --- a/src/ui/gui/comments-dialog.c +++ b/src/ui/gui/comments-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2010, 2011, 2012, 2013 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,19 +17,18 @@ #include #include "psppire-dialog.h" +#include "builder-wrapper.h" +#include "psppire-data-window.h" +#include "psppire-data-editor.h" +#include "executor.h" #include "helper.h" -#include "data-editor.h" -#include -#include "syntax-editor.h" -#include "psppire-var-store.h" -#include +#include #include "comments-dialog.h" #include "dialog-common.h" #include -#include #include @@ -39,7 +38,7 @@ struct comment_dialog { - GladeXML *xml; + GtkBuilder *xml; PsppireDict *dict; }; @@ -75,41 +74,31 @@ wrap_line (GtkTextBuffer *buffer, if ( chars > DOC_LINE_LENGTH ) { GtkTextIter line_fold = *iter; - GtkTextIter cursor; gtk_text_iter_set_line_offset (&line_fold, DOC_LINE_LENGTH); gtk_text_buffer_insert (buffer, &line_fold, "\r\n", 2); - - cursor = line_fold; - gtk_text_iter_forward_to_line_end (&cursor); - - gtk_text_buffer_place_cursor (buffer, &cursor); } } void -comments_dialog (GObject *o, gpointer data) +comments_dialog (PsppireDataWindow *de) { GtkTextIter iter; gint response ; - struct data_editor *de = data; struct comment_dialog cd; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("comments.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)); - PsppireVarStore *vs = NULL; - g_object_get (de->data_editor, "var-store", &vs, NULL); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); { PangoContext * context ; @@ -121,8 +110,7 @@ comments_dialog (GObject *o, gpointer data) PangoFontDescription *font_desc = pango_font_description_from_string ("monospace"); - gtk_widget_modify_font (textview, font_desc); - + gtk_widget_override_font (textview, font_desc); /* and let's just make sure that a complete line fits into the widget's width */ @@ -145,7 +133,7 @@ comments_dialog (GObject *o, gpointer data) } cd.xml = xml; - cd.dict = vs->dict; + g_object_get (de->data_editor, "dictionary", &cd.dict, NULL); g_signal_connect (buffer, "mark-set", G_CALLBACK (set_column_number), label); @@ -165,25 +153,10 @@ comments_dialog (GObject *o, gpointer data) switch (response) { case GTK_RESPONSE_OK: - { - gchar *syntax = generate_syntax (&cd); - struct getl_interface *sss = create_syntax_string_source (syntax); - execute_syntax (sss); - - g_free (syntax); - } + g_free (execute_syntax_string (de, generate_syntax (&cd))); break; case PSPPIRE_RESPONSE_PASTE: - { - gchar *syntax = generate_syntax (&cd); - - struct syntax_editor *se = - (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL); - - gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1); - - g_free (syntax); - } + g_free (paste_syntax_to_window (generate_syntax (&cd))); break; default: break; @@ -212,13 +185,7 @@ refresh (PsppireDialog *dialog, const struct comment_dialog *cd) gtk_text_buffer_set_text (buffer, "", 0); for ( i = 0 ; i < dict_get_document_line_cnt (cd->dict->dict); ++i ) - { - struct string str; - ds_init_empty (&str); - dict_get_document_line (cd->dict->dict, i, &str); - add_line_to_buffer (buffer, ds_cstr (&str)); - ds_destroy (&str); - } + add_line_to_buffer (buffer, dict_get_document_line (cd->dict->dict, i)); } @@ -233,38 +200,37 @@ generate_syntax (const struct comment_dialog *cd) GtkWidget *tv = get_widget_assert (cd->xml, "comments-textview1"); GtkWidget *check = get_widget_assert (cd->xml, "comments-checkbutton1"); GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv)); - const char *existing_docs = dict_get_documents (cd->dict->dict); str = g_string_new ("\n* Data File Comments.\n\n"); - if ( NULL != existing_docs) + if (dict_get_documents (cd->dict->dict) != NULL) g_string_append (str, "DROP DOCUMENTS.\n"); g_string_append (str, "ADD DOCUMENT\n"); 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); + struct string tmp; + GtkTextIter start; + char *line; - end = start; - - 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");