Author: alg
Date: Thu Feb 21 10:23:04 2013
New Revision: 1448568
URL: http://svn.apache.org/r1448568
Log:
i121420 Added Background windows for ToolBoxes
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
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=1448568&r1=1448567&r2=1448568&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 10:23:04 2013
@@ -636,11 +636,13 @@ AreaPropertyPanel::AreaPropertyPanel(
mpColorTextFT(new FixedText(this, SVX_RES(FT_COLOR_LIST))),
mpLbFillType(new SvxFillTypeBox(this)),
mpLbFillAttr(new SvxFillAttrBox(this)),
- mpToolBoxColor(sfx2::sidebar::ControlFactory::CreateToolBox(this,
SVX_RES(TB_COLOR))),
+
mpToolBoxColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+
mpToolBoxColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpToolBoxColorBackground.get(),
SVX_RES(TB_COLOR))),
mpTrspTextFT(new FixedText(this, SVX_RES(FL_TRSP_TEXT))),
mpLBTransType(new ListBox(this, SVX_RES(LB_TRGR_TYPES))),
mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))),
-
mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(this,SVX_RES(BTN_GRADIENT))),
+
mpBTNGradientBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+
mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(mpBTNGradientBackground.get(),
SVX_RES(BTN_GRADIENT))),
mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR,
TBI_COLOR, mpToolBoxColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)),
mpStyleItem(),
mpColorItem(),
@@ -699,6 +701,9 @@ AreaPropertyPanel::AreaPropertyPanel(
AreaPropertyPanel::~AreaPropertyPanel()
{
+ // Destroy the background windows of the toolboxes.
+ mpToolBoxColorBackground.reset();
+ mpBTNGradientBackground.reset();
}
//////////////////////////////////////////////////////////////////////////////
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx?rev=1448568&r1=1448567&r2=1448568&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
Thu Feb 21 10:23:04 2013
@@ -103,10 +103,12 @@ private:
::boost::scoped_ptr< FixedText > mpColorTextFT;
::boost::scoped_ptr< SvxFillTypeBox > mpLbFillType;
::boost::scoped_ptr< SvxFillAttrBox > mpLbFillAttr;
+ ::boost::scoped_ptr< Window >
mpToolBoxColorBackground;
::boost::scoped_ptr< ToolBox > mpToolBoxColor; // for
new color picker
::boost::scoped_ptr< FixedText > mpTrspTextFT;
::boost::scoped_ptr< ListBox > mpLBTransType;
::boost::scoped_ptr< MetricField > mpMTRTransparent;
+ ::boost::scoped_ptr< Window >
mpBTNGradientBackground;
::boost::scoped_ptr< ToolBox > mpBTNGradient;
::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > mpColorUpdater;
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx?rev=1448568&r1=1448567&r2=1448568&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
Thu Feb 21 10:23:04 2013
@@ -1262,11 +1262,14 @@ LinePropertyPanel::LinePropertyPanel(
pParent,
SVX_RES(RID_SIDEBAR_LINE_PANEL)),
mpFTWidth(new FixedText(this, SVX_RES(FT_WIDTH))),
- mpTBWidth(sfx2::sidebar::ControlFactory::CreateToolBox(this,
SVX_RES(TB_WIDTH))),
+
mpTBWidthBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+
mpTBWidth(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBWidthBackground.get(),
SVX_RES(TB_WIDTH))),
mpFTColor(new FixedText(this, SVX_RES(FT_COLOR))),
- mpTBColor(sfx2::sidebar::ControlFactory::CreateToolBox(this,
SVX_RES(TB_COLOR))),
+
mpTBColorBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+
mpTBColor(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBColorBackground.get(),
SVX_RES(TB_COLOR))),
mpFTStyle(new FixedText(this, SVX_RES(FT_STYLE))),
- mpTBStyle(sfx2::sidebar::ControlFactory::CreateToolBox(this,
SVX_RES(TB_STYLE))),
+
mpTBStyleBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+
mpTBStyle(sfx2::sidebar::ControlFactory::CreateToolBox(mpTBStyleBackground.get(),
SVX_RES(TB_STYLE))),
mpFTTrancparency(new FixedText(this, SVX_RES(FT_TRANSPARENT))),
mpMFTransparent(new MetricField(this, SVX_RES(MF_TRANSPARENT))),
mpFTArrow(new FixedText(this, SVX_RES(FT_ARROW))),
@@ -1321,6 +1324,10 @@ LinePropertyPanel::LinePropertyPanel(
LinePropertyPanel::~LinePropertyPanel()
{
+ // Destroy the background windows of the toolboxes.
+ mpTBWidthBackground.reset();
+ mpTBColorBackground.reset();
+ mpTBStyleBackground.reset();
}
//////////////////////////////////////////////////////////////////////////////
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx?rev=1448568&r1=1448567&r2=1448568&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
Thu Feb 21 10:23:04 2013
@@ -82,10 +82,13 @@ public:
private:
//ui controls
::boost::scoped_ptr< FixedText > mpFTWidth;
+ ::boost::scoped_ptr< Window >
mpTBWidthBackground;
::boost::scoped_ptr< ToolBox > mpTBWidth;
::boost::scoped_ptr< FixedText > mpFTColor;
+ ::boost::scoped_ptr< Window >
mpTBColorBackground;
::boost::scoped_ptr< ToolBox > mpTBColor;
::boost::scoped_ptr< FixedText > mpFTStyle;
+ ::boost::scoped_ptr< Window >
mpTBStyleBackground;
::boost::scoped_ptr< ToolBox > mpTBStyle;
::boost::scoped_ptr< FixedText > mpFTTrancparency;
::boost::scoped_ptr< MetricField > mpMFTransparent;
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx?rev=1448568&r1=1448567&r2=1448568&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
Thu Feb 21 10:23:04 2013
@@ -728,7 +728,8 @@ TransformationPropertyPanel::Transformat
mpMtrAngle(new MetricBox(this, SVX_RES(MTR_FLD_ANGLE))),
mpDial(new DialControl(this, SVX_RES(DIAL_CONTROL), true)),
mpFtFlip(new FixedText(this, SVX_RES(FT_FLIP))),
- mpFlipTbx(sfx2::sidebar::ControlFactory::CreateToolBox(this,
SVX_RES(TBX_FLIP))),
+
mpFlipTbxBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)),
+
mpFlipTbx(sfx2::sidebar::ControlFactory::CreateToolBox(mpFlipTbxBackground.get(),
SVX_RES(TBX_FLIP))),
maRect(),
mpView(0),
mlOldWidth(1),
@@ -776,6 +777,9 @@ TransformationPropertyPanel::Transformat
TransformationPropertyPanel::~TransformationPropertyPanel()
{
mbInDestructor = true;
+
+ // Destroy the background windows of the toolboxes.
+ mpFlipTbxBackground.reset();
}
//////////////////////////////////////////////////////////////////////////////
Modified:
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx?rev=1448568&r1=1448567&r2=1448568&view=diff
==============================================================================
---
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
(original)
+++
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
Thu Feb 21 10:23:04 2013
@@ -102,6 +102,7 @@ private:
//flip
::boost::scoped_ptr< FixedText > mpFtFlip;
+ ::boost::scoped_ptr< Window > mpFlipTbxBackground;
::boost::scoped_ptr< ToolBox > mpFlipTbx;
// Internal variables
