X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fsyntax-editor.ui;h=405673e0ddc59289632e51fe0f238b8bad39cad4;hb=96c73a0044390c4de8b163bb0445ed28c3648792;hp=5666b4995a1fdf745ac200db4edb4d2f4436a8a8;hpb=3701d580cb7b5802201cf4642f0e17c4701f12ec;p=pspp

diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index 5666b4995a..405673e0dd 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-data</property>
             <property name="name">new2</property>
           </object>
         </child>
@@ -29,38 +29,34 @@
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="open2">
-            <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>
+          <object class="GtkAction" id="file_open">
+            <property name="stock-id">file-open-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-data</property>
             <property name="name">file_save</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="file_save_as">
-            <property name="stock-id">gtk-save-as</property>
+            <property name="stock-id">file-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">file-print</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>
@@ -71,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="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="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="copy2">
-            <property name="stock-id">gtk-copy</property>
-            <property name="name">copy2</property>
+          <object class="GtkAction" id="edit_delete">
+            <property name="stock-id">edit-delete</property>
+            <property name="name">edit_delete</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_undo">
+            <property name="stock-id">edit-undo</property>
+            <property name="name">edit_undo</property>
           </object>
         </child>
         <child>
-          <object class="GtkAction" id="delete1">
-            <property name="stock-id">gtk-delete</property>
-            <property name="name">delete1</property>
+          <object class="GtkAction" id="edit_redo">
+            <property name="stock-id">edit-redo</property>
+            <property name="name">edit_redo</property>
           </object>
         </child>
         <child>
@@ -102,18 +114,21 @@
         </child>
         <child>
           <object class="GtkAction" id="run_all">
+	    <property name="stock-id">run-all</property>
             <property name="name">run_all</property>
             <property name="label" translatable="yes">All</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="run_selection">
+	    <property name="stock-id">run-selection</property>
             <property name="name">run_selection</property>
             <property name="label" translatable="yes">Selection</property>
           </object>
         </child>
         <child>
           <object class="GtkAction" id="run_current_line">
+	    <property name="stock-id">run-current-line</property>
             <property name="name">run_current_line</property>
             <property name="label" translatable="yes">Current Line</property>
           </object>
@@ -121,7 +136,8 @@
         </child>
         <child>
           <object class="GtkAction" id="run_to_end">
-            <property name="name">run_to_end</property>
+	    <property name="stock-id">run-to-end</property>
+            <property name="name">run-to-end</property>
             <property name="label" translatable="yes">To End</property>
           </object>
         </child>
@@ -133,6 +149,7 @@
         </child>
         <child>
           <object class="GtkAction" id="windows_minimise_all">
+	    <property name="stock-id">windows-minimize-all</property>
             <property name="name">windows_minimise_all</property>
             <property name="label" translatable="yes">_Minimize All Windows</property>
           </object>
@@ -146,20 +163,22 @@
             <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/>
+          <menuitem action="file_print"/>
+          <separator/>
           <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"/>
@@ -186,7 +205,7 @@
     <property name="shadow_type">GTK_SHADOW_IN</property>
     <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
     <child>
-      <object class="GtkTextView" id="syntax_text_view">
+      <object class="GtkSourceView" id="syntax_text_view">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="editable">True</property>