Index: src/GNOME_Gnumeric-psion.xml.in
===================================================================
RCS file: src/GNOME_Gnumeric-psion.xml.in
diff -N src/GNOME_Gnumeric-psion.xml.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/GNOME_Gnumeric-psion.xml.in	5 Nov 2004 16:57:02 -0000
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui>
+  <menubar>
+    <menu name="File" action="MenuFile">
+      <menuitem action="FileNew"/>
+      <menuitem action="FileOpen"/>
+      <separator name="file-sep1"/>
+      <menuitem action="FileSave"/>
+      <menuitem action="FileSaveAs"/>
+      <separator name="file-sep2"/>
+      <menuitem action="FilePageSetup"/>
+      <menuitem action="FilePrintPreview"/>
+      <menuitem action="FilePrint"/>
+      <separator name="file-sep3"/>
+      <menuitem action="FileSend"/>
+      <menuitem action="FileSummary"/>
+      <separator name="file-sep4"/>
+      <placeholder name="FileHistory" />
+      <separator name="file-sep5"/>
+      <menuitem action="FileClose"/>
+      <menuitem action="FileQuit"/>
+    </menu>
+    <menu name="Edit" action="MenuEdit">
+      <menuitem action="Undo"/>
+      <menuitem action="Redo"/>
+      <separator name="edit-sep1"/>
+      <menuitem action="EditCut"/>
+      <menuitem action="EditCopy"/>
+      <menuitem action="EditPaste"/>
+      <menuitem action="EditPasteSpecial"/>
+<!--TODO  menuitem action="EditPasteLink" -->
+      <separator name="edit-sep2"/>
+      <menu name="Fill" action="MenuEditFill">
+        <menuitem action="EditFillAutofill"/>
+        <menuitem action="ToolsMerge"/>
+        <menuitem action="ToolsTabulate"/>
+        <menuitem action="EditFillSeries"/>
+        <menuitem action="RandomGenerator"/>
+      </menu>
+      <menu name="Clear" action="MenuEditClear">
+        <menuitem action="EditClearAll"/>
+        <menuitem action="EditClearFormats"/>
+        <menuitem action="EditClearComments"/>
+        <menuitem action="EditClearContent"/>
+      </menu>
+      <menu name="Delete" action="MenuEditDelete">
+	<menuitem action="EditDeleteRows"/>
+	<menuitem action="EditDeleteColumns"/>
+	<menuitem action="EditDeleteCells"/>
+      </menu>
+      <menuitem action="InsertComment"/>
+      <separator name="edit-sep3"/>
+      <menu name="EditSheet" action="MenuEditSheet">
+        <menuitem action="SheetReorder"/>
+        <separator/>
+        <menuitem action="InsertSheet"/>
+        <menuitem action="InsertSheetAtEnd"/>
+        <menuitem action="EditDuplicateSheet"/>
+        <menuitem action="SheetRemove"/>
+        <menuitem action="SheetChangeName"/>
+      </menu>
+      <menu name="Select" action="MenuEditSelect">
+        <menuitem action="EditSelectAll"/>
+        <menuitem action="EditSelectRow"/>
+        <menuitem action="EditSelectColumn"/>
+        <menuitem action="EditSelectArray"/>
+        <menuitem action="EditSelectDepends"/>
+        <menuitem action="EditSelectInputs"/>
+      </menu>
+      <menuitem action="EditFind"/>
+      <menuitem action="EditReplace"/>
+      <menuitem action="EditGoto"/>
+      <menuitem action="EditRecalc"/>
+      <placeholder name="ops"/>
+    </menu>
+    <menu name="View" action="MenuView">
+      <menu name="Toolbars" action="MenuViewToolbars">
+      </menu>
+      <menuitem action="ViewStatusbar"/>
+      <menuitem action="ViewFullScreen"/>
+      <menuitem action="ViewZoom"/>
+      <menuitem action="ViewZoomIn"/>
+      <menuitem action="ViewZoomOut"/>
+    </menu>
+    <menu name="Insert" action="MenuInsert">
+      <menuitem action="InsertCells"/>
+      <menuitem action="InsertRows"/>
+      <menuitem action="InsertColumns"/>
+      <menuitem action="SheetInsert"/>
+      <separator/>
+      <menuitem action="ChartGuru"/>
+      <menuitem action="InsertFormula"/>
+      <menu name="Names" action="MenuInsertNames">
+        <menuitem action="EditNames"/>
+      </menu>
+      <menuitem action="InsertImage"/>
+      <menuitem action="InsertHyperlink"/>
+      <menu name="Drawing" action="MenuInsertDrawing">
+	<menuitem action="CreateLabel"/>
+	<menuitem action="CreateFrame"/>
+    <!-- Not useful until we have scripts
+	<menuitem action="CreateButton"/> -->
+    <!-- think about how to handle groups
+	<menuitem action="CreateRadioButton"/> -->
+	<menuitem action="CreateCheckbox"/>
+	<menuitem action="CreateScrollbar"/>
+	<menuitem action="CreateSpinButton"/>
+	<menuitem action="CreateSlider"/>
+	<menuitem action="CreateList"/>
+	<menuitem action="CreateCombo"/>
+	<menuitem action="CreateLine"/>
+	<menuitem action="CreateArrow"/>
+	<menuitem action="CreateRectangle"/>
+	<menuitem action="CreateEllipse"/>
+      </menu>
+      <menu name="Special" action="MenuInsertSpecial">
+        <menuitem action="InsertCurrentDate"/>
+        <menuitem action="InsertCurrentTime"/>
+        <menuitem action="InsertCurrentDateTime"/>
+      </menu>
+    </menu>
+    <menu name="Format" action="MenuFormat">
+      <menuitem action="FormatCells"/>
+      <menu name="FormatRow" action="MenuFormatRow">
+        <menuitem action="RowSize"/>
+        <menuitem action="RowAutoSize"/>
+        <menuitem action="RowHide"/>
+        <menuitem action="RowUnhide"/>
+        <menuitem action="RowDefaultSize"/>
+      </menu>
+      <menu name="FormatColumn" action="MenuFormatColumn">
+        <menuitem action="ColumnSize"/>
+        <menuitem action="ColumnAutoSize"/>
+        <menuitem action="ColumnHide"/>
+        <menuitem action="ColumnUnhide"/>
+        <menuitem action="ColumnDefaultSize"/>
+      </menu>
+      <menu name="FormatSheets" action="MenuFormatSheet">
+        <menuitem action="SheetReorder"/>
+        <menuitem action="SheetChangeName"/>
+        <separator/>
+        <menuitem action="SheetDisplayFormulas"/>
+        <menuitem action="SheetHideZeros"/>
+        <menuitem action="SheetHideGridlines"/>
+        <menuitem action="SheetHideColHeader"/>
+        <menuitem action="SheetHideRowHeader"/>
+      </menu>
+      <menuitem action="FormatAuto"/>
+    </menu>
+    <menu name="Tools" action="MenuTools">
+      <menuitem action="ToolsPlugins"/>
+      <separator name="tools-sep1"/>
+      <menuitem action="ToolsAutoCorrect"/>
+      <menuitem action="ToolsAutoSave"/>
+      <separator name="tools-sep2"/>
+      <menuitem action="ToolsGoalSeek"/>
+      <menuitem action="ToolsSolver"/>
+      <menu name="Scenarios" action="MenuToolsScenarios">
+        <menuitem action="ToolsScenarios"/>
+        <menuitem action="ToolsScenarioAdd"/>
+      </menu>
+      <menuitem action="ToolsSimulation"/>
+      <separator/>
+      <menu name="ToolStatisticalAnalysis" action="MenuToolStatisticalAnalysis">
+        <menu name="ANOVA" action="MenuANOVA">
+          <menuitem action="ToolsANOVAoneFactor"/>
+          <menuitem action="ToolsANOVAtwoFactor"/>
+        </menu>
+        <menuitem action="ToolsCorrelation"/>
+        <menuitem action="ToolsCovariance"/>
+        <menuitem action="ToolsDescStatistics"/>
+        <menu name="ToolForecast" action="MenuToolForecast">
+          <menuitem action="ToolsExpSmoothing"/>
+          <menuitem action="ToolsAverage"/>
+        </menu>
+        <menuitem action="ToolsFourier"/>
+        <menuitem action="ToolsHistogram"/>
+        <menuitem action="ToolsRanking"/>
+        <menuitem action="ToolsRegression"/>
+        <menuitem action="ToolsSampling"/>
+        <menu name="ToolTTest" action="MenuToolTTest">
+          <menuitem action="ToolTTestPaired"/>
+          <menuitem action="ToolTTestEqualVar"/>
+          <menuitem action="ToolTTestUnequalVar"/>
+          <menuitem action="ToolZTest"/>
+        </menu>
+        <menuitem action="ToolsFTest"/>
+      </menu>
+      <menuitem action="FormatWorkbook"/>
+      <menuitem action="FilePreferences"/>
+    </menu>
+    <menu name="Data" action="MenuData">
+      <menuitem action="DataSort"/>
+      <menu name="Filter" action="MenuFilter">
+        <menuitem action="DataAutoFilter"/>
+        <menuitem action="DataFilterShowAll"/>
+        <menuitem action="DataFilterAdvancedfilter"/>
+      </menu>
+      <menuitem action="DataValidate"/>
+      <separator/>
+      <menuitem action="DataTextToColumns"/>
+      <menuitem action="DataConsolidate"/>
+      <menu name="Outline" action="MenuOutline">
+        <menuitem action="DataOutlineHideDetail"/>
+        <menuitem action="DataOutlineShowDetail"/>
+        <menuitem action="DataOutlineGroup"/>
+        <menuitem action="DataOutlineUngroup"/>
+        <separator/>
+        <menuitem action="SheetDisplayOutlines"/>
+        <menuitem action="SheetOutlineBelow"/>
+        <menuitem action="SheetOutlineRight"/>
+      </menu>
+<!--
+	    <menuitem action="PivotTable" />
+	    -->
+      <menu name="ExternalData" action="MenuExternalData">
+        <menuitem action="DataImportText"/>
+      </menu>
+    </menu>
+    <menu name="Windows" action="MenuViewWindows">
+      <menuitem action="ViewNew"/>
+      <menuitem action="ViewFreezeThawPanes"/>
+      <separator/>
+    </menu>
+    <menu name="Help" action="MenuHelp">
+      <menuitem action="HelpDocs"/>
+      <menuitem action="HelpWeb"/>
+      <menuitem action="HelpIRC"/>
+      <menuitem action="HelpBug"/>
+      <separator/>
+      <menuitem action="HelpAbout"/>
+    </menu>
+  </menubar>
+  <toolbar _name="StandardToolbar">
+    <toolitem action="FileNew"/>
+    <toolitem action="FileOpen"/>
+    <toolitem action="FileSave"/>
+    <separator name="std-sep1"/>
+    <toolitem action="FilePrint"/>
+    <toolitem action="FilePrintPreview"/>
+    <separator name="std-sep2"/>
+    <toolitem action="EditCut"/>
+    <toolitem action="EditCopy"/>
+    <toolitem action="EditPaste"/>
+    <separator name="std-sep3"/>
+    <toolitem action="Undo"/>
+    <toolitem action="Redo"/>
+    <separator name="std-sep4"/>
+    <toolitem action="InsertHyperlink"/>
+    <toolitem action="AutoSum"/>
+    <toolitem action="InsertFormula"/>
+    <toolitem action="SortAscending"/>
+    <toolitem action="SortDescending"/>
+    <separator name="std-sep5"/>
+    <toolitem action="ChartGuru" />
+    <toolitem action="ViewZoomIn"/>
+    <toolitem action="Zoom"/>
+    <toolitem action="ViewZoomOut"/>
+  </toolbar>
+  <toolbar _name="FormatToolbar">
+    <toolitem action="FontName"/>
+    <toolitem action="FontSize"/>
+    <toolitem action="FontBold"/>
+    <toolitem action="FontItalic"/>
+    <toolitem action="FontUnderline"/>
+    <separator name="fmt-sep1"/>
+    <toolitem action="HAlignmentSelector"/>
+    <toolitem action="FormatMergeCells"/>
+    <toolitem action="FormatUnmergeCells"/>
+    <separator name="fmt-sep2"/>
+    <toolitem action="FormatAsAccounting"/>
+    <toolitem action="FormatAsPercentage"/>
+    <toolitem action="FormatWithThousands"/>
+    <toolitem action="FormatIncreasePrecision"/>
+    <toolitem action="FormatDecreasePrecision"/>
+    <separator name="fmt-sep3"/>
+    <toolitem action="FormatDecreaseIndent"/>
+    <toolitem action="FormatIncreaseIndent"/>
+    <separator name="fmt-sep4"/>
+    <toolitem action="BorderSelector"/>
+    <toolitem action="ColorBack"/>
+    <toolitem action="ColorFore"/>
+  </toolbar>
+
+  <accelerator name="CopyRight"		 action="CopyRight"/>
+  <accelerator name="CopyDown"		 action="CopyDown"/>
+  <accelerator name="FontBold"		 action="FontBold"/>
+  <accelerator name="FontItalic"	 action="FontItalic"/>
+  <accelerator name="FontUnderline"	 action="FontUnderline"/>
+  <accelerator name="FontDoubleUnderline" action="FontDoubleUnderline"/>
+  <accelerator name="FontStrikeThrough"  action="FontStrikeThrough"/>
+  <accelerator name="FormatAsNumber"	 action="FormatAsNumber"/>
+  <accelerator name="FormatAsCurrency"	 action="FormatAsCurrency"/>
+  <accelerator name="FormatAsAccounting" action="FormatAsAccounting"/>
+  <accelerator name="FormatAsPercentage" action="FormatAsPercentage"/>
+  <accelerator name="FormatAsScientific" action="FormatAsScientific"/>
+  <accelerator name="FormatAsDate"	 action="FormatAsDate"/>
+  <accelerator name="FormatAsTime"	 action="FormatAsTime"/>
+  <accelerator name="FormatAddBorders"	 action="FormatAddBorders"/>
+  <accelerator name="FormatClearBorders" action="FormatClearBorders"/>
+  <accelerator name="Repeat"		 action="Repeat"/>
+</ui>
--- src/Makefile.am~psion.patch	Sun Nov  7 07:00:09 2004
+++ src/Makefile.am	Fri Nov 12 00:03:11 2004
@@ -385,13 +385,13 @@
 
 # include conditional files to ensure everything gets distributed no matter
 # what the build
