CWS-TOOLING: integrate CWS aw075

2009-08-12 18:26:05 +0200 aw  r274912 : #i97672# use SelectionMaximumLuminancePercent to limit the hilight color to be not too invisible
2009-08-12 18:25:53 +0200 aw  r274911 : #i97672# use SelectionMaximumLuminancePercent to limit the hilight color to be not too invisible
2009-08-12 18:25:20 +0200 aw  r274910 : #i97672# Added SelectionMaximumLuminancePercent to decide which maximum luminance for the selection color to accept from the system
2009-08-12 18:00:17 +0200 aw  r274908 : #i97672# added SelectionMaximumLuminancePercent which limits the luminance of the system's selection color to a maximum luminance (default is 70)
2009-08-11 14:01:07 +0200 aw  r274859 : #i104150# take over values from transparence percent field even when disabled
2009-08-11 13:59:33 +0200 aw  r274858 : #i103500# corrected the transparent SC overlay pixel alignment
2009-08-11 12:42:46 +0200 jsk  r274854 : #i103937# Added two new controls to options/view page for transparency and opacity
2009-08-10 16:20:02 +0200 aw  r274823 : #i97672# Adapting MF_SELECTION to #i35956#
2009-08-04 17:50:42 +0200 aw  r274626 : #i102109# need to use AlphaMask instead of Bitmap
2009-08-04 17:03:25 +0200 aw  r274624 : #i103982# corrected OutlinerParaObject owvership in GetBackgroundTextForwarder()
2009-08-04 12:18:11 +0200 aw  r274614 : #i97672# corrected warning due to member initialisation
2009-08-03 11:54:16 +0200 aw  r274571 : #i99268# corrected SdrExchangeView::GetObjGraphic
2009-07-31 14:22:57 +0200 aw  r274529 : #i101520# added support for not correct 3d polygons for 3D polygon object which is used over API from chart directly
2009-07-31 13:25:20 +0200 aw  r274527 : #i97672# added disabling selection options when system does not support them; slightly corrected positions
2009-07-31 13:20:32 +0200 aw  r274526 : #i102706# Do not merge closed polygons when converting MetaFiles to SdrObjects
2009-07-30 18:03:07 +0200 aw  r274499 : #i102175# corrected 1870 degree rotation situation for MetaFile paints
2009-07-30 17:06:31 +0200 aw  r274496 : #i103709# corrected HitTest for callouts and DrawingLayer text objects
2009-07-29 18:55:22 +0200 aw  r274465 : #i102956# corrected CutFindProcessor to back-transform all found cuts to the starting 3D coordinate system
2009-07-29 13:38:40 +0200 aw  r274448 : #i103720# corrected mpAsynchLoadEvent usage
2009-07-29 12:48:12 +0200 aw  r274447 : #i96762# cleanup: spaces
2009-07-28 19:11:31 +0200 aw  r274427 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:09:39 +0200 aw  r274425 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:09:27 +0200 aw  r274424 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:09:14 +0200 aw  r274423 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:08:59 +0200 aw  r274422 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 19:08:47 +0200 aw  r274421 : #97672# first version of reworked selection with changeable transparency and frame
2009-07-28 15:44:50 +0200 aw  r274411 : #i102556# corrected TextLayouterDevice::getTextBoundRect implementation and usage; empty Rectangles were not handled correctly
2009-07-23 17:48:36 +0200 aw  r274277 : #i102063# implemented in-between OLE content holder (SdrOleContentPrimitive2D) and it's decomposition. Cleaned up diverse OLE graphic preparations
2009-07-22 12:55:12 +0200 aw  r274227 : #i102109# extended OutputDevice::DrawTransparent (the version with TransparenceGradient) to work correctly with AntiAliased content
2009-07-21 13:31:12 +0200 aw  r274191 : #i102611# changed scaling of Z-Range for Z-Buffer for ZBufferProcessor3D
2009-07-20 20:06:46 +0200 aw  r274155 : #i103500# moved OverlayObjectCell back to use discrete coordinates for rectangle list
2009-07-16 17:33:26 +0200 aw  r274065 : #i103530# corrected parameter preparation for MetaFile::Rotate call

4 files changed, 36 insertions, 2 deletions

diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc
index 3949625529fd..6cd38ac5396e 100755
--- a/testautomation/framework/optional/includes/options_ooo_view.inc
+++ b/testautomation/framework/optional/includes/options_ooo_view.inc
@@ -136,11 +136,27 @@ sub checkPage( sFile as string , bDisabled as boolean, optional iMiddleMouseButt
             iTemp = 2 ' Automatic scrolling
         endif
         if Itemp = iMiddleMouseButton then
-            printlog "      * Middle mouse button: OK"
+            printlog "     * Middle mouse button: ok"
         else
-            warnlog "Middle mouse button: expected: '" + iTemp + "' '" + MausAktion.getItemText(iTemp) + "'; is: '" + iMiddleMouseButton + "' '" + MausAktion.getItemText(iMiddleMouseButton) + "'"
+            warnlog "Middle mouse button: expected: '" + iTemp + "' '" _
+                    + MausAktion.getItemText(iTemp) + "'; is: '" _
+                    + iMiddleMouseButton + "' '" _
+                    + MausAktion.getItemText(iMiddleMouseButton) + "'"
         endif
     endif
+    
+    if ( Transparency.isEnabled() ) then
+        if ( Transparency.isChecked() ) then
+            checkCheckBox( sFile , "*" , transparency )
+            checkEntryField( sFile , "*", selectionopacity )
+        else
+            Transparency.check()
+            checkEntryField( sFile , "*", selectionopacity, "i104150" )
+            Transparency.unCheck()
+        endif
+    else
+        printlog( "Transparency is not available on this system" )
+    endif
 
     Kontext "OptionenDLG"
     OptionenDLG.OK
@@ -205,6 +221,18 @@ sub changePage( sFile as string , bInverted as boolean, optional iMiddleMouseBut
             MausAktion.select(2) ' Automatic scrolling
         endif
     endif
+    
+    if ( Transparency.isEnabled() ) then
+        if ( Transparency.isChecked() ) then
+            setEntryField( sFile , "*", selectionopacity )
+            setCheckBox( sFile , "*" , transparency )
+        else
+            setCheckBox( sFile , "*" , transparency )
+            setEntryField( sFile , "*", selectionopacity )
+        endif        
+    else
+        printlog( "Transparency is not available on this system" )
+    endif
 
     Kontext "OptionenDLG"
     OptionenDLG.OK
diff --git a/testautomation/framework/optional/input/options/ooo_view_changed.ref b/testautomation/framework/optional/input/options/ooo_view_changed.ref
index 8cd60a485def..3ef98848078f 100755
--- a/testautomation/framework/optional/input/options/ooo_view_changed.ref
+++ b/testautomation/framework/optional/input/options/ooo_view_changed.ref
@@ -15,4 +15,6 @@ UseHardwareAcceleration=checked
 useantialiasing=unchecked
 mousepositioning=2
 mausaktion=1
+transparency=unchecked
+selectionopacity=10%
 
diff --git a/testautomation/framework/optional/input/options/ooo_view_defaults.ref b/testautomation/framework/optional/input/options/ooo_view_defaults.ref
index 83715feb11d8..f56b0062e4bf 100755
--- a/testautomation/framework/optional/input/options/ooo_view_defaults.ref
+++ b/testautomation/framework/optional/input/options/ooo_view_defaults.ref
@@ -14,4 +14,6 @@ useantialiasing=checked
 usehardwareacceleration=disabled
 mousepositioning=3
 mausaktion=2
+transparency=checked
+selectionopacity=75%
 
diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win
index d97b2423c1e1..fbcba2599a74 100755
--- a/testautomation/global/win/tab_a_d.win
+++ b/testautomation/global/win/tab_a_d.win
@@ -58,6 +58,8 @@ IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
 MausAktion svx:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE
 MousePositioning svx:ListBox:OFA_TP_VIEW:LB_MOUSEPOS
 UseSystemFont svx:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT
+Transparency svx:CheckBox:OFA_TP_VIEW:CB_SELECTION
+SelectionOpacity svx:MetricField:OFA_TP_VIEW:MF_SELECTION
 
 *TabAusnahmen HID_OFAPAGE_AUTOCORR_EXCEPT
 Abkuerzungen svx:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV