changed script actions keybindings: s/CTRL-XXX/CTRL-ALT-XXX/

diff --git a/helm/matita/matita.glade b/helm/matita/matita.glade
index 6b951b21d47f145df5af7633d7eeca39ec3432be..6ddd786b9b4210684bb40568f1bbf545a6a8e437 100644 (file)
--- a/helm/matita/matita.glade
+++ b/helm/matita/matita.glade
@@ -877,7 +877,7 @@
                              <accelerator key="n" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image712">
+                               <widget class="GtkImage" id="image776">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-new</property>
                                  <property name="icon_size">1</property>
@@ -898,7 +898,7 @@
                              <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image713">
+                               <widget class="GtkImage" id="image777">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-open</property>
                                  <property name="icon_size">1</property>
@@ -919,7 +919,7 @@
                              <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image714">
+                               <widget class="GtkImage" id="image778">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-save</property>
                                  <property name="icon_size">1</property>
@@ -940,7 +940,7 @@
                              <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image715">
+                               <widget class="GtkImage" id="image779">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-save-as</property>
                                  <property name="icon_size">1</property>
@@ -961,7 +961,7 @@
                              <accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image716">
+                               <widget class="GtkImage" id="image780">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-execute</property>
                                  <property name="icon_size">1</property>
@@ -988,7 +988,7 @@
                              <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image717">
+                               <widget class="GtkImage" id="image781">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-quit</property>
                                  <property name="icon_size">1</property>
@@ -1023,7 +1023,7 @@
                              <accelerator key="z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image718">
+                               <widget class="GtkImage" id="image782">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-undo</property>
                                  <property name="icon_size">1</property>
@@ -1045,7 +1045,7 @@
                              <accelerator key="z" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image719">
+                               <widget class="GtkImage" id="image783">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-redo</property>
                                  <property name="icon_size">1</property>
@@ -1072,7 +1072,7 @@
                              <accelerator key="x" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image720">
+                               <widget class="GtkImage" id="image784">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-cut</property>
                                  <property name="icon_size">1</property>
@@ -1093,7 +1093,7 @@
                              <accelerator key="c" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image721">
+                               <widget class="GtkImage" id="image785">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-copy</property>
                                  <property name="icon_size">1</property>
@@ -1114,7 +1114,7 @@
                              <accelerator key="v" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image722">
+                               <widget class="GtkImage" id="image786">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-paste</property>
                                  <property name="icon_size">1</property>
@@ -1134,7 +1134,7 @@
                              <property name="use_underline">True</property>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image723">
+                               <widget class="GtkImage" id="image787">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-delete</property>
                                  <property name="icon_size">1</property>
@@ -1175,7 +1175,7 @@
                              <accelerator key="f" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image724">
+                               <widget class="GtkImage" id="image788">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-find-and-replace</property>
                                  <property name="icon_size">1</property>
@@ -1215,6 +1215,76 @@
                    </widget>
                  </child>
 
+                 <child>
+                   <widget class="GtkMenuItem" id="scriptMenu">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">_Script</property>
+                     <property name="use_underline">True</property>
+
+                     <child>
+                       <widget class="GtkMenu" id="scriptMenu_menu">
+
+                         <child>
+                           <widget class="GtkMenuItem" id="scriptAdvanceMenuItem">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Execute 1 phrase</property>
+                             <property name="use_underline">True</property>
+                             <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                           </widget>
+                         </child>
+
+                         <child>
+                           <widget class="GtkMenuItem" id="scriptRetractMenuItem">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Retract 1 phrase</property>
+                             <property name="use_underline">True</property>
+                             <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                           </widget>
+                         </child>
+
+                         <child>
+                           <widget class="GtkSeparatorMenuItem" id="separator9">
+                             <property name="visible">True</property>
+                           </widget>
+                         </child>
+
+                         <child>
+                           <widget class="GtkMenuItem" id="scriptBottomMenuItem">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Execute all</property>
+                             <property name="use_underline">True</property>
+                             <accelerator key="End" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                           </widget>
+                         </child>
+
+                         <child>
+                           <widget class="GtkMenuItem" id="scriptTopMenuItem">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Restart</property>
+                             <property name="use_underline">True</property>
+                             <accelerator key="Home" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                           </widget>
+                         </child>
+
+                         <child>
+                           <widget class="GtkSeparatorMenuItem" id="separator10">
+                             <property name="visible">True</property>
+                           </widget>
+                         </child>
+
+                         <child>
+                           <widget class="GtkMenuItem" id="scriptJumpMenuItem">
+                             <property name="visible">True</property>
+                             <property name="label" translatable="yes">Execute until cursor</property>
+                             <property name="use_underline">True</property>
+                             <accelerator key="period" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
+                           </widget>
+                         </child>
+                       </widget>
+                     </child>
+                   </widget>
+                 </child>
+
                  <child>
                    <widget class="GtkMenuItem" id="viewMenu">
                      <property name="visible">True</property>
@@ -1274,7 +1344,7 @@
                              <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image725">
+                               <widget class="GtkImage" id="image789">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-zoom-in</property>
                                  <property name="icon_size">1</property>
@@ -1296,7 +1366,7 @@
                              <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image726">
+                               <widget class="GtkImage" id="image790">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-zoom-out</property>
                                  <property name="icon_size">1</property>
