Kaydet (Commit) 5525690f authored tarafından Katarina Behrens's avatar Katarina Behrens

Simplify: group widgets and enable them all at once

Change-Id: I2140cf83886654033d8fcb2acfb651041f24fa0d
üst 618fd9d9
...@@ -190,6 +190,8 @@ LinePropertyPanel::LinePropertyPanel( ...@@ -190,6 +190,8 @@ LinePropertyPanel::LinePropertyPanel(
get(mpLBEdgeStyle, "edgestyle"); get(mpLBEdgeStyle, "edgestyle");
get(mpFTCapStyle, "caplabel"); get(mpFTCapStyle, "caplabel");
get(mpLBCapStyle, "linecapstyle"); get(mpLBCapStyle, "linecapstyle");
get(mpGridLineProps, "lineproperties");
get(mpBoxArrowProps, "arrowproperties");
Initialize(); Initialize();
} }
...@@ -783,38 +785,10 @@ VclPtr<PopupControl> LinePropertyPanel::CreateLineWidthPopupControl (PopupContai ...@@ -783,38 +785,10 @@ VclPtr<PopupControl> LinePropertyPanel::CreateLineWidthPopupControl (PopupContai
void LinePropertyPanel::ActivateControls() void LinePropertyPanel::ActivateControls()
{ {
const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos()); const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos());
if( 0 == nPos ) bool bLineStyle( nPos != 0 );
{
mpFTWidth->Disable(); mpGridLineProps->Enable( bLineStyle );
mpTBWidth->Disable(); mpBoxArrowProps->Enable( bLineStyle );
mpFTColor->Disable();
mpLBColor->Disable();
mpFTTransparency->Disable();
mpMFTransparent->Disable();
mpFTArrow->Disable();
mpLBStart->Disable();
mpLBEnd->Disable();
mpFTEdgeStyle->Disable();
mpLBEdgeStyle->Disable();
mpFTCapStyle->Disable();
mpLBCapStyle->Disable();
}
else
{
mpFTWidth->Enable();
mpTBWidth->Enable();
mpFTColor->Enable();
mpLBColor->Enable();
mpFTTransparency->Enable();
mpMFTransparent->Enable();
mpFTArrow->Enable();
mpLBStart->Enable();
mpLBEnd->Enable();
mpFTEdgeStyle->Enable();
mpLBEdgeStyle->Enable();
mpFTCapStyle->Enable();
mpLBCapStyle->Enable();
}
} }
void LinePropertyPanel::EndLineWidthPopupMode() void LinePropertyPanel::EndLineWidthPopupMode()
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/ControllerItem.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include <vcl/field.hxx> #include <vcl/field.hxx>
#include <vcl/layout.hxx>
#include <memory> #include <memory>
#include <svx/sidebar/PanelLayout.hxx> #include <svx/sidebar/PanelLayout.hxx>
#include <svx/xtable.hxx> #include <svx/xtable.hxx>
...@@ -108,6 +109,8 @@ private: ...@@ -108,6 +109,8 @@ private:
VclPtr<ListBox> mpLBEdgeStyle; VclPtr<ListBox> mpLBEdgeStyle;
VclPtr<FixedText> mpFTCapStyle; VclPtr<FixedText> mpFTCapStyle;
VclPtr<ListBox> mpLBCapStyle; VclPtr<ListBox> mpLBCapStyle;
VclPtr<VclGrid> mpGridLineProps;
VclPtr<VclVBox> mpBoxArrowProps;
//ControllerItem //ControllerItem
sfx2::sidebar::ControllerItem maStyleControl; sfx2::sidebar::ControllerItem maStyleControl;
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment