X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fsyntax-editor.ui;h=01816a7137a2a15e9e707581608704720fcb05c4;hb=f8f1a264cd46b53651baf9aa3ab5042b57fd351b;hp=bffa173170a14e175b88d89d64bdfa58870485e6;hpb=f3932bc77ec4d8835790df48c57849d122306ffb;p=pspp

diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index bffa173170..01816a7137 100644
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -12,7 +12,7 @@
         </child>
         <child>
           <object class="GtkAction" id="new2">
-            <property name="stock-id">gtk-new</property>
+            <property name="stock-id">file-new-document</property>
             <property name="name">new2</property>
           </object>
         </child>
@@ -29,26 +29,15 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="open2">
+          <object class="GtkAction" id="file_open">
             <property name="stock-id">gtk-open</property>
-            <property name="name">open2</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="file_open_syntax">
-            <property name="name">file_open_syntax</property>
-            <property name="label" translatable="yes">_Syntax</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="file_open_data">
-            <property name="name">file_open_data</property>
-            <property name="label" translatable="yes">_Data</property>
+            <property name="name">file_open</property>
+            <property name="label" translatable="yes">_Open...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_save">
-            <property name="stock-id">gtk-save</property>
+            <property name="stock-id">file-save-document</property>
             <property name="name">file_save</property>
           </object>
         </child>
@@ -56,17 +45,18 @@
           <object class="GtkAction" id="file_save_as">
             <property name="stock-id">gtk-save-as</property>
             <property name="name">file_save_as</property>
+            <property name="label" translatable="yes">Save _As...</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_print">
             <property name="name">file_print</property>
-            <property name="stock-id">gtk-print</property>
+            <property name="stock-id">file-print-document</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_quit">
-            <property name="stock-id">gtk-quit</property>
+            <property name="stock-id">file-quit</property>
             <property name="name">file_quit</property>
           </object>
         </child>
@@ -77,27 +67,43 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="cut2">
-            <property name="stock-id">gtk-cut</property>
-            <property name="name">cut2</property>
+          <object class="GtkAction" id="edit_cut">
+            <property name="stock-id">edit-cut</property>
+            <property name="name">edit_cut</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="copy2">
-            <property name="stock-id">gtk-copy</property>
-            <property name="name">copy2</property>
+          <object class="GtkAction" id="edit_copy">
+            <property name="stock-id">edit-copy</property>
+            <property name="name">edit_copy</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="paste2">
-            <property name="stock-id">gtk-paste</property>
-            <property name="name">paste2</property>
+          <object class="GtkAction" id="edit_paste">
+            <property name="stock-id">edit-paste</property>
+            <property name="name">edit_paste</property>
+            <property name="sensitive">false</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="delete1">
+          <object class="GtkAction" id="edit_delete">
             <property name="stock-id">gtk-delete</property>
-            <property name="name">delete1</property>
+            <property name="name">edit_delete</property>
+            <property name="sensitive">false</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_undo">
+            <property name="stock-id">gtk-undo</property>
+            <property name="name">edit_undo</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="edit_redo">
+            <property name="stock-id">gtk-redo</property>
+            <property name="name">edit_redo</property>
           </object>
         </child>
         <child>
@@ -152,10 +158,7 @@
             <menuitem action="file_new_syntax"/>
             <menuitem action="file_new_data"/>
           </menu>
-          <menu action="open2">
-            <menuitem action="file_open_syntax"/>
-            <menuitem action="file_open_data"/>
-          </menu>
+          <menuitem action="file_open"/>
           <menuitem action="file_save"/>
           <menuitem action="file_save_as"/>
           <separator/>
@@ -164,10 +167,13 @@
           <menuitem action="file_quit"/>
         </menu>
         <menu action="menuitem7">
-          <menuitem action="cut2"/>
-          <menuitem action="copy2"/>
-          <menuitem action="paste2"/>
-          <menuitem action="delete1"/>
+          <menuitem action="edit_cut"/>
+          <menuitem action="edit_copy"/>
+          <menuitem action="edit_paste"/>
+          <menuitem action="edit_delete"/>
+          <separator/>
+          <menuitem action="edit_undo"/>
+          <menuitem action="edit_redo"/>
         </menu>
         <menu action="run1">
           <menuitem action="run_all"/>