You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/03/05 13:17:10 UTC

svn commit: r1452760 [2/5] - in /openoffice/branches/sidebar/main: default_images/sfx2/res/symphony/ officecfg/registry/data/org/openoffice/Office/UI/ sd/source/ui/sidebar/ sfx2/inc/sfx2/sidebar/ sfx2/source/sidebar/ svx/ svx/inc/sidebar/ svx/inc/svx/s...

Added: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.hxx Tue Mar  5 12:17:09 2013
@@ -0,0 +1,215 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#ifndef SVX_PROPERTYPANEL_AREAPAGE_HXX
+#define SVX_PROPERTYPANEL_AREAPAGE_HXX
+
+#include "sidebar/ColorPopup.hxx"
+#include "AreaTransparencyGradientPopup.hxx"
+#include <vcl/ctrl.hxx>
+#include <sfx2/sidebar/SidebarPanelBase.hxx>
+#include <sfx2/sidebar/ControllerItem.hxx>
+#include <svx/xgrad.hxx>
+#include <svx/itemwin.hxx>
+#include <svx/xfillit0.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/drawitem.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
+#include <svl/intitem.hxx>
+#include <svx/tbxcolorupdate.hxx>
+#include <com/sun/star/ui/XUIElement.hpp>
+#include <boost/scoped_ptr.hpp>
+
+
+class XFillFloatTransparenceItem;
+namespace svx { class ToolboxButtonColorUpdater; }
+
+
+namespace svx { namespace sidebar {
+
+class PopupContainer;
+class AreaTransparencyGradientControl;
+
+class AreaPropertyPanel
+:   public Control,
+    public ::sfx2::sidebar::SidebarPanelBase::ContextChangeReceiverInterface,
+    public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
+{
+public:
+    static AreaPropertyPanel* Create(
+        Window* pParent,
+        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        SfxBindings* pBindings);
+
+    virtual void DataChanged(
+        const DataChangedEvent& rEvent);
+
+    virtual void HandleContextChange(
+        const ::sfx2::sidebar::EnumContext aContext);
+
+    virtual void NotifyItemUpdate(
+        const sal_uInt16 nSId,
+        const SfxItemState eState,
+        const SfxPoolItem* pState);
+
+    SfxBindings* GetBindings();
+    void ShowMenu (void);
+
+    const static sal_Int32 DEFAULT_CENTERX;
+    const static sal_Int32 DEFAULT_CENTERY;
+    const static sal_Int32 DEFAULT_ANGLE;
+    const static sal_Int32 DEFAULT_STARTVALUE;
+    const static sal_Int32 DEFAULT_ENDVALUE;
+    const static sal_Int32 DEFAULT_BORDER;
+
+    XGradient GetGradient (const XGradientStyle eStyle) const;
+    void SetGradient (const XGradient& rGradient);
+    sal_Int32 GetSelectedTransparencyTypeIndex (void) const;
+
+private:
+    sal_uInt16                                          meLastXFS;
+    Color                                               maLastColor;
+
+    sal_uInt16                                          mnLastPosGradient;
+    sal_uInt16                                          mnLastPosHatch;
+    sal_uInt16                                          mnLastPosBitmap;
+    sal_uInt16                                          mnLastTransSolid;
+
+    XGradient                                           maGradientLinear;
+    XGradient                                           maGradientAxial;
+    XGradient                                           maGradientRadial;
+    XGradient                                           maGradientElliptical;
+    XGradient                                           maGradientSquare;
+    XGradient                                           maGradientRect;
+
+    //ui controls
+    ::boost::scoped_ptr< FixedText >                    mpColorTextFT;
+    ::boost::scoped_ptr< SvxFillTypeBox >               mpLbFillType;
+    ::boost::scoped_ptr< SvxFillAttrBox >               mpLbFillAttr;
+    ::boost::scoped_ptr< Window >                       mpToolBoxColorBackground;
+    ::boost::scoped_ptr< ToolBox >                      mpToolBoxColor; // for new color picker
+    ::boost::scoped_ptr< FixedText >                    mpTrspTextFT;
+    ::boost::scoped_ptr< ListBox >                      mpLBTransType;
+    ::boost::scoped_ptr< MetricField >                  mpMTRTransparent;
+    ::boost::scoped_ptr< Window >                       mpBTNGradientBackground;
+    ::boost::scoped_ptr< ToolBox >                      mpBTNGradient;
+
+    ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
+
+    ::boost::scoped_ptr< XFillStyleItem >               mpStyleItem;
+    ::boost::scoped_ptr< XFillColorItem >               mpColorItem;
+    ::boost::scoped_ptr< XFillGradientItem >            mpFillGradientItem;
+    ::boost::scoped_ptr< XFillHatchItem >               mpHatchItem;
+    ::boost::scoped_ptr< XFillBitmapItem >              mpBitmapItem;
+    ::boost::scoped_ptr< SvxColorTableItem >            mpColorTableItem;
+    ::boost::scoped_ptr< SvxGradientListItem >          mpGradientListItem;
+    ::boost::scoped_ptr< SvxHatchListItem >             mpHatchListItem;
+    ::boost::scoped_ptr< SvxBitmapListItem >            mpBitmapListItem;
+
+    ::sfx2::sidebar::ControllerItem                     maStyleControl;
+    ::sfx2::sidebar::ControllerItem                     maColorControl;
+    ::sfx2::sidebar::ControllerItem                     maGradientControl;
+    ::sfx2::sidebar::ControllerItem                     maHatchControl;
+    ::sfx2::sidebar::ControllerItem                     maBitmapControl;
+    ::sfx2::sidebar::ControllerItem                     maColorTableControl;
+    ::sfx2::sidebar::ControllerItem                     maGradientListControl;
+    ::sfx2::sidebar::ControllerItem                     maHatchListControl;
+    ::sfx2::sidebar::ControllerItem                     maBitmapListControl;
+    ::sfx2::sidebar::ControllerItem                     maFillTransparenceController;
+    ::sfx2::sidebar::ControllerItem                     maFillFloatTransparenceController;
+
+    Image                                               maImgAxial;
+    Image                                               maImgElli;
+    Image                                               maImgQuad;
+    Image                                               maImgRadial;
+    Image                                               maImgSquare;
+    Image                                               maImgLinear;
+    Image                                               maImgColor;
+
+    //for high contract
+    Image                                               maImgAxialH;
+    Image                                               maImgElliH;
+    Image                                               maImgQuadH;
+    Image                                               maImgRadialH;
+    Image                                               maImgSquareH;
+    Image                                               maImgLinearH;
+    Image                                               maImgColorH;
+
+    String                                              msHelpFillType;
+    String                                              msHelpFillAttr;
+
+    AreaTransparencyGradientPopup maTrGrPopup;
+    ColorPopup maColorPopup; 
+
+    ::boost::scoped_ptr< XFillFloatTransparenceItem >   mpFloatTransparenceItem;
+    ::boost::scoped_ptr< SfxUInt16Item >                mpTransparanceItem;
+
+    cssu::Reference<css::frame::XFrame>                 mxFrame;
+    ::sfx2::sidebar::EnumContext                        maContext;
+    SfxBindings*                                        mpBindings;
+
+    /// bitfield
+    bool                                                mbTBShow : 1;
+    bool                                                mbColorAvail : 1;
+
+    DECL_LINK(SelectFillTypeHdl, ListBox* );
+    DECL_LINK(SelectFillAttrHdl, ListBox* );
+    DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
+    DECL_LINK(ModifyTransparentHdl_Impl, void*);
+    DECL_LINK( ImplPopupModeEndHdl, FloatingWindow* );
+
+    // for transparency gradient
+    PopupControl* CreateTransparencyGradientControl (PopupContainer* pParent);
+    DECL_LINK( ClickTrGrHdl_Impl, ToolBox* );
+
+    // for color picker 
+    PopupControl* CreateColorPopupControl (PopupContainer* pParent);
+    DECL_LINK(ToolBoxColorDropHdl, ToolBox *); //for new color picker 
+
+    // constructor/destuctor
+    AreaPropertyPanel(
+        Window* pParent,
+        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        SfxBindings* pBindings);
+    virtual ~AreaPropertyPanel(void);
+
+    void SetupIcons(void);
+    void Initialize();
+    void Update();
+    void ImpUpdateTransparencies();
+
+    Color GetLastColor (void) const;
+    void SetColor (
+        const String& rsColorName,
+        const Color aColor);
+};
+
+
+} } // end of namespace ::svx::sidebar
+
+
+
+#endif // SVX_PROPERTYPANEL_AREAPAGE_HXX

Added: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.src?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.src (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaPropertyPanel.src Tue Mar  5 12:17:09 2013
@@ -0,0 +1,423 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include "AreaPropertyPanel.hrc"
+#include <sfx2/sidebar/propertypanel.hrc>
+#include <svx/dialogs.hrc>
+#include "helpid.hrc"
+
+#define TOOLBOX_WIDTH		50
+#define TOOLBOX_HEIGHT		17
+
+Control RID_SIDEBAR_AREA_PANEL
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + SECTIONPAGE_MARGIN_VERTICAL_BOT + 2*( FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT) + CONTROL_SPACING_VERTICAL );
+	HelpID = HID_PROPERTYPANEL_AREA_SECTION ;
+	Text [ en-US ] = "Area";
+
+	FixedText FT_COLOR_LIST
+	{
+		Pos		= MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP  ) ;
+        Size    = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Fill:";
+	};
+	FixedText FL_TRSP_TEXT
+	{
+		Pos  	= MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ; 
+        Size    = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Transparency:";
+	};
+	ToolBox TB_COLOR
+	{
+		HelpID = HID_PPROPERTYPANEL_AREA_TBX_COLOR;
+		SVLook = TRUE ;
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + 1) ;
+		Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
+		TabStop = TRUE ;
+		Text = "Color";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = TBI_COLOR ;
+				HelpID = HID_PPROPERTYPANEL_AREA_TBI_COLOR;
+				DropDown = TRUE ;
+				Text = "Color" ;
+			};
+		};
+	};
+	String STR_HELP_COLOR
+	{
+		Text [ en-US ] = "Select the color to apply." ;
+	};
+	String STR_HELP_TYPE
+	{
+		Text [en-US] = "Select the fill type to apply.";
+	};
+	String STR_HELP_ATTR
+	{
+		Text [en-US] = "Select the effect to apply.";
+	};
+	Image IMG_AXIAL
+	{
+	    ImageBitmap = Bitmap{File = "symphony/axial.png";};
+	};
+	Image IMG_ELLI
+	{
+	    ImageBitmap = Bitmap{File = "symphony/ellipsoid.png";};
+	};
+	Image IMG_QUAD
+	{
+	    ImageBitmap = Bitmap{File = "symphony/Quadratic.png";};
+	};
+	Image IMG_RADIAL
+	{
+	    ImageBitmap = Bitmap{File = "symphony/radial.png";};
+	};
+	Image IMG_SQUARE
+	{
+	    ImageBitmap = Bitmap{File = "symphony/Square.png";};
+	};
+	Image IMG_LINEAR
+	{
+	    ImageBitmap = Bitmap{File = "symphony/linear.png";};
+	};
+	Image IMG_COLOR
+	{
+	    ImageBitmap = Bitmap{File = "symphony/fill_color.png";};
+	};
+	
+	//high contract
+	Image IMG_AXIAL_H
+	{
+	    ImageBitmap = Bitmap{File = "symphony/axial_h.png";};
+	};
+	Image IMG_ELLI_H
+	{
+	    ImageBitmap = Bitmap{File = "symphony/ellipsoid_h.png";};
+	};
+	Image IMG_QUAD_H
+	{
+	    ImageBitmap = Bitmap{File = "symphony/Quadratic_h.png";};
+	};
+	Image IMG_RADIAL_H
+	{
+	    ImageBitmap = Bitmap{File = "symphony/radial_h.png";};
+	};
+	Image IMG_SQUARE_H
+	{
+	    ImageBitmap = Bitmap{File = "symphony/Square_h.png";};
+	};
+	Image IMG_LINEAR_H
+	{
+	    ImageBitmap = Bitmap{File = "symphony/linear_h.png";};
+	};
+	Image IMG_COLOR_H
+	{
+	    ImageBitmap = Bitmap{File = "symphony/fill_color_h.png";};
+	};
+	
+	//=====================================================================================================================================
+	ListBox LB_TRGR_TYPES
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH , LISTBOX_HEIGHT ) ;
+        QuickHelpText [ en-US ] = "Select the type of transparence to apply." ;
+		TabStop = TRUE ;
+		DropDown = TRUE ;
+		HelpID = HID_PPROPERTYPANEL_AREA_LB_TRGR_TYPES ;
+        StringList [ en-US ] =
+        {
+			< "None" ; Default ; > ;
+			< "Solid" ; Default ; > ;
+			< "Linear" ; Default ; > ;
+            < "Axial" ; Default ; > ;
+            < "Radial" ; Default ; > ;
+            < "Ellipsoid" ; Default ; > ;
+            < "Quadratic" ; Default ; > ;
+            < "Square" ; Default ; > ;
+        };
+	};
+	
+	MetricField MTR_TRANSPARENT
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH + 1 ,MBOX_HEIGHT ) ;
+        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRANSPARENT ;
+        QuickHelpText [ en-US ] = "Specify 0% for fully opaque through 100% for fully transparent." ;
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		Last = 100 ;
+		SpinSize = 5 ;
+	};
+	
+	ToolBox BTN_GRADIENT
+	{
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
+		HelpID = HID_PPROPERTYPANEL_AREA_TBX_GRADIENT ;		
+		SVLook = TRUE ;
+		Border = FALSE ;
+		TabStop = TRUE ;
+		Text = "Gradient";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = TBI_BTX_GRADIENT ;
+				HelpID = HID_PPROPERTYPANEL_AREA_TBI_GRADIENT ;	
+				ItemBitmap = Bitmap
+				{
+					File = "symphony/linear.png" ;
+				};
+				DropDown = TRUE;
+				Text = "Gradient" ;
+			};
+		};
+	};
+	String STR_HELP_GRADIENT
+	{
+		Text [ en-US ] = "Specify the variation of gradient transparency." ;
+	};
+};
+
+Control RID_POPUPPANEL_AREAPAGE_TRGR
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	
+//	Size = MAP_APPFONT( POP_WIDTH, POP_HEIGHT );
+	
+	FixedText FT_TRGR_CENTER_X
+	{
+        Size = MAP_APPFONT ( CONTROL_WIDTH , FIXED_TEXT_HEIGHT ) ;
+		Text [ en-US ] = "Center ~X:";
+	};
+	MetricField MTR_TRGR_CENTER_X
+	{
+		Border = TRUE ;
+        Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_X ;
+        QuickHelpText [ en-US ] = "Specify the horizontal offset percentage from the center for the gradient shading style. 50% is the horizontal center." ;
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		Last = 100 ;
+		SpinSize = 5 ;
+	};
+	FixedText FT_TRGR_CENTER_Y
+	{
+        Size = MAP_APPFONT ( CONTROL_WIDTH + POPUPPANEL_MARGIN_HORIZONTAL, FIXED_TEXT_HEIGHT ) ;//wj
+		Text [ en-US ] = "Center ~Y:";
+	};
+	MetricField MTR_TRGR_CENTER_Y
+	{
+		Border = TRUE ;
+        Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_Y ;
+        QuickHelpText [ en-US ] = "Specify the vertical offset percentage from the center for the gradient shading style.  50% is the vertical center." ;
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		Last = 100 ;
+		SpinSize = 5 ;
+	};
+	FixedText FT_TRGR_ANGLE
+	{
+        Size = MAP_APPFONT ( CONTROL_WIDTH * 2 + POPUPPANEL_MARGIN_HORIZONTAL + CONTROL_SPACING_HORIZONTAL, FIXED_TEXT_HEIGHT ) ;//wj
+		Text [ en-US ] = "~Angle:";
+	};
+	MetricField MTR_TRGR_ANGLE
+	{
+		Border = TRUE ;
+        Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_ANGLE ;
+        QuickHelpText [ en-US ] = "Specify the angle of rotation for the gradient shading style." ;
+		TabStop = FALSE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Minimum = -9999 ;
+		Maximum = 9999 ;
+		Unit = FUNIT_CUSTOM ;
+		SpinSize = 1 ;
+		CustomUnitText [ en-US ] = " degrees";
+	};	
+	FixedText FT_TRGR_START_VALUE
+	{
+        Size = MAP_APPFONT ( CONTROL_WIDTH , FIXED_TEXT_HEIGHT ) ;
+        Text [ en-US ] = "~Start value:";
+	};
+	MetricField MTR_TRGR_START_VALUE
+	{
+		Border = TRUE ;
+        Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_SVALUE ;
+        QuickHelpText [ en-US ] = "Enter a transparency value for the beginning point of the gradient, where 0% is fully opaque and 100% is fully transparent." ;
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		Last = 100 ;
+		SpinSize = 5 ;
+	};
+	FixedText FT_TRGR_END_VALUE
+	{
+        Size = MAP_APPFONT (CONTROL_WIDTH + POPUPPANEL_MARGIN_HORIZONTAL, FIXED_TEXT_HEIGHT ) ; //wj
+		Text [ en-US ] = "~End value:";
+	};
+	MetricField MTR_TRGR_END_VALUE
+	{
+		Border = TRUE ;
+        Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_EVALUE ;
+        QuickHelpText [ en-US ] = "Enter a transparency value for the endpoint of the gradient, where 0% is fully opaque and 100% is fully transparent." ;
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		Last = 100 ;
+		SpinSize = 5 ;
+	};
+	FixedText FT_TRGR_BORDER
+	{
+        Size = MAP_APPFONT (  CONTROL_WIDTH * 2 + POPUPPANEL_MARGIN_HORIZONTAL + CONTROL_SPACING_HORIZONTAL, FIXED_TEXT_HEIGHT ) ; //
+		Text [ en-US ] = "~Border:";
+	};
+	MetricField MTR_TRGR_BORDER
+	{
+		Border = TRUE ;
+        Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_BORDER ;
+        QuickHelpText [ en-US ] = "Specify the border value of gradient transparence." ;
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+		CustomUnitText = "%" ;
+		Last = 100 ;
+		SpinSize = 5 ;
+	};	
+	//=====================================================================================================================================
+
+	ToolBox BTN_LEFT_SECOND
+	{
+	    Border = FALSE ;
+		HelpID = HID_PPROPERTYPANEL_AREA_BTN_LEFT_SECOND ;
+		SVLook = TRUE ;
+		Border = FALSE ;
+		TabStop = TRUE ;
+		Text = "Rotate Left";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = TBI_LEFT ;
+				Text = "Rotate Left" ;
+				ItemBitmap = Bitmap
+				{
+		//			File = "symphony/rotate_left.png" ;
+				};
+			};
+		};		
+	};
+	ToolBox BTN_RIGHT_FIRST
+	{
+	    Border = FALSE ;
+		HelpID = HID_PPROPERTYPANEL_AREA_BTN_RIGHT_FIRST ;
+		SVLook = TRUE ;
+		Border = FALSE ;
+		TabStop = TRUE ;
+		Text = "Rotate Right";
+		ItemList =
+		{
+			ToolBoxItem
+			{
+				Identifier = TBI_RIGHT ;
+				Text = "Rotate Right" ;
+				ItemBitmap = Bitmap
+				{
+		//			File = "symphony/rotate_right.png" ;
+				};
+			};
+		};		
+	};
+	String STR_HELP_LEFT
+	{
+		Text [ en-US ] = "Rotate counterclockwise by 45 degrees." ;
+	};
+	String STR_HELP_RIGHT
+	{
+		Text [ en-US ] = "Rotate clockwise by 45 degrees." ;
+	};
+	Image IMG_ROT_LEFT
+	{
+	    ImageBitmap = Bitmap{File = "symphony/rotate_left.png";};
+	};
+	Image IMG_ROT_RIGHT
+	{
+	    ImageBitmap = Bitmap{File = "symphony/rotate_right.png";};
+	};
+};
+Control RID_POPUPPANEL_AERAPAGE_COLOR
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+	Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT  );
+	
+	Control VS_COLOR
+	{
+		HelpID = HID_PPROPERTYPANEL_AREA_COLOR_VS;
+        Hide = TRUE ;
+        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
+        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2);
+		TabStop = TRUE ;
+		Text = "Color";
+	};
+};
+
+// eof

