[giv] Fixed top and popup menus.

[Dov Grobgeld <dov src gnome org>]

commit 04ce552df1429edff02400e730e4fa28887ea05f
Author: Dov Grobgeld <dov grobgeld gmail com>
Date:   Sun Jun 10 11:39:14 2012 +0300

    Fixed top and popup menus.
    
    * Made menus equal.
    * Removed entries that don't work (open window/close window).
    * Restored the View Menubar entry to toggle the top entry.

 src/menu-popup.xml |   15 ++++++++++++---
 src/menu-top.xml   |    4 +---
 2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/src/menu-popup.xml b/src/menu-popup.xml
index 2bf2d58..6212cc2 100644
--- a/src/menu-popup.xml
+++ b/src/menu-popup.xml
@@ -4,20 +4,22 @@
     <menu name="FileMenu" action="FileMenuAction">
       <menuitem name="Open" action="OpenAction" />
       <menuitem name="Export" action="ExportAction" />
-      <menuitem name="NewWindow" action="NewWindowAction" />
-      <menuitem name="CloseWindow" action="CloseWindowAction" />
-      <menuitem name="ClearAction" action="ClearAction" />
       <menuitem name="Print" action="PrintAction" />
       <menuitem name="Preferences" action="PreferencesAction" />
       <menuitem name="Quit" action="QuitAction" />
     </menu>
     <menu name="ViewMenu" action="ViewMenuAction">
+      <menuitem name="MenuBar" action="ViewMenuBarAction" />
       <menuitem name="Marks" action="ViewMarksAction" />
       <menuitem name="Sub-pixel" action="ViewSubPixelAction" />
       <menuitem name="Balloons" action="ViewBalloonAction" />
       <menuitem name="HorizontalFlip" action="ViewHorizontalFlip" />
       <menuitem name="VerticalFlip" action="ViewVerticalFlip" />
+      <menuitem name="Pixel-grid" action="ViewPixelGrid" />
+      <menuitem name="ColorMapBar" action="ViewColorMap" />
       <menuitem name="AutoResize" action="AutoResize" />
+      <menuitem name="AutoContrast" action="AutoContrast" />
+      <menuitem name="AutoReload" action="AutoReload" />
       <menu name="ColorTableMenu" action="ColorTableMenuAction">
         <menuitem name="PseudoColorOff" action="PseudoColorNone" />
         <menuitem name="PseudoColorInvert" action="PseudoColorInvert" />
@@ -29,14 +31,21 @@
         <menuitem name="PseudoColorBGRY" action="PseudoColorBGRY" />
         <menuitem name="PseudoColorGRBW" action="PseudoColorGRBW" />
       </menu>
+      <menuitem name="Fill" action="FillAction" />
+      <menuitem name="ShrinkWrap" action="ShrinkWrapAction" />
     </menu>
     <menu name="ToolMenu" action="ToolMenuAction">
       <menuitem name="MarkBrowser" action="ToolMarkBrowserAction" />
+      <menuitem name="Contrast" action="ToolContrast" />
       <menuitem name="Info" action="ToolInfoAction" />
+      <menuitem name="Calibrate" action="ToolCalibrateAction" />
       <menuitem name="MeasureDistance" action="ToolMeasureDistanceAction" />
       <menuitem name="QuiverZoom" action="ToolQuiverZoomAction" />
+      <menuitem name="CountMarks" action="ToolCountMarks" />
     </menu>
     <menu name="Help" action="HelpMenuAction" position="bot">
+      <menuitem name="Copyright" action="CopyrightAction" />
+      <menuitem name="Manual" action="ManualAction" />
       <menuitem name="About" action="AboutAction" />
     </menu>
   </popup>
diff --git a/src/menu-top.xml b/src/menu-top.xml
index 5636d26..02595e8 100644
--- a/src/menu-top.xml
+++ b/src/menu-top.xml
@@ -3,14 +3,12 @@
     <menu name="FileMenu" action="FileMenuAction">
       <menuitem name="Open" action="OpenAction" />
       <menuitem name="Export" action="ExportAction" />
-      <menuitem name="NewWindow" action="NewWindowAction" />
-      <menuitem name="CloseWindow" action="CloseWindowAction" />
-      <menuitem name="ClearAction" action="ClearAction" />
       <menuitem name="Print" action="PrintAction" />
       <menuitem name="Preferences" action="PreferencesAction" />
       <menuitem name="Quit" action="QuitAction" />
     </menu>
     <menu name="ViewMenu" action="ViewMenuAction">
+      <menuitem name="MenuBar" action="ViewMenuBarAction" />
       <menuitem name="Marks" action="ViewMarksAction" />
       <menuitem name="Sub-pixel" action="ViewSubPixelAction" />
       <menuitem name="Balloons" action="ViewBalloonAction" />