Expose VikSlippyMapSource's private fields as properties

[andy/viking.git] / src / menu.xml.h

diff --git a/src/menu.xml.h b/src/menu.xml.h
index d385f1f4856f1d5491e75800d8692c63c5f12556..d9cf08fc46ef27fd2ba0ceb0aa389d24904a7bd6 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -21,7 +21,9 @@ static const char *menu_xml =
        "      <separator/>"
        "      <menuitem action='GenImg'/>"
        "      <menuitem action='GenImgDir'/>"
        "      <separator/>"
        "      <menuitem action='GenImg'/>"
        "      <menuitem action='GenImgDir'/>"

+#if GTK_CHECK_VERSION(2,10,0)

        "      <menuitem action='Print'/>"
        "      <menuitem action='Print'/>"

+#endif

        "      <separator/>"
        "      <menuitem action='SaveExit'/>"
        "      <menuitem action='Exit'/>"
        "      <separator/>"
        "      <menuitem action='SaveExit'/>"
        "      <menuitem action='Exit'/>"


@@ -32,25 +34,25 @@ static const char *menu_xml =
        "      <menuitem action='Paste'/>"
        "      <menuitem action='Delete'/>"
        "      <menuitem action='DeleteAll'/>"
        "      <menuitem action='Paste'/>"
        "      <menuitem action='Delete'/>"
        "      <menuitem action='DeleteAll'/>"

+       "      <separator/>"
+       "      <menuitem action='Preferences'/>"

        "    </menu>"
        "    <menu action='View'>"
        "      <menuitem action='ModeUTM'/>"
 #ifdef VIK_CONFIG_EXPEDIA
        "      <menuitem action='ModeExpedia'/>"
        "    </menu>"
        "    <menu action='View'>"
        "      <menuitem action='ModeUTM'/>"
 #ifdef VIK_CONFIG_EXPEDIA
        "      <menuitem action='ModeExpedia'/>"

-#endif
-#ifdef VIK_CONFIG_OLD_GOOGLE
-       "      <menuitem action='ModeGoogle'/>"
-       "      <menuitem action='ModeKH'/>"

 #endif
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"
 #endif
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"

-       "      <menuitem action='GoogleMapsSearch'/>"
+       "      <menuitem action='GotoSearch'/>"

        "      <menuitem action='GotoLL'/>"
        "      <menuitem action='GotoUTM'/>"
        "      <separator/>"
        "      <menuitem action='ShowScale'/>"
        "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"
        "      <menuitem action='GotoLL'/>"
        "      <menuitem action='GotoUTM'/>"
        "      <separator/>"
        "      <menuitem action='ShowScale'/>"
        "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"

+       "      <menuitem action='FullScreen'/>"
+       "      <menuitem action='ViewSidePanel'/>"

        "      <separator/>"
        "      <menuitem action='ZoomIn'/>"
        "      <menuitem action='ZoomOut'/>"
        "      <separator/>"
        "      <menuitem action='ZoomIn'/>"
        "      <menuitem action='ZoomOut'/>"


@@ -81,6 +83,8 @@ static const char *menu_xml =
        "      <separator/>"
        "    </menu>"
        "    <menu action='Tools'>"
        "      <separator/>"
        "    </menu>"
        "    <menu action='Tools'>"

+       "      <menu action='Exttools'/>"
+       "      <menuitem action='Pan'/>"

        "      <menuitem action='Zoom'/>"
        "      <menuitem action='Ruler'/>"
        "    </menu>"
        "      <menuitem action='Zoom'/>"
        "      <menuitem action='Ruler'/>"
        "    </menu>"


@@ -93,22 +97,23 @@ static const char *menu_xml =
        "      <toolitem name='New' action='New'/>"
        "      <toolitem name='Open' action='Open'/>"
        "      <toolitem name='Save' action='Save'/>"
        "      <toolitem name='New' action='New'/>"
        "      <toolitem name='Open' action='Open'/>"
        "      <toolitem name='Save' action='Save'/>"

+#if GTK_CHECK_VERSION(2,10,0)

        "      <toolitem name='Print' action='Print'/>"
        "      <toolitem name='Print' action='Print'/>"

+#endif

        "      <toolitem name='Exit' action='Exit'/>"
        "      <separator/>"
        "    </placeholder>"
        "      <toolitem name='Exit' action='Exit'/>"
        "      <separator/>"
        "    </placeholder>"

-       "    <placeholder name='EditToolItems'>"
-       "      <toolitem name='Cut' action='Cut'/>"
-       "      <toolitem name='Copy' action='Copy'/>"
-       "      <toolitem name='Paste' action='Paste'/>"
-       "      <toolitem name='Delete' action='Delete'/>"
+       "    <placeholder name='UIToolItems'>"
+       "      <toolitem action='FullScreen'/>"
+       "      <toolitem action='ViewSidePanel'/>"

        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ViewToolItems'>"
        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ViewToolItems'>"

-       "      <toolitem action='GoogleMapsSearch'/>"
+       "      <toolitem action='GotoSearch'/>"

        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ToolItems'>"
        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ToolItems'>"

+       "    <toolitem action='Pan'/>"

        "    <toolitem action='Zoom'/>"
        "    <toolitem action='Ruler'/>"
        "    </placeholder>"
        "    <toolitem action='Zoom'/>"
        "    <toolitem action='Ruler'/>"
        "    </placeholder>"