Resolves: #i121420# merge sidebar feature

(cherry picked from commit 0a0a9b32aa5bf1ce2554ad37cbba3c7a105db2b5)

Conflicts:
chart2/source/controller/dialogs/dlg_View3D.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
chart2/source/controller/inc/ViewElementListProvider.hxx
chart2/source/controller/inc/dlg_View3D.hxx
chart2/source/controller/main/ShapeController.cxx
chart2/source/inc/chartview/DrawModelWrapper.hxx
chart2/source/view/main/DrawModelWrapper.cxx
cui/source/inc/border.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/sdrcelldlg.hxx
cui/source/inc/treeopt.hxx
cui/source/options/optchart.cxx
cui/source/options/optchart.hxx
cui/source/options/optcolor.cxx
cui/source/options/treeopt.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tplneend.cxx
editeng/inc/editeng/outliner.hxx
extensions/source/propctrlr/standardcontrol.cxx
framework/source/register/registerservices.cxx
offapi/com/sun/star/ui/makefile.mk
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
postprocess/packregistry/makefile.mk
reportdesign/source/ui/dlg/Condition.cxx
reportdesign/source/ui/misc/UITools.cxx
sc/inc/document.hxx
sc/inc/helpids.h
sc/inc/sc.hrc
sc/prj/build.lst
sc/sdi/scalc.sdi
sc/source/core/data/documen9.cxx
sc/source/core/data/drwlayer.cxx
sc/source/ui/app/scdll.cxx
sc/source/ui/app/typemap.cxx
sc/source/ui/dbgui/scendlg.cxx
sc/source/ui/docshell/docsh2.cxx
sc/source/ui/docshell/docsh4.cxx
sc/source/ui/drawfunc/chartsh.cxx
sc/source/ui/drawfunc/drawsh.cxx
sc/source/ui/drawfunc/drawsh2.cxx
sc/source/ui/drawfunc/drawsh4.cxx
sc/source/ui/drawfunc/drformsh.cxx
sc/source/ui/drawfunc/drtxtob.cxx
sc/source/ui/drawfunc/drtxtob1.cxx
sc/source/ui/drawfunc/drtxtob2.cxx
sc/source/ui/drawfunc/graphsh.cxx
sc/source/ui/drawfunc/oleobjsh.cxx
sc/source/ui/inc/chartsh.hxx
sc/source/ui/inc/formatsh.hxx
sc/source/ui/miscdlgs/tabbgcolordlg.cxx
sc/source/ui/navipi/navipi.cxx
sc/source/ui/optdlg/opredlin.cxx
sc/source/ui/optdlg/tpview.cxx
sc/source/ui/sidebar/makefile.mk
sc/source/ui/view/auditsh.cxx
sc/source/ui/view/cellsh.cxx
sc/source/ui/view/editsh.cxx
sc/source/ui/view/formatsh.cxx
sc/source/ui/view/pivotsh.cxx
sc/source/ui/view/tabvwsh.cxx
sc/util/makefile.mk
sd/inc/sdabstdlg.hxx
sd/prj/build.lst
sd/sdi/ToolPanelViewShell.sdi
sd/sdi/makefile.mk
sd/source/ui/accessibility/makefile.mk
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/dlg/PaneChildWindows.cxx
sd/source/ui/dlg/PaneShells.cxx
sd/source/ui/dlg/copydlg.cxx
sd/source/ui/dlg/navigatr.cxx
sd/source/ui/dlg/sddlgfact.cxx
sd/source/ui/dlg/sddlgfact.hxx
sd/source/ui/docshell/docshel3.cxx
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
sd/source/ui/framework/factories/TaskPanelFactory.cxx
sd/source/ui/framework/factories/TaskPanelFactory.hxx
sd/source/ui/framework/factories/ViewShellWrapper.cxx
sd/source/ui/framework/factories/makefile.mk
sd/source/ui/framework/module/ImpressModule.cxx
sd/source/ui/framework/module/ToolPanelModule.cxx
sd/source/ui/framework/tools/FrameworkHelper.cxx
sd/source/ui/func/fuolbull.cxx
sd/source/ui/inc/DrawViewShell.hxx
sd/source/ui/inc/PaneChildWindows.hxx
sd/source/ui/inc/celltempl.hxx
sd/source/ui/inc/copydlg.hxx
sd/source/ui/inc/dlgpage.hxx
sd/source/ui/inc/framework/FrameworkHelper.hxx
sd/source/ui/inc/prltempl.hxx
sd/source/ui/inc/tabtempl.hxx
sd/source/ui/inc/taskpane/ILayoutableWindow.hxx
sd/source/ui/inc/taskpane/PanelId.hxx
sd/source/ui/inc/tpaction.hxx
sd/source/ui/sidebar/AllMasterPagesSelector.cxx
sd/source/ui/sidebar/AllMasterPagesSelector.hxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
sd/source/ui/sidebar/DocumentHelper.cxx
sd/source/ui/sidebar/DocumentHelper.hxx
sd/source/ui/sidebar/LayoutMenu.cxx
sd/source/ui/sidebar/LayoutMenu.hxx
sd/source/ui/sidebar/MasterPageContainer.cxx
sd/source/ui/sidebar/MasterPageContainer.hxx
sd/source/ui/sidebar/MasterPageContainerFiller.cxx
sd/source/ui/sidebar/MasterPageContainerFiller.hxx
sd/source/ui/sidebar/MasterPageContainerProviders.cxx
sd/source/ui/sidebar/MasterPageContainerProviders.hxx
sd/source/ui/sidebar/MasterPageContainerQueue.cxx
sd/source/ui/sidebar/MasterPageContainerQueue.hxx
sd/source/ui/sidebar/MasterPageDescriptor.cxx
sd/source/ui/sidebar/MasterPageDescriptor.hxx
sd/source/ui/sidebar/MasterPageObserver.cxx
sd/source/ui/sidebar/MasterPagesSelector.cxx
sd/source/ui/sidebar/MasterPagesSelector.hxx
sd/source/ui/sidebar/PreviewValueSet.cxx
sd/source/ui/sidebar/PreviewValueSet.hxx
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
sd/source/ui/sidebar/SidebarShellManager.cxx
sd/source/ui/sidebar/SlideTransitionPanel.hxx
sd/source/ui/sidebar/makefile.mk
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
sd/source/ui/table/TableDesignPane.hxx
sd/source/ui/toolpanel/ControlContainer.cxx
sd/source/ui/toolpanel/ControlContainerDescriptor.hxx
sd/source/ui/toolpanel/MethodGuard.hxx
sd/source/ui/toolpanel/ScrollPanel.cxx
sd/source/ui/toolpanel/SlideSorterCacheDisplay.cxx
sd/source/ui/toolpanel/SubToolPanel.cxx
sd/source/ui/toolpanel/TaskPaneFocusManager.cxx
sd/source/ui/toolpanel/TaskPaneTreeNode.cxx
sd/source/ui/toolpanel/TitleBar.cxx
sd/source/ui/toolpanel/TitledControl.cxx
sd/source/ui/toolpanel/ToolPanel.cxx
sd/source/ui/toolpanel/ToolPanel.hxx
sd/source/ui/toolpanel/ToolPanelFactory.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.cxx
sd/source/ui/toolpanel/ToolPanelUIElement.hxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/toolpanel/controls/CustomAnimationPanel.cxx
sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
sd/source/ui/unoidl/UnoDocumentSettings.cxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/drviews3.cxx
sd/source/ui/view/drviews7.cxx
sd/source/ui/view/drviewsa.cxx
sd/source/ui/view/drviewsf.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/sdview.cxx
sd/source/ui/view/viewshel.cxx
sd/uiconfig/sdraw/menubar/menubar.xml
sd/util/makefile.mk
sfx2/Package_inc.mk
sfx2/inc/sfx2/sfx.hrc
sfx2/inc/sfx2/sfxsids.hrc
sfx2/source/control/bindings.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
svx/AllLangResTarget_svx.mk
svx/Package_inc.mk
svx/inc/svx/XPropertyTable.hxx
svx/inc/svx/bmpmask.hxx
svx/inc/svx/colrctrl.hxx
svx/inc/svx/dialogs.hrc
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/dlgutil.hxx
svx/inc/svx/drawitem.hxx
svx/inc/svx/fontwork.hxx
svx/inc/svx/galbrws.hxx
svx/inc/svx/sdr/table/tablecontroller.hxx
svx/inc/svx/svdmodel.hxx
svx/inc/svx/svdstr.hrc
svx/inc/svx/svxids.hrc
svx/inc/svx/svxitems.hrc
svx/inc/svx/xattr.hxx
svx/inc/svx/xflgrit.hxx
svx/inc/svx/xflhtit.hxx
svx/inc/svx/xit.hxx
svx/inc/svx/xlineit.hxx
svx/inc/svx/xlndsit.hxx
svx/inc/svx/xlnedit.hxx
svx/inc/svx/xlnstit.hxx
svx/inc/svx/xtable.hxx
svx/sdi/svx.sdi
svx/source/dialog/_bmpmask.cxx
svx/source/dialog/dialcontrol.cxx
svx/source/dialog/dlgctrl.cxx
svx/source/dialog/dlgutil.cxx
svx/source/dialog/fontwork.cxx
svx/source/gallery2/galbrws.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/gallery2/gallery1.cxx
svx/source/items/drawitem.cxx
svx/source/items/svxitems.src
svx/source/sdr/attribute/sdrformtextattribute.cxx
svx/source/sidebar/ColorPanel.hxx
svx/source/sidebar/EmptyPanel.hrc
svx/source/sidebar/EmptyPanel.hxx
svx/source/sidebar/gallery/GalleryPanel.hxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdmodel.cxx
svx/source/svdraw/svdogrp.cxx
svx/source/svdraw/svdstr.src
svx/source/tbxctrls/tbcontrl.cxx
svx/source/unodraw/XPropertyTable.cxx
svx/source/unodraw/unoctabl.cxx
svx/source/xoutdev/XPropertyEntry.cxx
svx/source/xoutdev/xattr.cxx
svx/source/xoutdev/xattr2.cxx
svx/source/xoutdev/xtabbtmp.cxx
svx/source/xoutdev/xtabcolr.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtabgrdt.cxx
svx/source/xoutdev/xtabhtch.cxx
svx/source/xoutdev/xtable.cxx
svx/source/xoutdev/xtablend.cxx
svx/util/svx.component
sw/inc/cmdid.h
sw/inc/docsh.hxx
sw/inc/editsh.hxx
sw/inc/helpid.h
sw/inc/rcid.hrc
sw/inc/swabstdlg.hxx
sw/inc/swcommands.h
sw/sdi/swriter.sdi
sw/source/core/doc/docdesc.cxx
sw/source/core/draw/drawdoc.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshdrw.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/docst.cxx
sw/source/ui/config/optpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/inc/tmpdlg.hxx
sw/source/ui/misc/pggrid.cxx
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/beziersh.cxx
sw/source/ui/shells/drawdlg.cxx
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drformsh.cxx
sw/source/ui/shells/drwbassh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/drwtxtsh.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/grfsh.cxx
sw/source/ui/shells/olesh.cxx
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtnum.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/uno/unofreg.cxx
sw/source/ui/utlui/navipi.cxx
sw/util/sw.component
vcl/inc/vcl/split.hxx
vcl/inc/vcl/window.hxx
vcl/inc/window.h
vcl/source/window/split.cxx
vcl/source/window/window.cxx
vcl/source/window/window4.cxx