Added: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx Tue Mar  5 12:17:09 2013
@@ -0,0 +1,348 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include "AreaTransparencyGradientControl.hxx"
+#include "AreaPropertyPanel.hxx"
+#include "AreaPropertyPanel.hrc"
+
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include <svx/xflftrit.hxx>
+#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+
+namespace svx { namespace sidebar {
+
+// positioning helpers
+
+#define APOS1_1 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL), MAP_APPFONT))
+#define APOS2_1 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL), MAP_APPFONT))
+#define APOS1_2 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL+CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL), MAP_APPFONT))
+#define APOS2_2 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL+CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL), MAP_APPFONT))
+#define APOS1_3 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL+MBOX_HEIGHT+CONTROL_SPACING_VERTICAL), MAP_APPFONT))
+#define APOS1_4 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL)+MBOX_HEIGHT+CONTROL_SPACING_VERTICAL), MAP_APPFONT))
+#define APOS2_3 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL+CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL+MBOX_HEIGHT+CONTROL_SPACING_VERTICAL), MAP_APPFONT))
+#define APOS2_4 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL+CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL)+MBOX_HEIGHT+CONTROL_SPACING_VERTICAL), MAP_APPFONT))
+#define APOS1_5 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL+MBOX_HEIGHT+CONTROL_SPACING_VERTICAL)), MAP_APPFONT))
+#define APOS1_6 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 3*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL)+2*(MBOX_HEIGHT+CONTROL_SPACING_VERTICAL)), MAP_APPFONT))
+#define APOS2_5 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL+CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 2*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL+MBOX_HEIGHT+CONTROL_SPACING_VERTICAL)), MAP_APPFONT))
+#define APOS2_6 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL+CONTROL_WIDTH+CONTROL_SPACING_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 3*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL)+2*(MBOX_HEIGHT+CONTROL_SPACING_VERTICAL)), MAP_APPFONT))
+#define APOS1_7 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 3*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL+MBOX_HEIGHT+CONTROL_SPACING_VERTICAL)), MAP_APPFONT))
+#define APOS1_8 Point(LogicToPixel(Point(POPUPPANEL_MARGIN_HORIZONTAL,POPUPPANEL_MARGIN_VERTICAL + 4*(FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL)+3*(MBOX_HEIGHT+CONTROL_SPACING_VERTICAL)), MAP_APPFONT))
+#define APOS_Left_Right_1 Point(LogicToPixel(Point(LEFT_RIGHT_X1,LEFT_RIGHT_Y1), MAP_APPFONT))
+#define APOS_Left_Right_2 Point(LogicToPixel(Point(LEFT_RIGHT_X2,LEFT_RIGHT_Y1), MAP_APPFONT))
+#define APOS_Left_Right_3 Point(LogicToPixel(Point(LEFT_RIGHT_X1,LEFT_RIGHT_Y2), MAP_APPFONT))
+#define APOS_Left_Right_4 Point(LogicToPixel(Point(LEFT_RIGHT_X2,LEFT_RIGHT_Y2), MAP_APPFONT))
+
+
+
+
+AreaTransparencyGradientControl::AreaTransparencyGradientControl (
+    Window* pParent,
+    AreaPropertyPanel& rPanel)
+    : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_AREAPAGE_TRGR)),
+      maFtTrgrCenterX(this, SVX_RES(FT_TRGR_CENTER_X)),
+      maMtrTrgrCenterX(this, SVX_RES(MTR_TRGR_CENTER_X)),
+      maFtTrgrCenterY(this, SVX_RES(FT_TRGR_CENTER_Y)),
+      maMtrTrgrCenterY(this, SVX_RES(MTR_TRGR_CENTER_Y)),
+      maFtTrgrAngle(this, SVX_RES(FT_TRGR_ANGLE)),
+      maMtrTrgrAngle(this, SVX_RES(MTR_TRGR_ANGLE)),	
+      maFtTrgrStartValue(this, SVX_RES(FT_TRGR_START_VALUE)),
+      maMtrTrgrStartValue(this, SVX_RES(MTR_TRGR_START_VALUE)),
+      maFtTrgrEndValue(this, SVX_RES(FT_TRGR_END_VALUE)),
+      maMtrTrgrEndValue(this, SVX_RES(MTR_TRGR_END_VALUE)),
+      maFtTrgrBorder(this, SVX_RES(FT_TRGR_BORDER)),
+      maMtrTrgrBorder(this, SVX_RES(MTR_TRGR_BORDER)),
+      maBtnLeft45(this, SVX_RES(BTN_LEFT_SECOND)),
+      maBtnRight45(this, SVX_RES(BTN_RIGHT_FIRST)),
+      maRotLeft( SVX_RES(IMG_ROT_LEFT)),
+      maRotRight( SVX_RES(IMG_ROT_RIGHT)),
+      mrAreaPropertyPanel(rPanel),
+      mpBindings(NULL)
+{
+	Link aLink = LINK( this, AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl);
+	maMtrTrgrCenterX.SetModifyHdl( aLink );
+	maMtrTrgrCenterY.SetModifyHdl( aLink );
+	maMtrTrgrAngle.SetModifyHdl( aLink );
+	maMtrTrgrBorder.SetModifyHdl( aLink );
+	maMtrTrgrStartValue.SetModifyHdl( aLink );
+	maMtrTrgrEndValue.SetModifyHdl( aLink );
+	aLink = LINK( this, AreaTransparencyGradientControl, Left_Click45_Impl);
+	maBtnLeft45.SetSelectHdl( aLink );
+	aLink = LINK( this, AreaTransparencyGradientControl, Right_Click45_Impl);
+	maBtnRight45.SetSelectHdl( aLink );
+	maBtnLeft45.SetItemImage(1,maRotLeft);
+	Size aTbxSize = maBtnLeft45.CalcWindowSizePixel();
+	maBtnLeft45.SetOutputSizePixel( aTbxSize );
+	maBtnLeft45.SetQuickHelpText(1, String(SVX_RES(STR_HELP_LEFT)));	//acc wj
+
+	maBtnRight45.SetItemImage(1,maRotRight);
+	aTbxSize = maBtnRight45.CalcWindowSizePixel();
+	maBtnRight45.SetOutputSizePixel( aTbxSize );
+	maBtnRight45.SetQuickHelpText(1, String(SVX_RES(STR_HELP_RIGHT)));	//acc wj
+
+	maBtnLeft45.SetBackground(Wallpaper());
+	maBtnLeft45.SetPaintTransparent(true);
+	maBtnRight45.SetBackground(Wallpaper());
+	maBtnRight45.SetPaintTransparent(true);
+
+	FreeResource();
+    mpBindings = mrAreaPropertyPanel.GetBindings();
+}
+
+
+
+
+AreaTransparencyGradientControl::~AreaTransparencyGradientControl (void)
+{
+}
+
+
+
+
+void AreaTransparencyGradientControl::ToGetFocus()
+{
+	if(maMtrTrgrCenterX.IsVisible())
+		maMtrTrgrCenterX.GrabFocus();
+	else
+		maMtrTrgrAngle.GrabFocus();
+}
+
+
+
+
+void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* pGradientItem)
+{
+	InitStatus(pGradientItem);
+	const XGradient& rGradient = pGradientItem->GetGradientValue();	
+	XGradientStyle eXGS(rGradient.GetGradientStyle());
+	Size aSize(POP_WIDTH,POP_HEIGHT);
+	aSize = LogicToPixel( aSize, MapMode(MAP_APPFONT) );
+	Size aSize2(POP_WIDTH,POP_HEIGHT2);
+	aSize2 = LogicToPixel( aSize2, MapMode(MAP_APPFONT) );
+	long aPosY = 0;
+	Point aPointAngle;
+	Size aSizeAngle = maMtrTrgrAngle.GetSizePixel();
+	Size aTbxSize = maBtnLeft45.CalcWindowSizePixel();
+
+	switch(eXGS)
+	{
+	case XGRAD_LINEAR:
+	case XGRAD_AXIAL:
+		maFtTrgrCenterX.Hide();
+		maMtrTrgrCenterX.Hide();
+		maFtTrgrCenterY.Hide();
+		maMtrTrgrCenterY.Hide();
+		maFtTrgrAngle.Show();
+		maFtTrgrAngle.SetPosPixel(APOS1_1);
+		maMtrTrgrAngle.Show();
+		maMtrTrgrAngle.SetPosPixel(APOS2_1);
+		maFtTrgrStartValue.SetPosPixel(APOS1_3);
+		maMtrTrgrStartValue.SetPosPixel(APOS1_4);
+		maFtTrgrEndValue.SetPosPixel(APOS2_3);
+		maMtrTrgrEndValue.SetPosPixel(APOS2_4);
+		maFtTrgrBorder.SetPosPixel(APOS1_5);
+		maMtrTrgrBorder.SetPosPixel(APOS1_6);
+
+		maBtnLeft45.Show();
+		maBtnRight45.Show();
+
+		aPointAngle = maMtrTrgrAngle.GetPosPixel();
+		aPosY = aPointAngle.getY() + aSizeAngle.getHeight() - aTbxSize.getHeight();
+
+		maBtnLeft45.SetPosPixel(Point(APOS_Left_Right_1.getX(), aPosY));
+		maBtnRight45.SetPosPixel(Point(APOS_Left_Right_2.getX(), aPosY));
+
+		SetSizePixel(aSize2);
+		break;
+
+	case XGRAD_RADIAL:
+		maFtTrgrCenterX.Show();
+		maFtTrgrCenterX.SetPosPixel(APOS1_1);
+		maMtrTrgrCenterX.Show();
+		maMtrTrgrCenterX.SetPosPixel(APOS2_1);
+		maFtTrgrCenterY.Show();
+		maFtTrgrCenterY.SetPosPixel(APOS1_2);
+		maMtrTrgrCenterY.Show();
+		maMtrTrgrCenterY.SetPosPixel(APOS2_2);
+		maFtTrgrAngle.Hide();
+		maMtrTrgrAngle.Hide();
+		maFtTrgrStartValue.SetPosPixel(APOS1_3);
+		maMtrTrgrStartValue.SetPosPixel(APOS1_4);
+		maFtTrgrEndValue.SetPosPixel(APOS2_3);
+		maMtrTrgrEndValue.SetPosPixel(APOS2_4);
+		maFtTrgrBorder.SetPosPixel(APOS1_5);
+		maMtrTrgrBorder.SetPosPixel(APOS1_6);
+
+		maBtnLeft45.Hide();
+		maBtnRight45.Hide();
+
+		SetSizePixel(aSize2);
+
+		break;
+
+	case XGRAD_ELLIPTICAL:
+	case XGRAD_SQUARE:
+	case XGRAD_RECT:
+		maFtTrgrCenterX.Show();
+		maFtTrgrCenterX.SetPosPixel(APOS1_1);
+		maMtrTrgrCenterX.Show();
+		maMtrTrgrCenterX.SetPosPixel(APOS2_1);
+		maFtTrgrCenterY.Show();
+		maFtTrgrCenterY.SetPosPixel(APOS1_2);
+		maMtrTrgrCenterY.Show();
+		maMtrTrgrCenterY.SetPosPixel(APOS2_2);
+		maFtTrgrAngle.Show();
+		maFtTrgrAngle.SetPosPixel(APOS1_3);
+		maMtrTrgrAngle.Show();
+		maMtrTrgrAngle.SetPosPixel(APOS1_4);
+
+		maFtTrgrStartValue.SetPosPixel(APOS1_5);
+		maMtrTrgrStartValue.SetPosPixel(APOS1_6);
+		maFtTrgrEndValue.SetPosPixel(APOS2_5);
+		maMtrTrgrEndValue.SetPosPixel(APOS2_6);
+		maFtTrgrBorder.SetPosPixel(APOS1_7);
+		maMtrTrgrBorder.SetPosPixel(APOS1_8);
+
+		maBtnLeft45.Show();
+		maBtnRight45.Show();
+
+		aPointAngle = maMtrTrgrAngle.GetPosPixel();
+		aPosY = aPointAngle.getY() + aSizeAngle.getHeight() - aTbxSize.getHeight();
+
+		maBtnLeft45.SetPosPixel(Point(APOS_Left_Right_3.getX(), aPosY));
+		maBtnRight45.SetPosPixel(Point(APOS_Left_Right_4.getX(), aPosY));
+
+		SetSizePixel(aSize);
+
+		break;
+	}
+}
+
+
+
+
+void AreaTransparencyGradientControl::InitStatus(XFillFloatTransparenceItem* pGradientItem)
+{
+	const XGradient& rGradient = pGradientItem->GetGradientValue();
+
+	XGradient aGradient;
+
+	if (rGradient.GetXOffset() == AreaPropertyPanel::DEFAULT_CENTERX
+        && rGradient.GetYOffset() == AreaPropertyPanel::DEFAULT_CENTERY
+        && (rGradient.GetAngle() / 10) == AreaPropertyPanel::DEFAULT_ANGLE
+        && ((sal_uInt16)((((sal_uInt16)rGradient.GetStartColor().GetRed() + 1) * 100) / 255))
+            == AreaPropertyPanel::DEFAULT_STARTVALUE
+        && ((sal_uInt16)((((sal_uInt16)rGradient.GetEndColor().GetRed() + 1) * 100) / 255))
+            == AreaPropertyPanel::DEFAULT_ENDVALUE
+        && rGradient.GetBorder() == AreaPropertyPanel::DEFAULT_BORDER)
+	{
+        aGradient = mrAreaPropertyPanel.GetGradient(rGradient.GetGradientStyle());
+	}
+	else
+    {
+		aGradient = rGradient;
+    }
+	maMtrTrgrCenterX.SetValue(aGradient.GetXOffset());
+	maMtrTrgrCenterY.SetValue(aGradient.GetYOffset());
+	maMtrTrgrAngle.SetValue(aGradient.GetAngle() / 10);
+	maMtrTrgrStartValue.SetValue((sal_uInt16)((((sal_uInt16)aGradient.GetStartColor().GetRed() + 1) * 100) / 255));
+	maMtrTrgrEndValue.SetValue((sal_uInt16)((((sal_uInt16)aGradient.GetEndColor().GetRed() + 1) * 100) / 255));
+	maMtrTrgrBorder.SetValue(aGradient.GetBorder());	
+}
+
+
+
+
+void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol )
+{
+	//Added 
+	sal_Int16 aMtrValue = (sal_Int16)maMtrTrgrAngle.GetValue();
+	while(aMtrValue<0)
+		aMtrValue += 360;
+	sal_uInt16 nVal = aMtrValue/360;
+	nVal = aMtrValue - nVal*360;
+	maMtrTrgrAngle.SetValue(nVal);
+	//End of new code
+	XGradient aTmpGradient(
+		Color(nStartCol, nStartCol, nStartCol),
+		Color(nEndCol, nEndCol, nEndCol),
+		(XGradientStyle)(mrAreaPropertyPanel.GetSelectedTransparencyTypeIndex()-2),
+		(sal_uInt16)maMtrTrgrAngle.GetValue() * 10,
+		(sal_uInt16)maMtrTrgrCenterX.GetValue(),
+		(sal_uInt16)maMtrTrgrCenterY.GetValue(),
+		(sal_uInt16)maMtrTrgrBorder.GetValue(),
+		100, 100);
+
+    mrAreaPropertyPanel.SetGradient(aTmpGradient);
+
+	SfxItemPool* pPool = NULL;
+	bool bEnable = true;		
+	XFillFloatTransparenceItem aGradientItem(pPool,aTmpGradient, bEnable );
+
+	mpBindings->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
+}
+
+
+
+
+IMPL_LINK(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, void *, pControl)
+{
+	sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue.GetValue() * 255) / 100);
+	sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue.GetValue() * 255) / 100);
+	ExecuteValueModify( nStartCol, nEndCol );
+	return( 0L );
+}
+
+
+
+
+IMPL_LINK(AreaTransparencyGradientControl, Left_Click45_Impl, void *, pControl)
+{
+	sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue.GetValue() * 255) / 100);
+	sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue.GetValue() * 255) / 100);
+	sal_uInt16 aTemp = (sal_uInt16)maMtrTrgrAngle.GetValue();
+	if(aTemp>=315)
+		aTemp -= 360;
+	aTemp += 45;
+	maMtrTrgrAngle.SetValue(aTemp);
+	ExecuteValueModify( nStartCol, nEndCol );
+	return( 0L );
+}
+
+
+
+
+IMPL_LINK(AreaTransparencyGradientControl, Right_Click45_Impl, void *, pControl)
+{
+	sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue.GetValue() * 255) / 100);
+	sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue.GetValue() * 255) / 100);
+	sal_uInt16 aTemp = (sal_uInt16)maMtrTrgrAngle.GetValue();
+	if(aTemp<45)
+		aTemp += 360;
+	aTemp -= 45;
+	maMtrTrgrAngle.SetValue(aTemp);
+	ExecuteValueModify( nStartCol, nEndCol );
+	return( 0L );
+}
+
+} } // end of namespace svx::sidebar