@@ -1317,7 +1387,7 @@
                              <accelerator key="equal" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image727">
+                               <widget class="GtkImage" id="image791">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-zoom-100</property>
                                  <property name="icon_size">1</property>
@@ -1369,7 +1439,7 @@
                              <property name="use_underline">True</property>
 
                              <child internal-child="image">
-                               <widget class="GtkImage" id="image728">
+                               <widget class="GtkImage" id="image792">
                                  <property name="visible">True</property>
                                  <property name="stock">gtk-about</property>
                                  <property name="icon_size">1</property>
@@ -2037,11 +2107,10 @@
                                  <child>
                                    <widget class="GtkButton" id="scriptTopButton">
                                      <property name="visible">True</property>
-                                     <property name="tooltip" translatable="yes">restart (Ctrl+Home)</property>
+                                     <property name="tooltip" translatable="yes">Restart</property>
                                      <property name="can_focus">True</property>
                                      <property name="relief">GTK_RELIEF_NONE</property>
                                      <property name="focus_on_click">True</property>
-                                     <accelerator key="Home" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
 
                                      <child>
                                        <widget class="GtkImage" id="image253">
@@ -2073,11 +2142,10 @@
                                  <child>
                                    <widget class="GtkButton" id="scriptRetractButton">
                                      <property name="visible">True</property>
-                                     <property name="tooltip" translatable="yes">go back 1 phrase (Ctrl+Page Up)</property>
+                                     <property name="tooltip" translatable="yes">Retract 1 phrase</property>
                                      <property name="can_focus">True</property>
                                      <property name="relief">GTK_RELIEF_NONE</property>
                                      <property name="focus_on_click">True</property>
-                                     <accelerator key="Page_Up" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
 
                                      <child>
                                        <widget class="GtkImage" id="image254">
@@ -2109,7 +2177,7 @@
                                  <child>
                                    <widget class="GtkButton" id="scriptJumpButton">
                                      <property name="visible">True</property>
-                                     <property name="tooltip" translatable="yes">execute until point</property>
+                                     <property name="tooltip" translatable="yes">Execute until point</property>
                                      <property name="can_focus">True</property>
                                      <property name="relief">GTK_RELIEF_NONE</property>
                                      <property name="focus_on_click">True</property>
@@ -2144,11 +2212,10 @@
                                  <child>
                                    <widget class="GtkButton" id="scriptAdvanceButton">
                                      <property name="visible">True</property>
-                                     <property name="tooltip" translatable="yes">go forward 1 phrase (Ctrl+Page Down)</property>
+                                     <property name="tooltip" translatable="yes">Execute 1 phrase</property>
                                      <property name="can_focus">True</property>
                                      <property name="relief">GTK_RELIEF_NONE</property>
                                      <property name="focus_on_click">True</property>
-                                     <accelerator key="Page_Down" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
 
                                      <child>
                                        <widget class="GtkImage" id="image256">
@@ -2180,11 +2247,10 @@
                                  <child>
                                    <widget class="GtkButton" id="scriptBottomButton">
                                      <property name="visible">True</property>
-                                     <property name="tooltip" translatable="yes">execute all (Ctrl+End)</property>
+                                     <property name="tooltip" translatable="yes">Execute all</property>
                                      <property name="can_focus">True</property>
                                      <property name="relief">GTK_RELIEF_NONE</property>
                                      <property name="focus_on_click">True</property>
-                                     <accelerator key="End" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
 
                                      <child>
                                        <widget class="GtkImage" id="image257">

diff --git a/helm/matita/matitaGui.ml b/helm/matita/matitaGui.ml
index c6a8aef6af103091bf1a6cd350c6d3c8c504e347..fe113743b1d0ef7d9cbe7d2e5b9ccf5cd282c98e 100644 (file)
--- a/helm/matita/matitaGui.ml
+++ b/helm/matita/matitaGui.ml
@@ -702,25 +702,16 @@ class gui () =
       connect_button main#scriptRetractButton retract;
       connect_button main#scriptTopButton top;
       connect_button main#scriptBottomButton bottom;
-      connect_key GdkKeysyms._Down advance;
-      connect_key GdkKeysyms._Up retract;
-      connect_key GdkKeysyms._Home top;
-      connect_key GdkKeysyms._End bottom;
       connect_button main#scriptJumpButton jump;
+      connect_menu_item main#scriptAdvanceMenuItem advance;
+      connect_menu_item main#scriptRetractMenuItem retract;
+      connect_menu_item main#scriptTopMenuItem top;
+      connect_menu_item main#scriptBottomMenuItem bottom;
+      connect_menu_item main#scriptJumpMenuItem jump;
       connect_menu_item main#openMenuItem   loadScript;
       connect_menu_item main#saveMenuItem   saveScript;
       connect_menu_item main#saveAsMenuItem saveAsScript;
       connect_menu_item main#newMenuItem    newScript;
-      connect_key GdkKeysyms._period
-        (fun () ->
-          source_buffer#insert ~iter:(source_buffer#get_iter_at_mark `INSERT)
-            ".\n";
-          advance ());
-      connect_key GdkKeysyms._Return
-        (fun () ->
-          source_buffer#insert ~iter:(source_buffer#get_iter_at_mark `INSERT)
-            "\n";
-          advance ());
          (* script monospace font stuff *)  
       self#updateFontSize ();
         (* debug menu *)