Change-Id: Idebaff59f9d60e4e93290cefefdda4c5a1e9215e

Resolves: #i122194# Adapted license text in propertypanel.hrc

then renamed it to ResourceDefinitions.hrc

(cherry picked from commit e952d1401c1adc41934118ba7f542611ef9da11b)

Conflicts:
sfx2/Package_inc.mk
sfx2/source/sidebar/SidebarChildWindow.cxx
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.cxx
svx/source/sidebar/possize/PosSizePropertyPanel.cxx
sw/source/ui/sidebar/PagePropertyPanel.src
sw/source/ui/sidebar/WrapPropertyPanel.src

Change-Id: Ie009056a78ab108556717a501399c83b477b3548

Resolves: #i122194# finally I got the correct file name

Change-Id: If7a075af8c9a829f6f0a69f883c5c6d4ac97ba2a

More merge changes for optional sidebar:
revert toolpanel removal, restore and re-enable task pane
remove apparently un-used SidebarFactory module
add extra visibility annotation to ItemReceiverUpdate

4 files changed, 909 insertions, 0 deletions

diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
new file mode 100644
index 000000000000..1e5103d1a133
--- /dev/null
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -0,0 +1,455 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+#include <sfx2/sidebar/ResourceDefinitions.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),
+    mpBindings(pBindings)
+{
+    Initialize();
+    FreeResource();
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+GraphicPropertyPanel::~GraphicPropertyPanel()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+void GraphicPropertyPanel::Initialize()
+{
+    mpFtBrightness->SetBackground(Wallpaper());
+    mpFtContrast->SetBackground(Wallpaper());
+    mpFtColorMode->SetBackground(Wallpaper());
+    mpFtTrans->SetBackground(Wallpaper());
+
+    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_NOARG( GraphicPropertyPanel, ClickColorModeHdl )
+{
+    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::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
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc b/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc
new file mode 100644
index 000000000000..0ca1f5cee441
--- /dev/null
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hrc
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+// 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
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
new file mode 100644
index 000000000000..c5bd01cd9bf4
--- /dev/null
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -0,0 +1,123 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+#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>
+
+class FixedText;
+class MetricField;
+class ListBox;
+class FloatingWindow;
+
+
+namespace svx { namespace sidebar {
+
+class GraphicPropertyPanel
+:   public Control,
+    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 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;
+    SfxBindings*                                        mpBindings;
+
+    DECL_LINK( ModifyBrightnessHdl, void * );
+    DECL_LINK( ModifyContrastHdl, void * );
+    DECL_LINK( ModifyTransHdl, void * );
+    DECL_LINK( ClickColorModeHdl, void * );
+    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();
+};
+
+
+} } // end of namespace ::svx::sidebar
+
+#endif
+
+// eof
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.src b/svx/source/sidebar/graphic/GraphicPropertyPanel.src
new file mode 100644
index 000000000000..4946b61a656c
--- /dev/null
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.src
@@ -0,0 +1,253 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   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 .
+ */
+#include "GraphicPropertyPanel.hrc"
+#include <sfx2/sidebar/ResourceDefinitions.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