CWS-TOOLING: integrate CWS menuchanges

2009-01-07 17:12:18 +0100 mod  r265974 : throw out comment tracking accellerator
2009-01-07 16:23:35 +0100 mod  r265972 : CWS-TOOLING: rebase CWS menuchanges to trunk@265758 (milestone: DEV300:m38)
2008-12-03 16:21:15 +0100 mod  r264798 : menu shortcut fixes
2008-12-03 15:53:23 +0100 mod  r264794 : some shortcut changes
2008-12-02 13:35:56 +0100 fredrikh  r264696 : i96794
2008-12-01 20:09:07 +0100 fredrikh  r264633 : i96768
2008-12-01 20:08:37 +0100 fredrikh  r264632 : i96768
2008-12-01 16:40:18 +0100 fredrikh  r264619 : i96762
2008-12-01 16:37:37 +0100 fredrikh  r264618 : i96762
2008-12-01 16:37:09 +0100 fredrikh  r264617 : i96762
2008-12-01 13:14:43 +0100 fredrikh  r264595 : i90650
2008-11-28 18:26:38 +0100 fredrikh  r264569 : i94758
2008-11-28 18:22:31 +0100 fredrikh  r264568 : i94758
2008-11-28 12:46:26 +0100 fredrikh  r264541 : i94758
2008-11-26 16:58:51 +0100 fredrikh  r264423 : i96625
2008-11-26 16:14:10 +0100 fredrikh  r264412 : i96623
2008-11-26 16:13:02 +0100 fredrikh  r264410 : i96623
2008-11-25 19:46:42 +0100 fredrikh  r264330 : i96359
2008-11-25 13:50:34 +0100 fredrikh  r264307 : i96556
2008-11-25 13:49:46 +0100 fredrikh  r264306 : i96556
2008-11-25 13:48:32 +0100 fredrikh  r264305 : i96556
2008-11-25 13:46:55 +0100 fredrikh  r264304 : i96556
2008-11-25 13:45:29 +0100 fredrikh  r264303 : i96357
2008-11-25 13:42:11 +0100 fredrikh  r264302 : i96556 & i94758
2008-11-25 13:34:54 +0100 fredrikh  r264301 : i96556
2008-11-25 13:33:30 +0100 fredrikh  r264300 : i96556
2008-11-25 13:32:31 +0100 fredrikh  r264299 : i96556
2008-11-25 13:31:57 +0100 fredrikh  r264298 : i96556
2008-11-25 13:31:27 +0100 fredrikh  r264297 : i96556
2008-11-25 13:30:31 +0100 fredrikh  r264295 : i96556
2008-11-25 13:29:29 +0100 fredrikh  r264294 : i96556
2008-11-25 13:28:17 +0100 fredrikh  r264292 : i96556
2008-11-25 13:27:44 +0100 fredrikh  r264290 : i96556
2008-11-25 13:26:54 +0100 fredrikh  r264288 : i96556
2008-11-25 13:25:03 +0100 fredrikh  r264287 : i96556
2008-11-25 13:21:29 +0100 fredrikh  r264286 : i96556
2008-11-19 16:14:07 +0100 fredrikh  r264004 : i96359
2008-11-19 14:35:43 +0100 fredrikh  r263995 : i96353
2008-11-19 14:05:58 +0100 fredrikh  r263991 : i96347
2008-11-19 14:05:36 +0100 fredrikh  r263990 : i96347
2008-11-19 14:05:07 +0100 fredrikh  r263989 : i96347
2008-11-19 13:11:59 +0100 fredrikh  r263983 : i96347
2008-11-19 13:00:09 +0100 fredrikh  r263982 : i96347
2008-10-29 14:54:51 +0100 mod  r262804 : 94633
2008-10-29 14:54:10 +0100 mod  r262803 : #i94633#
2008-10-29 12:58:38 +0100 ufi  r262787 : i94958,3rd
2008-10-29 12:42:41 +0100 ufi  r262783 : i94958,2nd
2008-10-29 12:00:23 +0100 ufi  r262777 : i94958
2008-10-28 23:45:34 +0100 mod  r262766 : #i95457#
2008-10-18 19:09:38 +0200 mod  r262295 : accelerator change
2008-10-17 15:45:11 +0200 mod  r262289 : fix typo
2008-10-15 23:17:04 +0200 mod  r262245 : menu fix
2008-10-15 22:58:30 +0200 mod  r262244 : fix footnote setting dialog
2008-10-15 22:58:01 +0200 mod  r262243 : further changes to menu
2008-10-14 10:27:46 +0200 mod  r262195 : new accelerator and menu changes
2008-10-14 10:27:37 +0200 mod  r262194 : new accelerator and menu changes
2008-10-07 14:23:26 +0200 mod  r262081 : #i79329# #i85158# #i88351#
2008-10-02 10:31:52 +0200 mod  r262026 : #i94551#
2008-10-02 10:23:57 +0200 mod  r262025 : #i87347#

