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 965482e52bfe53dec5e50beca2cce46cd36936d1..ec4da6e604f4d70eacb4037722c52ef849a32b7d 100644 (file)
--- 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);
 }
 
 \f
@@ -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 3e4edf87ade076ab2e084f5392d7a77d1a5c6a6a..9da7c86996c6335d6b38866982f91ae0c5a9cfc0 100644 (file)
--- 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 7e0c0b526d10dc7cc7a070fb02684b2174b80b8f..c9436629e58779d6922bf4e795afbd35d675ca30 100644 (file)
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -74,24 +74,28 @@
           <object class="GtkAction" id="edit_cut">
             <property name="stock-id">gtk-cut</property>
             <property name="name">edit_cut</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_copy">
             <property name="stock-id">gtk-copy</property>
             <property name="name">edit_copy</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_paste">
             <property name="stock-id">gtk-paste</property>
             <property name="name">edit_paste</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="edit_delete">
             <property name="stock-id">gtk-delete</property>
             <property name="name">edit_delete</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>