Added: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx Tue Mar  5 12:17:09 2013
@@ -0,0 +1,76 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include "svx/sidebar/PopupControl.hxx"
+
+#include <vcl/fixed.hxx>
+#include <vcl/field.hxx>
+#include <vcl/toolbox.hxx>
+#include <svx/xenum.hxx>
+
+class XFillFloatTransparenceItem;
+class SfxBindings;
+
+namespace svx { namespace sidebar {
+
+class AreaPropertyPanel;
+
+class AreaTransparencyGradientControl : public PopupControl
+{
+public:
+	AreaTransparencyGradientControl (
+        Window* pParent,
+        AreaPropertyPanel& rPanel);
+    virtual ~AreaTransparencyGradientControl (void);
+
+	void ToGetFocus();
+	void Rearrange(XFillFloatTransparenceItem* pGradientItem);
+	void InitStatus(XFillFloatTransparenceItem* pGradientItem);
+	void ExecuteValueModify( sal_uInt8 nStartCol, sal_uInt8 nEndCol );
+	void SetControlState_Impl(XGradientStyle eXGS);
+
+private:	
+	FixedText           maFtTrgrCenterX;
+	MetricField         maMtrTrgrCenterX;
+	FixedText           maFtTrgrCenterY;
+	MetricField         maMtrTrgrCenterY;
+	FixedText           maFtTrgrAngle;
+	MetricField         maMtrTrgrAngle;	
+	ToolBox		 	    maBtnLeft45;
+	ToolBox		 	    maBtnRight45;
+	FixedText           maFtTrgrStartValue;
+	MetricField         maMtrTrgrStartValue;
+	FixedText           maFtTrgrEndValue;
+	MetricField         maMtrTrgrEndValue;
+	FixedText           maFtTrgrBorder;
+	MetricField         maMtrTrgrBorder;
+	Image				maRotLeft;
+	Image				maRotRight;
+
+	AreaPropertyPanel& mrAreaPropertyPanel;
+	SfxBindings*		mpBindings;
+	DECL_LINK( ModifiedTrgrHdl_Impl, void* );
+	DECL_LINK( Left_Click45_Impl, void* );
+	DECL_LINK( Right_Click45_Impl, void* );
+};
+
+
+} } // end of namespace svx::sidebar

