summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Dywan <christian.dywan@lanedo.com>2011-05-18 16:06:52 +0200
committerChristian Dywan <christian.dywan@lanedo.com>2011-05-18 16:06:52 +0200
commit9b9f98913c056daae31679558a8a06c4e3e4ead4 (patch)
treeac6712cf0aba091db13add4226431b7f816bad9a
parenta24895b3d115b4870df054db217d2de5fb1bb107 (diff)
Unify Display Grid/ Grid Visible and other menu items
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_draw.txt2
-rwxr-xr-xtestautomation/framework/optional/input/menu/en-us_impress.txt2
-rw-r--r--testautomation/global/tools/includes/optional/t_toolbar_writer.inc4
-rw-r--r--testautomation/graphics/required/includes/global/id_005.inc12
-rw-r--r--testautomation/graphics/required/includes/global/id_opt_1.inc12
5 files changed, 16 insertions, 16 deletions
diff --git a/testautomation/framework/optional/input/menu/en-us_draw.txt b/testautomation/framework/optional/input/menu/en-us_draw.txt
index 7334e2e107b6..7d1310247b8b 100755
--- a/testautomation/framework/optional/input/menu/en-us_draw.txt
+++ b/testautomation/framework/optional/input/menu/en-us_draw.txt
@@ -64,7 +64,7 @@ Status ~Bar
Input M~ethod Status
~Ruler
Gr~id
-~Guides
+~Snap Lines
~Zoom...
********** ~Insert
diff --git a/testautomation/framework/optional/input/menu/en-us_impress.txt b/testautomation/framework/optional/input/menu/en-us_impress.txt
index fdd773ab4b3c..f992eca1f585 100755
--- a/testautomation/framework/optional/input/menu/en-us_impress.txt
+++ b/testautomation/framework/optional/input/menu/en-us_impress.txt
@@ -69,7 +69,7 @@ Status ~Bar
Input M~ethod Status
~Ruler
Gr~id
-~Guides
+~Snap Lines
~Header and Footer...
~Zoom...
diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
index 892dbd09bb36..f1c4c96a3fca 100644
--- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
+++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
@@ -217,7 +217,7 @@ function fGetObjectWriter(sToolbar as String , sObject as String) as Integer
case "Object rotation mode" : fGetObjectWriter = 14
case "Display Grid" : fGetObjectWriter = 15
case "Snap to Grid" : fGetObjectWriter = 16
- case "Guides When Moving" : fGetObjectWriter = 17
+ case "Helplines While Moving" : fGetObjectWriter = 17
'----------------- 18
case "Wrap Off" : fGetObjectWriter = 19
case "Page Wrap" : fGetObjectWriter = 20
@@ -582,7 +582,7 @@ function fGetObjectCalc(sToolbar as String , sObject as String) as Integer
Select case sObject
case "Display Grid" : fGetObjectCalc = 21
case "Snap to Grid" : fGetObjectCalc = 22
- case "Guides When Moving" : fGetObjectCalc = 23
+ case "Helplines While Moving" : fGetObjectCalc = 23
case else : QAErrorLog "The test does not support Object : " + sObject
fGetObjectCalc = 0
end select
diff --git a/testautomation/graphics/required/includes/global/id_005.inc b/testautomation/graphics/required/includes/global/id_005.inc
index cba38479f34b..f663674e2731 100644
--- a/testautomation/graphics/required/includes/global/id_005.inc
+++ b/testautomation/graphics/required/includes/global/id_005.inc
@@ -699,10 +699,10 @@ testcase tiFormatCaseCharacter
printlog "move curser 1 time to the left"
hTypeKeys "<left>"
- printlog "Format->Case/Characters->Uppercase"
+ printlog "Format->~Change Case->Uppercase"
FormatChangeCaseUpper
WaitSlot (1000)
- printlog "Format->Case/Characters->Lowercase"
+ printlog "Format->~Change Case->Lowercase"
FormatChangeCaseLower
WaitSlot (2000)
if bAsianLan then
@@ -711,28 +711,28 @@ testcase tiFormatCaseCharacter
end if
printlog "if asian language (81/82/86/88):"
try
- printlog "+ Format->Case/Characters->Half-width"
+ printlog "+ Format->~Change Case->Half-width"
FormatChangeCaseHalfWidth
catch
Warnlog "Format / Change Case / Half Width does not work."
endcatch
WaitSlot (1000)
try
- printlog "+ Format->Case/Characters->Full-width"
+ printlog "+ Format->~Change Case->Full-width"
FormatChangeCaseFullWidth
catch
Warnlog "Format / Change Case / Full Width does not work!"
endcatch
sleep 1
try
- printlog "+ Format->Case/Characters->Hiragana"
+ printlog "+ Format->~Change Case->Hiragana"
FormatChangeCaseHiragana
catch
Warnlog "Format / Change Case / Hiragana does not work."
endcatch
sleep 1
try
- printlog "+ Format->Case/Characters->Katatana"
+ printlog "+ Format->~Change Case->Katatana"
FormatChangeCaseKatagana
catch
Warnlog "Format / Change Case / Katagana does not work."
diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc
index 35874fe0495f..6c92749c5aa9 100644
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -422,7 +422,7 @@ testcase tToolsOptionsDrawView (sApplication as string)
hToolsOptions (sApplication,"View")
If LinealeSichtbar.IsChecked Then WarnLog "Rulers Visible x"
- If HilfslinienBeimBewegen.IsChecked Then WarnLog "Guides When Moving x"
+ If HilfslinienBeimBewegen.IsChecked Then WarnLog "Helplines While Moving x"
If KontrolpunkteImBezierEditor.IsChecked Then WarnLog "'All Control Points In B�zier Editor' x"
If KonturFuerIndividuelleObjekte.IsChecked Then WarnLog "'Contour of Each Individual Object' x"
@@ -441,7 +441,7 @@ testcase tToolsOptionsDrawView (sApplication as string)
hToolsOptions (sApplication,"View")
If True <> LinealeSichtbar.IsChecked Then WarnLog "Rulers Visible o"
- If True <> HilfslinienBeimBewegen.IsChecked Then WarnLog "Guides When Moving o"
+ If True <> HilfslinienBeimBewegen.IsChecked Then WarnLog "Helplines While Moving o"
If True <> KontrolpunkteImBezierEditor.IsChecked Then WarnLog "'All Control Points In B�zier Editor' o"
If True <> KonturFuerIndividuelleObjekte.IsChecked Then WarnLog "'Contour of Each Individual Object' o"
@@ -561,7 +561,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
hToolsOptions (sApplication,"Grid")
If ( irgendwas(1) = FangrasterBenutzen.IsChecked ) Then WarnLog "Snap to Grid state changed"
- If ( irgendwas(2) = RasterSichtbar.IsChecked ) Then WarnLog "Visible Grid state changed"
+ If ( irgendwas(2) = RasterSichtbar.IsChecked ) Then WarnLog "Display Grid state changed"
' If ( irgendwas(3) = AchsenSynchronisieren.IsChecked ) Then WarnLog "Synchronize Axes state changed"
if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "Synchronize Axes state changed"
@@ -638,7 +638,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
hToolsOptions (sApplication,"Grid")
If FangrasterBenutzen.IsChecked Then WarnLog "Snap to Grid x"
- If RasterSichtbar.IsChecked Then WarnLog "Visible Grid x"
+ If RasterSichtbar.IsChecked Then WarnLog "Display Grid x"
If AchsenSynchronisieren.IsChecked Then WarnLog "Synchronize Axes x"
@@ -702,7 +702,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
hToolsOptions (sApplication,"Grid")
If True <> FangrasterBenutzen.IsChecked Then WarnLog "Snap to Grid o"
- If True <> RasterSichtbar.IsChecked Then WarnLog "Visible Grid o"
+ If True <> RasterSichtbar.IsChecked Then WarnLog "Display Grid o"
If True <> AchsenSynchronisieren.IsChecked Then WarnLog "Synchronize Axes o"
@@ -1044,4 +1044,4 @@ testcase tToolsOptionsDrawPrint (sApplication as string)
ExtrasOptionenDlg.OK
hCloseDocument
-endcase 'tToolsOptionsDrawPrint \ No newline at end of file
+endcase 'tToolsOptionsDrawPrint