-EXTRA_DIST = GNOME_Gnumeric-gtk.xml.in				\
+EXTRA_DIST = GNOME_Gnumeric-psion.xml.in			\
 	    gnm-marshalers.list	                        	\
 	    main-application.c 					\
 	    main-component.c					\
 	    $(GNUMERIC_GNOME) README.gnm_float			\
 	    gnumeric-paths.sh.in ssconvert.c gnumeric.rc
-DISTCLEANFILES = GNOME_Gnumeric-gtk.xml
+DISTCLEANFILES = GNOME_Gnumeric-psion.xml
 
 #number_match_SOURCES = number-match.c  formats.c dates.c number-match-test.c
 
@@ -402,9 +402,9 @@
 #	$(INTLLIBS)
 
 gtkactiondir=$(gnumeric_datadir)
-gtkaction_DATA = GNOME_Gnumeric-gtk.xml
+gtkaction_DATA = GNOME_Gnumeric-psion.xml
 
-GNOME_Gnumeric-gtk.xml: GNOME_Gnumeric-gtk.xml.in
+GNOME_Gnumeric-psion.xml: GNOME_Gnumeric-psion.xml.in
 	sed -e 's/ _name *=/ name=/' <$<  >$@
 
 # Bonobo requires things to be in a subdir of this form