7 files changed, 53 insertions, 51 deletions

diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas
index c440bf88559b..bef4fe20088a 100755
--- a/testautomation/graphics/optional/g_navigator.bas
+++ b/testautomation/graphics/optional/g_navigator.bas
@@ -46,17 +46,17 @@ sub main
     Call hStatusIn ( "Graphics","g_navigator.bas")
 
     PrintLog "-------------------------" + gApplication + "-------------------"
-       Call tEditNavigatorZOrder
-       Call tdEditNavigator
-       Call tEditNavigatorGroupedObjects
-       Call tEditNavigatorNameActivated
+       Call tViewNavigatorZOrder
+       Call tdViewNavigator
+       Call tViewNavigatorGroupedObjects
+       Call tViewNavigatorNameActivated
 
     gApplication = "Draw"
     PrintLog "-------------------------" + gApplication + "-------------------"
-       Call tEditNavigatorZOrder
-       Call tdEditNavigator
-       Call tEditNavigatorGroupedObjects
-       Call tEditNavigatorNameActivated
+       Call tViewNavigatorZOrder
+       Call tdViewNavigator
+       Call tViewNavigatorGroupedObjects
+       Call tViewNavigatorNameActivated
 
     Call hStatusOut
 end sub
diff --git a/testautomation/graphics/optional/includes/global/g_navigator.inc b/testautomation/graphics/optional/includes/global/g_navigator.inc
index b1d846b81d6d..e33101ebdab0 100755
--- a/testautomation/graphics/optional/includes/global/g_navigator.inc
+++ b/testautomation/graphics/optional/includes/global/g_navigator.inc
@@ -36,13 +36,13 @@
 '* short description :
 '*
 '**************************************************************************************
-' #1 tdEditNavigator
-' #1 tEditNavigatorZOrder
-' #1 tEditNavigatorNameActivated
-' #1 tEditNavigatorGroupedObjects
+' #1 tdViewNavigator
+' #1 tViewNavigatorZOrder
+' #1 tViewNavigatorNameActivated
+' #1 tViewNavigatorGroupedObjects
 '\*************************************************************************************
 
-testcase tdEditNavigator
+testcase tdViewNavigator
     dim position1 as integer
     dim zaehler as integer
     dim Ueber_Text_1 as string
@@ -82,7 +82,7 @@ testcase tdEditNavigator
     Next Zaehler
 
     WaitSlot (1000)
-    EditNavigator                   '/// open navigator flyer ///'
+    ViewNavigator                   '/// open navigator flyer ///'
     Kontext "NavigatorDraw"
         if NavigatorDraw.exists (5) then printlog "OK"
             Erste.Click                     '/// jump to 1st slide ///'
@@ -136,11 +136,11 @@ testcase tdEditNavigator
                 WaitSlot (1000)
     '/// Close the document ///'
     Call hCloseDocument
-endcase   'tdEditNavigator
+endcase   'tdViewNavigator
 
 '--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-testcase tEditNavigatorZOrder
+testcase tViewNavigatorZOrder
     qaerrorlog "Not yet ready."
     goto endsub
     
@@ -299,11 +299,11 @@ testcase tEditNavigatorZOrder
 
     '/// Close the document ///'
     Call hCloseDocument
-endcase 'tEditNavigatorZOrder
+endcase 'tViewNavigatorZOrder
 
 '--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-testcase tEditNavigatorNameActivated
+testcase tViewNavigatorNameActivated
     qaerrorlog "Not yet ready."
     goto endsub
     dim zPosition1 as integer
@@ -322,11 +322,11 @@ testcase tEditNavigatorNameActivated
     '/// Open the Navigator ///'
     '/// Close the Navigator ///'
     '/// Close the document ///'
-endcase 'tEditNavigatorNameActivated
+endcase 'tViewNavigatorNameActivated
 
 '--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-testcase tEditNavigatorGroupedObjects
+testcase tViewNavigatorGroupedObjects
     qaerrorlog "Not yet ready."
     goto endsub
     dim zPosition1 as integer
@@ -346,6 +346,6 @@ testcase tEditNavigatorGroupedObjects
     '/// Open the Navigator ///'
     '/// Close the Navigator ///'
     '/// Close the document ///'