Added: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx Tue Mar  5 12:17:09 2013
@@ -0,0 +1,58 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include "AreaTransparencyGradientPopup.hxx"
+#include "AreaTransparencyGradientControl.hxx"
+
+
+namespace svx { namespace sidebar {
+
+AreaTransparencyGradientPopup::AreaTransparencyGradientPopup (
+    Window* pParent,
+    const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
+    : Popup(
+        pParent,
+        rControlCreator, 
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency and Gradient")))
+{
+}
+
+
+
+
+AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup (void)
+{
+}
+
+
+
+
+void AreaTransparencyGradientPopup::Rearrange (XFillFloatTransparenceItem* pItem)
+{
+    ProvideContainerAndControl();
+
+    AreaTransparencyGradientControl* pControl = dynamic_cast<AreaTransparencyGradientControl*>(mpControl.get());
+    if (pControl != NULL)
+        pControl->Rearrange(pItem);	
+}
+
+
+} } // end of namespace svx::sidebar

Added: openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx Tue Mar  5 12:17:09 2013
@@ -0,0 +1,49 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#ifndef _SVX_SIDEBAR_TRANSPARENCY_GRADIENT_POPUP_HXX_
+#define _SVX_SIDEBAR_TRANSPARENCY_GRADIENT_POPUP_HXX_
+
+#include "svx/sidebar/Popup.hxx"
+
+#include <boost/function.hpp>
+
+
+class XFillFloatTransparenceItem;
+
+
+namespace svx { namespace sidebar {
+
+class AreaTransparencyGradientPopup
+    : public Popup
+{
+public :
+    AreaTransparencyGradientPopup (
+        Window* pParent,
+        const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
+    ~AreaTransparencyGradientPopup (void);
+
+    void Rearrange (XFillFloatTransparenceItem* pItem);
+};
+
+} } // end of namespace svx::sidebar
+
+#endif

Added: openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx Tue Mar  5 12:17:09 2013
@@ -0,0 +1,473 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include <sfx2/sidebar/propertypanel.hrc>
+#include <sfx2/sidebar/Theme.hxx>
+#include <sfx2/sidebar/ControlFactory.hxx>
+#include <GraphicPropertyPanel.hxx>
+#include <GraphicPropertyPanel.hrc>
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+#include <vcl/field.hxx>
+#include <vcl/lstbox.hxx>
+#include <svl/intitem.hxx>
+#include <sfx2/bindings.hxx>
+#include <sfx2/dispatch.hxx>
+
+using namespace css;
+using namespace cssu;
+using ::sfx2::sidebar::Theme;
+
+#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
+
+//////////////////////////////////////////////////////////////////////////////
+// namespace open
+
+namespace svx { namespace sidebar {
+
+//////////////////////////////////////////////////////////////////////////////
+
+GraphicPropertyPanel::GraphicPropertyPanel(
+    Window* pParent,
+    const cssu::Reference<css::frame::XFrame>& rxFrame,
+    SfxBindings* pBindings)
+:   Control(
+        pParent, 
+        SVX_RES(RID_SIDEBAR_GRAPHIC_PANEL)),
+    mpFtBrightness(new FixedText(this, SVX_RES(FT_BRIGHTNESS))),
+    mpMtrBrightness(new MetricField(this, SVX_RES(MTR_BRIGHTNESS))),
+    mpFtContrast(new FixedText(this, SVX_RES(FT_CONTRAST))),
+    mpMtrContrast(new MetricField(this, SVX_RES(MTR_CONTRAST))),
+    mpFtColorMode(new FixedText(this, SVX_RES(FT_COLOR_MODE))),
+    mpLBColorMode(new ListBox(this, SVX_RES(LB_COLOR_MODE))),
+    mpFtTrans(new FixedText(this, SVX_RES(FT_TRANSPARENT))),
+    mpMtrTrans(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
+    mpMtrRed(new MetricField(this, SVX_RES(MF_RED))),
+    mpMtrGreen(new MetricField(this, SVX_RES(MF_GREEN))),
+    mpMtrBlue(new MetricField(this, SVX_RES(MF_BLUE))),
+    mpMtrGamma(new MetricField(this, SVX_RES(MF_GAMMA))),
+    maBrightControl(SID_ATTR_GRAF_LUMINANCE, *pBindings, *this),
+    maContrastControl(SID_ATTR_GRAF_CONTRAST, *pBindings, *this),
+    maTransparenceControl(SID_ATTR_GRAF_TRANSPARENCE, *pBindings, *this),
+    maRedControl(SID_ATTR_GRAF_RED, *pBindings, *this),
+    maGreenControl(SID_ATTR_GRAF_GREEN, *pBindings, *this),
+    maBlueControl(SID_ATTR_GRAF_BLUE, *pBindings, *this),
+    maGammaControl(SID_ATTR_GRAF_GAMMA, *pBindings, *this),
+    maModeControl(SID_ATTR_GRAF_MODE, *pBindings, *this),
+    maImgNormal(SVX_RES(IMG_NORMAL)),
+    maImgBW(SVX_RES(IMG_BW)),
+    maImgGray(SVX_RES(IMG_GRAY)),
+    maImgWater(SVX_RES(IMG_WATER)),
+    maImgRed(this, SVX_RES(IMG_RED)),
+    maImgGreen(this, SVX_RES(IMG_GREEN)),
+    maImgBlue(this, SVX_RES(IMG_BLUE)),
+    maImgGamma(this, SVX_RES(IMG_GAMMA)),
+    msNormal(SVX_RES(STR_NORMAL)),
+    msBW(SVX_RES(STR_BW)),
+    msGray(SVX_RES(STR_GRAY)),
+    msWater(SVX_RES(STR_WATER)),
+    mxFrame(rxFrame),
+    maContext(),
+    mpBindings(pBindings)
+{
+    Initialize();
+    FreeResource();
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+GraphicPropertyPanel::~GraphicPropertyPanel()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void GraphicPropertyPanel::Initialize()
+{
+	mpMtrBrightness->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyBrightnessHdl ) );
+	mpMtrBrightness->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Brightness")));	//wj acc
+	mpMtrContrast->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyContrastHdl ) );
+	mpMtrContrast->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Contrast")));	//wj acc
+	mpMtrTrans->SetModifyHdl( LINK( this, GraphicPropertyPanel, ModifyTransHdl ) );
+	mpMtrTrans->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Transparency")));	//wj acc
+
+	mpLBColorMode->InsertEntry( msNormal, maImgNormal );
+	mpLBColorMode->InsertEntry( msGray, maImgGray );
+	mpLBColorMode->InsertEntry( msBW, maImgBW );
+	mpLBColorMode->InsertEntry( msWater, maImgWater );
+	mpLBColorMode->SetSelectHdl( LINK( this, GraphicPropertyPanel, ClickColorModeHdl ));
+	mpLBColorMode->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Color mode")));	//wj acc
+
+	mpMtrRed->SetModifyHdl( LINK( this, GraphicPropertyPanel, RedHdl ) );
+	mpMtrGreen->SetModifyHdl( LINK( this, GraphicPropertyPanel, GreenHdl ) );
+	mpMtrBlue->SetModifyHdl( LINK( this, GraphicPropertyPanel, BlueHdl ) );
+	mpMtrGamma->SetModifyHdl( LINK( this, GraphicPropertyPanel, GammaHdl ) );
+	mpMtrRed->SetAccessibleName(mpMtrRed->GetQuickHelpText());	//wj acc
+	mpMtrGreen->SetAccessibleName(mpMtrGreen->GetQuickHelpText());	//wj acc
+	mpMtrBlue->SetAccessibleName(mpMtrBlue->GetQuickHelpText());		//wj acc
+	mpMtrGamma->SetAccessibleName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gamma value")));	//wj acc
+
+    mpMtrRed->SetAccessibleRelationLabeledBy(mpMtrRed.get());
+	mpMtrGreen->SetAccessibleRelationLabeledBy(mpMtrGreen.get());
+	mpMtrBlue->SetAccessibleRelationLabeledBy(mpMtrBlue.get());
+	mpMtrGamma->SetAccessibleRelationLabeledBy(mpMtrGamma.get());
+	mpMtrBrightness->SetAccessibleRelationLabeledBy(mpFtBrightness.get());	//7874
+	mpMtrContrast->SetAccessibleRelationLabeledBy(mpFtContrast.get());	//7874
+	mpMtrTrans->SetAccessibleRelationLabeledBy(mpFtTrans.get());	//7874
+	mpLBColorMode->SetAccessibleRelationLabeledBy(mpFtColorMode.get());	//7874
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK( GraphicPropertyPanel, ModifyBrightnessHdl, void *, EMPTYARG )
+{
+	sal_Int16 nBright = mpMtrBrightness->GetValue();
+	SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_LUMINANCE, SFX_CALLMODE_RECORD, &aBrightItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK( GraphicPropertyPanel, ModifyContrastHdl, void *, EMPTYARG )
+{
+	sal_Int16 nContrast = mpMtrContrast->GetValue();
+	SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_CONTRAST, SFX_CALLMODE_RECORD, &aContrastItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG )
+{
+	sal_Int16 nTrans = mpMtrTrans->GetValue();
+	SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_TRANSPARENCE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK( GraphicPropertyPanel, ClickColorModeHdl, ToolBox *, pBox )
+{
+	sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos();
+	SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_MODE, SFX_CALLMODE_RECORD, &aTransItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK( GraphicPropertyPanel, RedHdl, void*, EMPTYARG )
+{
+	sal_Int16 nRed = mpMtrRed->GetValue();
+	SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_RED, SFX_CALLMODE_RECORD, &aRedItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK( GraphicPropertyPanel, GreenHdl, void*, EMPTYARG )
+{
+	sal_Int16 nGreen = mpMtrGreen->GetValue();
+	SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_GREEN, SFX_CALLMODE_RECORD, &aGreenItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK(GraphicPropertyPanel, BlueHdl, void *, EMPTYARG)
+{
+	sal_Int16 nBlue = mpMtrBlue->GetValue();
+	SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_BLUE, SFX_CALLMODE_RECORD, &aBlueItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG)
+{
+	sal_Int32 nGamma = mpMtrGamma->GetValue();
+	SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma );
+	GetBindings()->GetDispatcher()->Execute(
+		SID_ATTR_GRAF_GAMMA, SFX_CALLMODE_RECORD, &nGammaItem, 0L);
+	return 0L;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void GraphicPropertyPanel::SetupIcons(void)
+{
+    if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons))
+    {
+        // todo
+    }
+    else
+    {
+        // todo
+    }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+GraphicPropertyPanel* GraphicPropertyPanel::Create (
+    Window* pParent,
+    const cssu::Reference<css::frame::XFrame>& rxFrame,
+    SfxBindings* pBindings)
+{
+    if (pParent == NULL)
+        throw lang::IllegalArgumentException(A2S("no parent Window given to GraphicPropertyPanel::Create"), NULL, 0);
+    if ( ! rxFrame.is())
+        throw lang::IllegalArgumentException(A2S("no XFrame given to GraphicPropertyPanel::Create"), NULL, 1);
+    if (pBindings == NULL)
+        throw lang::IllegalArgumentException(A2S("no SfxBindings given to GraphicPropertyPanel::Create"), NULL, 2);
+    
+    return new GraphicPropertyPanel(
+        pParent,
+        rxFrame,
+        pBindings);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void GraphicPropertyPanel::DataChanged(
+    const DataChangedEvent& rEvent)
+{
+    (void)rEvent;
+    
+    SetupIcons();
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void GraphicPropertyPanel::HandleContextChange(
+    const ::sfx2::sidebar::EnumContext aContext)
+{
+    if(maContext == aContext)
+    {
+        // Nothing to do.
+        return;
+    }
+
+    maContext = aContext;
+
+
+
+    // todo
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void GraphicPropertyPanel::NotifyItemUpdate( 
+    sal_uInt16 nSID, 
+    SfxItemState eState, 
+    const SfxPoolItem* pState)
+{
+	switch( nSID )
+	{
+	case SID_ATTR_GRAF_LUMINANCE:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpMtrBrightness->Enable();
+            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+			if(pItem)
+			{
+				sal_Int64 nBright = pItem->GetValue();
+				mpMtrBrightness->SetValue(nBright);
+			}
+		}
+		else if( eState == SFX_ITEM_DISABLED )
+			mpMtrBrightness->Disable();
+		else
+		{
+			mpMtrBrightness->Enable();
+			mpMtrBrightness->SetText( String());
+		}
+		break;
+	case SID_ATTR_GRAF_CONTRAST:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpMtrContrast->Enable();
+            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+            if(pItem)
+			{
+				sal_Int64 nContrast = pItem->GetValue();
+				mpMtrContrast->SetValue(nContrast);
+			}
+		}
+		else if( eState == SFX_ITEM_DISABLED )
+			mpMtrContrast->Disable();
+		else
+		{
+			mpMtrContrast->Enable();
+			mpMtrContrast->SetText( String());
+		}
+		break;
+	case SID_ATTR_GRAF_TRANSPARENCE:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpMtrTrans->Enable();
+            const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
+
+			if(pItem)
+			{
+				sal_Int64 nTrans = pItem->GetValue();
+				mpMtrTrans->SetValue(nTrans);
+			}
+		}
+		else if( eState == SFX_ITEM_DISABLED )
+			mpMtrTrans->Disable();
+		else
+		{
+			mpMtrTrans->Enable();
+			mpMtrTrans->SetText( String());
+		}
+		break;
+	case SID_ATTR_GRAF_MODE:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpLBColorMode->Enable();
+            const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
+
+			if(pItem)
+			{
+				sal_Int64 nTrans = pItem->GetValue();
+				mpLBColorMode->SelectEntryPos(nTrans);
+			}
+		}
+		else if( eState == SFX_ITEM_DISABLED )
+			mpLBColorMode->Disable();
+		else
+		{
+			mpLBColorMode->Enable();
+			mpLBColorMode->SetNoSelection();
+		}
+		break;
+	case SID_ATTR_GRAF_RED:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpMtrRed->Enable();
+            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+			if(pItem)
+			{
+				sal_Int64 nRed = pItem->GetValue();
+				mpMtrRed->SetValue( nRed );
+			}
+		}			
+		else if( eState == SFX_ITEM_DISABLED )
+			mpMtrRed->Disable();
+		else
+		{
+			mpMtrRed->Enable();
+			mpMtrRed->SetText( String());
+		}
+		break;
+	case SID_ATTR_GRAF_GREEN:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpMtrGreen->Enable();
+            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+			if(pItem)
+			{
+				sal_Int64 nGreen = pItem->GetValue();
+				mpMtrGreen->SetValue( nGreen );
+			}
+		}
+		else if( eState == SFX_ITEM_DISABLED )
+			mpMtrGreen->Disable();
+		else
+		{
+			mpMtrGreen->Enable();
+			mpMtrGreen->SetText( String());
+		}
+		break;
+	case SID_ATTR_GRAF_BLUE:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpMtrBlue->Enable();
+            const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+			if(pItem)
+			{
+				sal_Int64 nBlue = pItem->GetValue();
+				mpMtrBlue->SetValue( nBlue );
+			}
+		}
+		else if( eState == SFX_ITEM_DISABLED )
+			mpMtrBlue->Disable();
+		else
+		{
+			mpMtrBlue->Enable();
+			mpMtrBlue->SetText( String());
+		}
+		break;
+	case SID_ATTR_GRAF_GAMMA:
+		if( eState >= SFX_ITEM_AVAILABLE)
+		{
+			mpMtrGamma->Enable();
+            const SfxUInt32Item* pItem = dynamic_cast< const SfxUInt32Item* >(pState);
+
+			if(pItem)
+			{
+				sal_Int64 nGamma = pItem->GetValue();
+				mpMtrGamma->SetValue( nGamma );
+			}
+		}
+		else if( eState == SFX_ITEM_DISABLED )
+			mpMtrGamma->Disable();
+		else
+		{
+			mpMtrGamma->Enable();
+			mpMtrGamma->SetText( String());
+		}
+		break;
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+SfxBindings* GraphicPropertyPanel::GetBindings() 
+{ 
+    return mpBindings; 
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// namespace close
+
+}} // end of namespace ::svx::sidebar
+
+//////////////////////////////////////////////////////////////////////////////
+// eof

Added: openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc Tue Mar  5 12:17:09 2013
@@ -0,0 +1,82 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+// RID_SIDEBAR_GRAPHIC_PANEL--------------------------------------------------------------
+#define FT_BRIGHTNESS		1
+#define MTR_BRIGHTNESS		2
+#define FT_CONTRAST			3
+#define MTR_CONTRAST		4
+#define FT_TRANSPARENT		5
+#define MTR_TRANSPARENT		6
+#define FT_COLOR_MODE       10
+#define LB_COLOR_MODE		11
+#define MBOX_WIDTH			50
+
+#define IMG_NORMAL			13
+#define IMG_BW				14
+#define IMG_GRAY			15
+#define IMG_WATER			16
+#define STR_NORMAL			17
+#define STR_BW				18
+#define STR_GRAY			19
+#define STR_WATER			20
+#define MF_RED				21
+#define MF_GREEN			22
+#define MF_BLUE				23
+#define MF_GAMMA			24
+#define IMG_RED				25
+#define IMG_GREEN			26
+#define IMG_BLUE			27
+#define IMG_GAMMA           28
+
+//===========================location================================
+
+#define FT_BRIGHTNESS_X			SECTIONPAGE_MARGIN_HORIZONTAL
+#define FT_BRIGHTNESS_Y			SECTIONPAGE_MARGIN_VERTICAL_TOP
+#define MTR_BRIGHTNESS_X		FT_BRIGHTNESS_X
+#define MTR_BRIGHTNESS_Y		FT_BRIGHTNESS_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
+#define FT_CONTRAST_X			FT_BRIGHTNESS_X + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL
+#define FT_CONTRAST_Y			FT_BRIGHTNESS_Y
+#define MTR_CONTRAST_X			FT_CONTRAST_X
+#define MTR_CONTRAST_Y			MTR_BRIGHTNESS_Y
+
+#define FT_COLOR_MODE_X			FT_BRIGHTNESS_X
+#define FT_COLOR_MODE_Y			MTR_BRIGHTNESS_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
+#define LBX_COLOR_MODE_X		FT_COLOR_MODE_X
+#define LBX_COLOR_MODE_Y		FT_COLOR_MODE_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
+
+#define FT_TRANSPARENT_X		FT_CONTRAST_X
+#define FT_TRANSPARENT_Y		MTR_CONTRAST_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
+#define MTR_TRANS_X				FT_TRANSPARENT_X
+#define MTR_TRANS_Y				FT_TRANSPARENT_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
+
+#define MF_RED_X				SECTIONPAGE_MARGIN_HORIZONTAL
+#define MF_RED_Y				MTR_TRANS_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
+#define MF_GREEN_X				MF_RED_X + MBOX_WIDTH + CONTROL_SPACING_HORIZONTAL
+#define MF_GREEN_Y				MF_RED_Y
+#define MF_BLUE_X				MF_RED_X
+#define MF_BLUE_Y				MF_RED_Y + MBOX_HEIGHT + CONTROL_SPACING_VERTICAL
+#define MF_GAMMA_X				MF_GREEN_X
+#define MF_GAMMA_Y				MF_BLUE_Y
+
+#define PAGE_HEIGHT				MF_GAMMA_Y + MBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT      
+
+// eof

Added: openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx Tue Mar  5 12:17:09 2013
@@ -0,0 +1,141 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#ifndef SVX_PROPERTYPANEL_GRAPHICPAGE_HXX
+#define SVX_PROPERTYPANEL_GRAPHICPAGE_HXX
+
+#include <vcl/ctrl.hxx>
+#include <sfx2/sidebar/SidebarPanelBase.hxx>
+#include <sfx2/sidebar/ControllerItem.hxx>
+#include <vcl/fixed.hxx>
+#include <boost/scoped_ptr.hpp>
+
+//////////////////////////////////////////////////////////////////////////////
+// pedefines
+class FixedText;
+class MetricField;
+class ListBox;
+class FloatingWindow;
+
+//////////////////////////////////////////////////////////////////////////////
+// namespace open
+
+namespace svx { namespace sidebar {
+
+class GraphicPropertyPanel
+:   public Control,
+    public ::sfx2::sidebar::SidebarPanelBase::ContextChangeReceiverInterface,
+    public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
+{
+public:
+    static GraphicPropertyPanel* Create(
+        Window* pParent,
+        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        SfxBindings* pBindings);
+
+    virtual void DataChanged(
+        const DataChangedEvent& rEvent);
+
+    virtual void HandleContextChange(
+        const ::sfx2::sidebar::EnumContext aContext);
+
+    virtual void NotifyItemUpdate(
+        const sal_uInt16 nSId,
+        const SfxItemState eState,
+        const SfxPoolItem* pState);
+
+    SfxBindings* GetBindings();
+
+private:
+    //ui controls
+    ::boost::scoped_ptr< FixedText >                    mpFtBrightness;
+    ::boost::scoped_ptr< MetricField >                  mpMtrBrightness;
+    ::boost::scoped_ptr< FixedText >                    mpFtContrast;
+    ::boost::scoped_ptr< MetricField >                  mpMtrContrast;
+    ::boost::scoped_ptr< FixedText >                    mpFtColorMode;
+    ::boost::scoped_ptr< ListBox >                      mpLBColorMode;
+    ::boost::scoped_ptr< FixedText >                    mpFtTrans;
+    ::boost::scoped_ptr< MetricField >                  mpMtrTrans;
+    ::boost::scoped_ptr< MetricField >                  mpMtrRed;
+    ::boost::scoped_ptr< MetricField >                  mpMtrGreen;
+    ::boost::scoped_ptr< MetricField >                  mpMtrBlue;
+    ::boost::scoped_ptr< MetricField >                  mpMtrGamma;
+
+    ::sfx2::sidebar::ControllerItem                     maBrightControl;
+    ::sfx2::sidebar::ControllerItem                     maContrastControl;
+    ::sfx2::sidebar::ControllerItem                     maTransparenceControl;
+    ::sfx2::sidebar::ControllerItem                     maRedControl;
+    ::sfx2::sidebar::ControllerItem                     maGreenControl;
+    ::sfx2::sidebar::ControllerItem                     maBlueControl;
+    ::sfx2::sidebar::ControllerItem                     maGammaControl;
+    ::sfx2::sidebar::ControllerItem                     maModeControl;
+
+    Image                                               maImgNormal;
+    Image                                               maImgBW;
+    Image                                               maImgGray;
+    Image                                               maImgWater;
+
+    FixedImage                                          maImgRed;
+    FixedImage                                          maImgGreen;
+    FixedImage                                          maImgBlue;
+    FixedImage                                          maImgGamma;
+
+    String                                              msNormal;
+    String                                              msBW;
+    String                                              msGray;
+    String                                              msWater;
+
+    cssu::Reference<css::frame::XFrame>                 mxFrame;
+    ::sfx2::sidebar::EnumContext                        maContext;
+    SfxBindings*                                        mpBindings;
+
+    DECL_LINK( ModifyBrightnessHdl, void * );
+    DECL_LINK( ModifyContrastHdl, void * );
+    DECL_LINK( ModifyTransHdl, void * );
+    DECL_LINK( ClickColorModeHdl, ToolBox * );
+    DECL_LINK( ImplPopupModeEndHdl, FloatingWindow* );
+    DECL_LINK( RedHdl, void*);
+    DECL_LINK( GreenHdl, void*);
+    DECL_LINK( BlueHdl, void*);
+    DECL_LINK( GammaHdl, void*);
+
+    // constructor/destuctor
+    GraphicPropertyPanel(
+        Window* pParent,
+        const cssu::Reference<css::frame::XFrame>& rxFrame,
+        SfxBindings* pBindings);
+    virtual ~GraphicPropertyPanel();
+
+    void SetupIcons(void);
+    void Initialize();
+};
+
+//////////////////////////////////////////////////////////////////////////////
+// namespace close
+
+}} // end of namespace ::svx::sidebar
+
+//////////////////////////////////////////////////////////////////////////////
+
+#endif // SVX_PROPERTYPANEL_GRAPHICPAGE_HXX
+
+//////////////////////////////////////////////////////////////////////////////
+// eof

Added: openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src?rev=1452760&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src Tue Mar  5 12:17:09 2013
@@ -0,0 +1,257 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+#include "GraphicPropertyPanel.hrc"
+#include <sfx2/sidebar/propertypanel.hrc>
+#include <svx/dialogs.hrc>
+#include "helpid.hrc"
+
+Control RID_SIDEBAR_GRAPHIC_PANEL
+{
+	OutputSize = TRUE;
+	DialogControl = TRUE;
+	Border = FALSE;
+
+	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PAGE_HEIGHT );
+	HelpID = HID_PROPERTYPANEL_GRAPHIC_SECTION ;
+	Text = "Graphic";
+	
+	FixedText FT_BRIGHTNESS
+	{
+		Pos = MAP_APPFONT ( FT_BRIGHTNESS_X, FT_BRIGHTNESS_Y );
+        Size = MAP_APPFONT ( MBOX_WIDTH , TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Brightness:";
+	};
+	MetricField MTR_BRIGHTNESS
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( MTR_BRIGHTNESS_X, MTR_BRIGHTNESS_Y );
+        Size = MAP_APPFONT ( MBOX_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_BRIGHT;
+        QuickHelpText [ en-US ] = "Specify the luminance of the graphic.";
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		Minimum = -100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		SpinSize = 1 ;
+	};
+	FixedText FT_CONTRAST
+	{
+		Pos = MAP_APPFONT ( FT_CONTRAST_X, FT_CONTRAST_Y );
+        Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Contrast:";
+	};
+	MetricField MTR_CONTRAST
+	{
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( MTR_CONTRAST_X, MTR_CONTRAST_Y );
+        Size = MAP_APPFONT ( MBOX_WIDTH , MBOX_HEIGHT ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_CONTRAST;
+        QuickHelpText [ en-US ] = "Specify the degree of difference between the lightest and darkest parts of the graphic.";
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		Minimum = -100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		SpinSize = 1 ;
+	};
+	FixedText FT_COLOR_MODE
+	{
+		Pos = MAP_APPFONT ( FT_COLOR_MODE_X, FT_COLOR_MODE_Y );
+        Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "Color ~mode:";
+	};
+	ListBox LB_COLOR_MODE
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( LBX_COLOR_MODE_X , LBX_COLOR_MODE_Y ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH , 100 ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_LB_COLORMODE;
+        QuickHelpText [ en-US ] = "Select the color mode of the graphic.";
+		TabStop = TRUE ;
+		DropDown = TRUE ;
+	};
+	FixedText FT_TRANSPARENT
+	{
+		Pos = MAP_APPFONT ( FT_TRANSPARENT_X, FT_TRANSPARENT_Y );
+        Size = MAP_APPFONT ( MBOX_WIDTH , TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Transparency:";
+	};
+	MetricField MTR_TRANSPARENT
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MTR_TRANS_X, MTR_TRANS_Y ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH ,MBOX_HEIGHT ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_TRANSP;
+        QuickHelpText [ en-US ] = "Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent.";
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		SpinSize = 1 ;
+	};	
+	MetricField MF_RED
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MF_RED_X + 10, MF_RED_Y ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH - 10,MBOX_HEIGHT ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_RED;
+        QuickHelpText [ en-US ] = "Red";
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		Minimum = -100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		SpinSize = 1 ;
+	};
+	MetricField MF_GREEN
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MF_GREEN_X + 10, MF_GREEN_Y ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_GREEN;
+        QuickHelpText [ en-US ] = "Green";
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		Minimum = -100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		SpinSize = 1 ;
+	};
+	MetricField MF_BLUE
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MF_BLUE_X + 10, MF_BLUE_Y ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_BLUE;
+        QuickHelpText [ en-US ] = "Blue";
+		TabStop = TRUE ;
+		Repeat = TRUE ;
+		Spin = TRUE ;
+		Maximum = 100 ;
+		Minimum = -100 ;
+		StrictFormat = TRUE ;
+		Unit = FUNIT_CUSTOM ;
+        CustomUnitText = "%" ;
+		SpinSize = 1 ;
+	};
+	MetricField MF_GAMMA
+	{
+		Border = TRUE ;
+        Pos = MAP_APPFONT ( MF_GAMMA_X + 10, MF_GAMMA_Y ) ;
+        Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
+        HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_GAMMA;
+        QuickHelpText [ en-US ] = "Specify the gamma value that affects the brightness of the midtone values.";
+		TabStop = TRUE;
+		Repeat = TRUE;
+		Spin = TRUE;
+		Minimum = 10;
+		Maximum = 1000;
+		DecimalDigits = 2;
+		SpinSize = 10;
+	};
+	Image IMG_NORMAL  
+    {
+	    ImageBitmap = Bitmap{File = "symphony/ColorModeNormal_16x16.png";};
+	}; 
+	Image IMG_BW
+    {
+	    ImageBitmap = Bitmap{File = "symphony/ColorModeBlackWhite_16x16.png";};
+	};
+	Image IMG_GRAY
+    {
+	    ImageBitmap = Bitmap{File = "symphony/ColorModeGrey_16x16.png";};
+	};
+	Image IMG_WATER
+    {
+	    ImageBitmap = Bitmap{File = "symphony/ColorModeWaterMark_16x16.png";};
+	};
+	FixedImage IMG_RED
+    {
+        Pos = MAP_APPFONT( MF_RED_X, MF_RED_Y );
+        Size = MAP_APPFONT( 10, 12 );
+        Fixed = Image
+        {
+            ImageBitmap = Bitmap { File = "symphony/AdjustColorRed_16x16.png"; };
+		};
+    };
+    FixedImage IMG_GREEN
+    {
+        Pos = MAP_APPFONT( MF_GREEN_X, MF_GREEN_Y );
+        Size = MAP_APPFONT( 10, 12 );
+        Fixed = Image
+        {
+            ImageBitmap = Bitmap { File = "symphony/AdjustColorGreen_16x16.png"; };
+		};
+    };
+	FixedImage IMG_BLUE
+    {
+        Pos = MAP_APPFONT( MF_BLUE_X, MF_BLUE_Y );
+        Size = MAP_APPFONT( 10, 12 );
+        Fixed = Image
+        {
+            ImageBitmap = Bitmap { File = "symphony/AdjustColorBlue_16x16.png"; };
+		};
+    };
+	FixedImage IMG_GAMMA
+    {
+        Pos = MAP_APPFONT( MF_GAMMA_X, MF_GAMMA_Y );
+        Size = MAP_APPFONT( 10, 12 );
+        Fixed = Image
+        {
+            ImageBitmap = Bitmap { File = "symphony/AdjustColorGamma_16x16.png"; };
+		};
+    };
+	String STR_NORMAL
+	{
+		Text [ en-US ] = "Normal";
+	};
+	String STR_BW
+	{
+		Text [ en-US ] = "Black/White";
+	};
+	String STR_GRAY
+	{
+		Text [ en-US ] = "Grayscale";
+	};
+	String STR_WATER
+	{
+		Text [ en-US ] = "Watermark";
+	};
+};
+
+// eof