X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=2b4c5b5e4ae871384bd6beb625e336b8c3411c8a;hb=b48a20de787a6374000174949dcd8f9666ecc51c;hp=3fe6d1a69f79d3f5a3c14364e7ddfe432f386a96;hpb=d502474673494b002af0bc5c97c21837a1e54f89;p=pspp-builds.git diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 3fe6d1a6..2b4c5b5e 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -18,7 +18,6 @@ #include #include -#include #include "helper.h" #include @@ -75,8 +74,6 @@ static GObjectClass *parent_class ; static void psppire_syntax_window_finalize (GObject *object) { - GObjectClass *class = G_OBJECT_GET_CLASS (object); - if (G_OBJECT_CLASS (parent_class)->finalize) (*G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -85,6 +82,7 @@ psppire_syntax_window_finalize (GObject *object) static void psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class) { + parent_class = g_type_class_peek_parent (class); } @@ -93,8 +91,6 @@ psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - parent_class = g_type_class_peek_parent (class); - object_class->finalize = psppire_syntax_window_finalize; } @@ -250,8 +246,11 @@ save_editor_to_file (PsppireSyntaxWindow *se, if ( result ) { + gchar *msg = g_strdup_printf (_("Saved file \"%s\""), filename); + gtk_statusbar_push (GTK_STATUSBAR (se->sb), se->text_context, msg); psppire_window_set_filename (PSPPIRE_WINDOW (se), filename); gtk_text_buffer_set_modified (buffer, FALSE); + g_free (msg); } return result; @@ -263,7 +262,6 @@ save_editor_to_file (PsppireSyntaxWindow *se, static void save_if_modified (PsppireSyntaxWindow *se) { - if ( TRUE == gtk_text_buffer_get_modified (se->buffer)) { gint response; @@ -284,14 +282,15 @@ save_if_modified (PsppireSyntaxWindow *se) 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); @@ -474,111 +473,122 @@ open_syntax_window (GtkMenuItem *menuitem, gpointer parent) } +static void +on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window) +{ + gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context); +} 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); - connect_help (xml); + 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); + + // 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_WIDGET (gtk_ui_manager_get_widget (uim,"/ui/menubar2/windows/windows_minimise_all"))->parent); + g_object_unref (xml);