You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/02/21 14:32:22 UTC

svn commit: r1448637 - in /openoffice/branches/sidebar/main: default_images/svx/res/symphony/ officecfg/registry/data/org/openoffice/Office/UI/ svx/ svx/inc/svx/ svx/source/sidebar/ svx/source/sidebar/geometry/

Author: alg
Date: Thu Feb 21 13:32:22 2013
New Revision: 1448637

URL: http://svn.apache.org/r1448637
Log:
i121420 first version of GraphicPropertyPanel, some corrections

Added:
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png   (with props)
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png   (with props)
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png   (with props)
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorRed_16x16.png   (with props)
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png   (with props)
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeGrey_16x16.png   (with props)
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeNormal_16x16.png   (with props)
    openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png   (with props)
    openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx   (with props)
    openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hrc   (with props)
    openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx   (with props)
    openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.src   (with props)
Modified:
    openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
    openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk
    openoffice/branches/sidebar/main/svx/Library_svx.mk
    openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
    openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
    openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorRed_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorRed_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorRed_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/AdjustColorRed_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeGrey_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeGrey_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeGrey_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeGrey_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeNormal_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeNormal_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeNormal_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeNormal_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png?rev=1448637&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/branches/sidebar/main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1448637&r1=1448636&r2=1448637&view=diff
==============================================================================
Binary files - no diff available.