-endcase 'tEditNavigatorGroupedObjects
+endcase 'tViewNavigatorGroupedObjects
 
 '--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index d889fdfcb216..cf700cbd9632 100755
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -373,11 +373,11 @@ testcase tToolsMacro
     Bearbeiten.Click
     try
         sleep 1 ' this sleep is necessary. it takes some time, until focuse switched to basic window!
-        editnavigator
+        ViewNavigator
         kontext "NavigatorDraw"
         if NavigatorDraw.exists (5) then
             Warnlog "  - Edit macro does not work"
-            editnavigator
+            ViewNavigator
         endif
     catch
         hCloseDocument
diff --git a/testautomation/graphics/optional/includes/global/id_002.inc b/testautomation/graphics/optional/includes/global/id_002.inc
index 7742d56df334..0d8d040ab96e 100755
--- a/testautomation/graphics/optional/includes/global/id_002.inc
+++ b/testautomation/graphics/optional/includes/global/id_002.inc
@@ -41,7 +41,6 @@
 ' #1 tiEditCutPasteCopySelectall
 ' #1 tiEditPasteSpecial
 ' #1 tiEditSearchAndReplace
-' #1 tiEditNavigator
 ' #1 tiEditDuplicate
 ' #1 tiEditFields
 ' #1 tdEditDeleteSlide
@@ -181,30 +180,6 @@ testcase tiEditSearchAndReplace
     Call hCloseDocument
 endcase
 
-testcase tiEditNavigator
-    '/// open application ///'
-    Call hNewDocument
-
-    Kontext "NavigatorDraw"
-        '/// if 'Navigator' isn't already open, open it (Edit->Navigator)///'
-        if Not NavigatorDraw.Exists Then
-            EditNavigator
-        end if
-    Kontext "NavigatorDraw"
-        Call DialogTest ( NavigatorDraw )
-
-        try
-            Kontext "Navigator"
-                '/// close 'Navigator' ///'
-                Navigator.Close
-        catch
-            Errorlog "  Navigator wasn't closed, second try with Menu"
-            EditNavigator
-        endcatch
-    '/// close application ///'
-    Call hCloseDocument
-endcase
-
 testcase tiEditDuplicate
     '/// open application ///'
     Call hNewDocument
@@ -284,7 +259,7 @@ testcase tdEditDeleteSlide
         printlog "Navigator: open :-)"
     else
         printlog "Navigator: NOT available :-( Will be opened now!"
-        EditNavigator
+        ViewNavigator
     end if
     WaitSlot (2000)
     Kontext "NavigatorDraw"
diff --git a/testautomation/graphics/optional/includes/global/id_003.inc b/testautomation/graphics/optional/includes/global/id_003.inc
index cbd12ce7c203..9c8798b3aa77 100755
--- a/testautomation/graphics/optional/includes/global/id_003.inc
+++ b/testautomation/graphics/optional/includes/global/id_003.inc
@@ -36,6 +36,7 @@
 '* short description :
 '*
 '***********************************************************************************
+' #1 tiViewNavigator
 ' #1 tiViewZoom
 ' #1 tiViewToolbar
 ' #1 tiViewDisplayQuality
@@ -44,6 +45,32 @@
 ' #1 tViewGrid
 '\**********************************************************************************
 
+testcase tiViewNavigator
+    '/// open application ///'
+    Call hNewDocument
+
+    Kontext "NavigatorDraw"
+        '/// if 'Navigator' isn't already open, open it (View->Navigator)///'
+        if Not NavigatorDraw.Exists Then
+            ViewNavigator
+        end if
+    Kontext "NavigatorDraw"
+        Call DialogTest ( NavigatorDraw )
+
+        try
+            Kontext "Navigator"
+                '/// close 'Navigator' ///'
+                Navigator.Close
+        catch
+            Errorlog "  Navigator wasn't closed, second try with Menu"
+            ViewNavigator
+        endcatch
+    '/// close application ///'
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
 testcase tiViewZoom
 '/// open application ///'
    Call  hNewDocument
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc
index 16b99582692d..77b4be07f510 100755
--- a/testautomation/graphics/optional/includes/impress/i_pengine.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc
@@ -234,7 +234,7 @@ testcase tSlideShowInteraction
       warnlog "Navigator: already open :-("
    else
       printlog "Navigator: NOT available :-( will be opened now!"
-      EditNavigator
+      ViewNavigator
    endif
    sleep 3
 
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
index 1419862ccf22..5d37b2e53132 100755
--- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
@@ -442,7 +442,7 @@ testcase tSlideShowInteraction
       printlog "Navigator: NOT available :-) will be opened now."
       Kontext "DocumentImpress"
       DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"
-'      EditNavigator
+'      ViewNavigator
    endif
    sleep 3