From: John Darrington Date: Mon, 23 Aug 2010 17:30:10 +0000 (+0200) Subject: Syntax Window: Edit->* item sensitivity follows selection X-Git-Tag: v0.7.6~271 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=407f3c634628b92fb6b57cbcff229270107cdddc;p=pspp-builds.git Syntax Window: Edit->* item sensitivity follows selection Disable the Edit Cut/Copy/Delete menuitems by default and enable them only when a selection is active. --- diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 965482e5..ec4da6e6 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -152,6 +152,16 @@ enum { }; +static void +selection_changed (PsppireSyntaxWindow *sw) +{ + gboolean sel = gtk_text_buffer_get_has_selection (sw->buffer); + + gtk_action_set_sensitive (sw->edit_copy, sel); + gtk_action_set_sensitive (sw->edit_cut, sel); + gtk_action_set_sensitive (sw->edit_delete, sel); +} + /* The callback which runs when something request clipboard data */ static void clipboard_get_cb (GtkClipboard *clipboard, @@ -231,8 +241,7 @@ on_edit_copy (PsppireSyntaxWindow *sw) { GtkTextIter begin, end; - if ( ! set_clip (sw, &begin, &end)) - return; + set_clip (sw, &begin, &end); } @@ -502,8 +511,18 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view"); + + GtkClipboard *clipboard = + gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY); + + g_signal_connect_swapped (clipboard, "owner-change", G_CALLBACK (selection_changed), window); + window->cliptext = NULL; + window->edit_delete = get_action_assert (xml, "edit_delete"); + window->edit_copy = get_action_assert (xml, "edit_copy"); + window->edit_cut = get_action_assert (xml, "edit_cut"); + window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); window->lexer = lex_create (the_source_stream); @@ -556,18 +575,17 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) G_CALLBACK (on_quit), window); - - g_signal_connect_swapped (get_action_assert (xml, "edit_delete"), + g_signal_connect_swapped (window->edit_delete, "activate", G_CALLBACK (on_edit_delete), window); - g_signal_connect_swapped (get_action_assert (xml, "edit_copy"), + g_signal_connect_swapped (window->edit_copy, "activate", G_CALLBACK (on_edit_copy), window); - g_signal_connect_swapped (get_action_assert (xml, "edit_cut"), + g_signal_connect_swapped (window->edit_cut, "activate", G_CALLBACK (on_edit_cut), window); @@ -577,7 +595,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) G_CALLBACK (on_run_all), window); - g_signal_connect (get_action_assert (xml,"run_selection"), "activate", G_CALLBACK (on_run_selection), @@ -611,6 +628,9 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) } + + + GtkWidget* psppire_syntax_window_new (void) { @@ -697,3 +717,6 @@ psppire_syntax_window_iface_init (PsppireWindowIface *iface) iface->save = syntax_save; iface->load = syntax_load; } + + + diff --git a/src/ui/gui/psppire-syntax-window.h b/src/ui/gui/psppire-syntax-window.h index 3e4edf87..9da7c869 100644 --- a/src/ui/gui/psppire-syntax-window.h +++ b/src/ui/gui/psppire-syntax-window.h @@ -53,6 +53,11 @@ struct _PsppireSyntaxWindow guint text_context; gchar *cliptext; + + GtkAction *edit_cut; + GtkAction *edit_copy; + GtkAction *edit_delete; + GtkAction *edit_paste; }; struct _PsppireSyntaxWindowClass diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui index 7e0c0b52..c9436629 100644 --- a/src/ui/gui/syntax-editor.ui +++ b/src/ui/gui/syntax-editor.ui @@ -74,24 +74,28 @@ gtk-cut edit_cut + false gtk-copy edit_copy + false gtk-paste edit_paste + false gtk-delete edit_delete + false