Modified: openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk?rev=1448637&r1=1448636&r2=1448637&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/AllLangResTarget_svx.mk Thu Feb 21 13:32:22 2013
@@ -78,6 +78,7 @@ $(eval $(call gb_SrsTarget_add_files,svx
     svx/source/items/svxitems.src \
     svx/source/mnuctrls/mnuctrls.src \
     svx/source/sidebar/geometry/AreaPropertyPanel.src \
+    svx/source/sidebar/geometry/GraphicPropertyPanel.src \
     svx/source/sidebar/geometry/LinePropertyPanel.src \
     svx/source/sidebar/geometry/TransformationPropertyPanel.src \
     svx/source/sidebar/text/TextPropertyPanel.src \

Modified: openoffice/branches/sidebar/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/Library_svx.mk?rev=1448637&r1=1448636&r2=1448637&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/Library_svx.mk (original)
+++ openoffice/branches/sidebar/main/svx/Library_svx.mk Thu Feb 21 13:32:22 2013
@@ -174,6 +174,7 @@ $(eval $(call gb_Library_add_exception_o
     svx/source/sidebar/text/SvxSBFontNameBox \
     svx/source/sidebar/text/TextPropertyPanel \
     svx/source/sidebar/geometry/AreaPropertyPanel \
+    svx/source/sidebar/geometry/GraphicPropertyPanel \
     svx/source/sidebar/geometry/LinePropertyPanel \
     svx/source/sidebar/geometry/TransformationPropertyPanel \
     svx/source/sidebar/tools/PropertyPanelTools \

Modified: openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc?rev=1448637&r1=1448636&r2=1448637&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc Thu Feb 21 13:32:22 2013
@@ -393,6 +393,7 @@
 #define RID_POPUPPANEL_LINEPAGE_WIDTH       (RID_SVX_START + 298)
 
 #define RID_SIDEBAR_TRANSFORMATION_PANEL    (RID_SVX_START + 299)
+#define RID_SIDEBAR_GRAPHIC_PANEL           (RID_SVX_START + 300)
 
 // !!! please update RID_SVX_FIRSTFREE !!! see line 46
 

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx?rev=1448637&r1=1448636&r2=1448637&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/PanelFactory.cxx Thu Feb 21 13:32:22 2013
@@ -23,6 +23,7 @@
 
 #include <text/TextPropertyPanel.hxx>
 #include <geometry/AreaPropertyPanel.hxx>
+#include <geometry/GraphicPropertyPanel.hxx>
 #include <geometry/LinePropertyPanel.hxx>
 #include <geometry/TransformationPropertyPanel.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
@@ -142,6 +143,15 @@ Reference<ui::XUIElement> SAL_CALL Panel
             pPanel,
             ::boost::bind(&AreaPropertyPanel::ShowMenu, pPanel));
     }
+    else if (rsResourceURL.endsWithAsciiL("/GraphicPropertyPanel", strlen("/GraphicPropertyPanel")))
+    {
+        GraphicPropertyPanel* pPanel = GraphicPropertyPanel::Create(pParentWindow, xFrame, pBindings);
+        xElement = sfx2::sidebar::SidebarPanelBase::Create(
+            rsResourceURL,
+            xFrame,
+            pPanel,
+            ::boost::function<void(void)>());
+    }
     else if (rsResourceURL.endsWithAsciiL("/LinePropertyPanel", strlen("/LinePropertyPanel")))
     {
         LinePropertyPanel* pPanel = LinePropertyPanel::Create(pParentWindow, xFrame, pBindings);

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx?rev=1448637&r1=1448636&r2=1448637&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx Thu Feb 21 13:32:22 2013
@@ -22,8 +22,8 @@
 #include <sfx2/sidebar/propertypanel.hrc>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include "AreaPropertyPanel.hxx"
-#include "AreaPropertyPanel.hrc"
+#include <AreaPropertyPanel.hxx>
+#include <AreaPropertyPanel.hrc>
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>

Added: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx?rev=1448637&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx Thu Feb 21 13:32:22 2013
@@ -0,0 +1,461 @@
+/**************************************************************
+ * 
+ * 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 <svl/intitem.hxx>
+//#include <sfx2/bindings.hxx>
+//#include <sfx2/dispatch.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
+
+    // IAccessible2 (?) not supported by AOO
+    // mpMtrRed->SetAccRelationLabeledBy(&maMtrRed);
+	// mpMtrGreen->SetAccRelationLabeledBy(&maMtrGreen);
+	// mpMtrBlue->SetAccRelationLabeledBy(&maMtrBlue);
+	// mpMtrGamma->SetAccRelationLabeledBy(&maMtrGamma);
+	// mpMtrBrightness->SetAccRelationLabeledBy(mpFtBrightness);	//7874
+	// mpMtrContrast->SetAccRelationLabeledBy(mpFtContrast);	//7874
+	// mpMtrTrans->SetAccRelationLabeledBy(mpFtTrans);	//7874
+	// mpLBColorMode->SetAccRelationLabeledBy(mpFtColorMode);	//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();
+			if(pState&&pState->ISA(SfxInt16Item))
+			{
+				sal_Int64 nBright = ((SfxInt16Item*)pState)->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();
+			if(pState&&pState->ISA(SfxInt16Item))
+			{
+				sal_Int64 nContrast = ((SfxInt16Item*)pState)->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();
+			if(pState&&pState->ISA(SfxUInt16Item))
+			{
+				sal_Int64 nTrans = ((SfxUInt16Item*)pState)->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();
+			if(pState&&pState->ISA(SfxUInt16Item))
+			{
+				sal_Int64 nTrans = ((SfxUInt16Item*)pState)->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();
+			if(pState&&pState->ISA(SfxInt16Item))
+			{
+				sal_Int64 nRed = ((SfxInt16Item*)pState)->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();
+			if(pState&&pState->ISA(SfxInt16Item))
+			{
+				sal_Int64 nGreen = ((SfxInt16Item*)pState)->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();
+			if(pState&&pState->ISA(SfxInt16Item))
+			{
+				sal_Int64 nBlue = ((SfxInt16Item*)pState)->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();
+			if(pState&&pState->ISA(SfxUInt32Item))
+			{
+				sal_Int64 nGamma = ((SfxUInt32Item*)pState)->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

Propchange: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx
------------------------------------------------------------------------------
    svn:executable = *

Added: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hrc?rev=1448637&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hrc (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hrc Thu Feb 21 13:32:22 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

Propchange: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hrc
------------------------------------------------------------------------------
    svn:executable = *

Added: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx?rev=1448637&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx Thu Feb 21 13:32:22 2013
@@ -0,0 +1,148 @@
+/**************************************************************
+ * 
+ * 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 <sfx2/sectionpage.hxx>
+//#include <svx/svxdllapi.h>
+#include <vcl/fixed.hxx>
+//#include <vcl/field.hxx>
+//#include <vcl/button.hxx>
+//#include <vcl/toolbox.hxx>
+//#include <svx/dlgctrl.hxx>
+//#include <svx/xbitmap.hxx>
+//#include <svx/xtable.hxx>
+#include <boost/scoped_ptr.hpp>
+
+//////////////////////////////////////////////////////////////////////////////
+// pedefines
+class FixedText;
+class MetricField;
+class ListBox;
+
+//////////////////////////////////////////////////////////////////////////////
+// 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

Propchange: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx
------------------------------------------------------------------------------
    svn:executable = *

Added: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.src?rev=1448637&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.src (added)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.src Thu Feb 21 13:32:22 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

Propchange: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.src
------------------------------------------------------------------------------
    svn:executable = *