#include <gtk/gtksignal.h>
#include <gtk/gtkbox.h>
-#include <glade/glade.h>
#include "helper.h"
#include <libpspp/message.h>
if ( result )
{
- psppire_window_set_filename (PSPPIRE_WINDOW (se), filename);
+ gchar *msg = g_strdup_printf (_("Saved file \"%s\""), filename);
+ gtk_statusbar_push (GTK_STATUSBAR (se->sb), se->text_context, msg);
gtk_text_buffer_set_modified (buffer, FALSE);
+ g_free (msg);
}
return result;
}
-/* If the buffer's modified flag is set, then save it, and close the window.
- Otherwise just close the window.
-*/
-static void
-save_if_modified (PsppireSyntaxWindow *se)
-{
-
- if ( TRUE == gtk_text_buffer_get_modified (se->buffer))
- {
- gint response;
- GtkWidget *dialog;
-
- const gchar *filename = psppire_window_get_filename (PSPPIRE_WINDOW (se));
-
- g_return_if_fail (filename != NULL);
-
- dialog =
- gtk_message_dialog_new (GTK_WINDOW (se),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_NONE,
- _("Save contents of syntax editor to %s?"),
- filename);
-
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_YES,
- GTK_RESPONSE_ACCEPT);
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_NO,
- GTK_RESPONSE_REJECT);
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
-
-
- response = gtk_dialog_run (GTK_DIALOG (dialog));
-
- gtk_widget_destroy (dialog);
-
- if ( response == GTK_RESPONSE_ACCEPT )
- {
- GError *err = NULL;
-
- if ( ! save_editor_to_file (se, filename, &err) )
- {
- msg (ME, err->message);
- g_error_free (err);
- }
- }
-
- if ( response == GTK_RESPONSE_CANCEL )
- return ;
- }
-
- gtk_widget_destroy (GTK_WIDGET (se));
-}
/* Callback for the File->SaveAs menuitem */
static void
static gboolean
on_quit (GtkMenuItem *menuitem, gpointer user_data)
{
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
- save_if_modified (se);
+ PsppireWindow *se = PSPPIRE_WINDOW (user_data);
+
return FALSE;
}
static gboolean
on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data)
{
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
+ PsppireWindow *se = PSPPIRE_WINDOW (user_data);
- save_if_modified (se);
- return TRUE;
+ if ( psppire_window_query_save (se) )
+ {
+ gchar *filename = NULL;
+ GError *err = NULL;
+
+ g_object_get (se, "filename", &filename, NULL);
+
+ if ( ! save_editor_to_file (se, filename, &err) )
+ {
+ msg (ME, err->message);
+ g_error_free (err);
+ }
+ }
+
+ return FALSE;
}
}
+static void
+on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window)
+{
+ gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context);
+}
+
+static void
+on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window)
+{
+ psppire_window_set_unsaved (window, gtk_text_buffer_get_modified (buffer));
+}
+
extern struct source_stream *the_source_stream ;
static void
psppire_syntax_window_init (PsppireSyntaxWindow *window)
{
- GladeXML *xml = XML_NEW ("syntax-editor.glade");
+ GtkBuilder *xml = builder_new ("syntax-editor.ui");
GtkWidget *box = gtk_vbox_new (FALSE, 0);
-
+
GtkWidget *menubar = get_widget_assert (xml, "menubar2");
GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8");
- GtkWidget *sb = get_widget_assert (xml, "statusbar2");
+
GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view");
window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
window->lexer = lex_create (the_source_stream);
+ window->sb = get_widget_assert (xml, "statusbar2");
+ window->text_context = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->sb), "Text Context");
+
+ g_signal_connect (window->buffer, "changed", G_CALLBACK (on_text_changed), window);
+
+ g_signal_connect (window->buffer, "modified-changed",
+ G_CALLBACK (on_modified_changed), window);
+
connect_help (xml);
gtk_container_add (GTK_CONTAINER (window), box);
g_object_ref (menubar);
- gtk_widget_unparent (menubar);
g_object_ref (sw);
- gtk_widget_unparent (sw);
- g_object_ref (sb);
- gtk_widget_unparent (sb);
+ g_object_ref (window->sb);
gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), sb, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), window->sb, FALSE, TRUE, 0);
gtk_widget_show_all (box);
- g_signal_connect (get_widget_assert (xml,"file_new_syntax"),
+ g_signal_connect (get_object_assert (xml,"file_new_syntax"),
"activate",
G_CALLBACK (create_syntax_window),
NULL);
- g_signal_connect (get_widget_assert (xml,"file_open_syntax"),
+ g_signal_connect (get_object_assert (xml,"file_open_syntax"),
"activate",
G_CALLBACK (open_syntax_window),
window);
#if 0
- g_signal_connect (get_widget_assert (xml,"file_new_data"),
+ g_signal_connect (get_object_assert (xml,"file_new_data"),
"activate",
G_CALLBACK (create_data_window),
window);
#endif
- g_signal_connect (get_widget_assert (xml,"help_about"),
+ g_signal_connect (get_object_assert (xml,"help_about"),
"activate",
G_CALLBACK (about_new),
window);
- g_signal_connect (get_widget_assert (xml,"help_reference"),
+ g_signal_connect (get_object_assert (xml,"help_reference"),
"activate",
G_CALLBACK (reference_manual),
NULL);
- g_signal_connect (get_widget_assert (xml, "file_save"),
+ g_signal_connect (get_object_assert (xml, "file_save"),
"activate",
G_CALLBACK (on_syntax_save),
window);
- g_signal_connect (get_widget_assert (xml, "file_save_as"),
+ g_signal_connect (get_object_assert (xml, "file_save_as"),
"activate",
G_CALLBACK (on_syntax_save_as),
window);
- g_signal_connect (get_widget_assert (xml,"file_quit"),
+ g_signal_connect (get_object_assert (xml,"file_quit"),
"activate",
G_CALLBACK (on_quit),
window);
- g_signal_connect (get_widget_assert (xml,"run_all"),
+ g_signal_connect (get_object_assert (xml,"run_all"),
"activate",
G_CALLBACK (on_run_all),
window);
- g_signal_connect (get_widget_assert (xml,"run_selection"),
+ g_signal_connect (get_object_assert (xml,"run_selection"),
"activate",
G_CALLBACK (on_run_selection),
window);
- g_signal_connect (get_widget_assert (xml,"run_current_line"),
+ g_signal_connect (get_object_assert (xml,"run_current_line"),
"activate",
G_CALLBACK (on_run_current_line),
window);
- g_signal_connect (get_widget_assert (xml,"run_to_end"),
+ g_signal_connect (get_object_assert (xml,"run_to_end"),
"activate",
G_CALLBACK (on_run_to_end),
window);
- g_signal_connect (get_widget_assert (xml,"windows_minimise_all"),
+ g_signal_connect (get_object_assert (xml,"windows_minimise_all"),
"activate",
G_CALLBACK (psppire_window_minimise_all), NULL);
- PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (get_widget_assert (xml,"windows_menu"));
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1"));
+
+ PSPPIRE_WINDOW (window)->menu =
+ GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar2/windows/windows_minimise_all")->parent);
+
g_object_unref (xml);
psppire_syntax_window_new (void)
{
return GTK_WIDGET (g_object_new (psppire_syntax_window_get_type (),
- "usage", PSPPIRE_WINDOW_USAGE_SYNTAX,
+ "filename", "Syntax",
+ "description", _("Syntax Editor"),
NULL));
}
projects / pspp-builds.git / blobdiff