Kaydet (Commit) 647b9681 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

cleanup sidebar: LinePropertyPanel

Change-Id: Ic8de5d12ee83713b04e947fbabfe1a1184f868ca
üst 6ce97778
...@@ -42,19 +42,23 @@ class ListBox; ...@@ -42,19 +42,23 @@ class ListBox;
class ToolBox; class ToolBox;
class FloatingWindow; class FloatingWindow;
namespace { namespace
#define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE "PopupPanel_LineWidth" {
#define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE "PopupPanel_LineWidth"
} //end of anonymous namespace } //end of anonymous namespace
namespace svx { namespace sidebar { namespace svx
{
namespace sidebar
{
class PopupContainer; class PopupContainer;
class LineWidthControl; class LineWidthControl;
class LinePropertyPanel : public PanelLayout,
class LinePropertyPanel public sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
: public PanelLayout,
public ::sfx2::sidebar::ControllerItem::ItemUpdateReceiverInterface
{ {
public: public:
static LinePropertyPanel* Create( static LinePropertyPanel* Create(
...@@ -81,53 +85,54 @@ public: ...@@ -81,53 +85,54 @@ public:
private: private:
//ui controls //ui controls
FixedText* mpFTWidth; FixedText* mpFTWidth;
ToolBox* mpTBWidth; ToolBox* mpTBWidth;
FixedText* mpFTStyle; FixedText* mpFTStyle;
ListBox* mpLBStyle; ListBox* mpLBStyle;
FixedText* mpFTTrancparency; FixedText* mpFTTrancparency;
MetricField* mpMFTransparent; MetricField* mpMFTransparent;
FixedText* mpFTArrow; FixedText* mpFTArrow;
ListBox* mpLBStart; ListBox* mpLBStart;
ListBox* mpLBEnd; ListBox* mpLBEnd;
FixedText* mpFTEdgeStyle; FixedText* mpFTEdgeStyle;
ListBox* mpLBEdgeStyle; ListBox* mpLBEdgeStyle;
FixedText* mpFTCapStyle; FixedText* mpFTCapStyle;
ListBox* mpLBCapStyle; ListBox* mpLBCapStyle;
//ControllerItem //ControllerItem
::sfx2::sidebar::ControllerItem maStyleControl; sfx2::sidebar::ControllerItem maStyleControl;
::sfx2::sidebar::ControllerItem maDashControl; sfx2::sidebar::ControllerItem maDashControl;
::sfx2::sidebar::ControllerItem maWidthControl; sfx2::sidebar::ControllerItem maWidthControl;
::sfx2::sidebar::ControllerItem maStartControl; sfx2::sidebar::ControllerItem maStartControl;
::sfx2::sidebar::ControllerItem maEndControl; sfx2::sidebar::ControllerItem maEndControl;
::sfx2::sidebar::ControllerItem maLineEndListControl; sfx2::sidebar::ControllerItem maLineEndListControl;
::sfx2::sidebar::ControllerItem maLineStyleListControl; sfx2::sidebar::ControllerItem maLineStyleListControl;
::sfx2::sidebar::ControllerItem maTransControl; sfx2::sidebar::ControllerItem maTransControl;
::sfx2::sidebar::ControllerItem maEdgeStyle; sfx2::sidebar::ControllerItem maEdgeStyle;
::sfx2::sidebar::ControllerItem maCapStyle; sfx2::sidebar::ControllerItem maCapStyle;
::boost::scoped_ptr< XLineStyleItem > mpStyleItem; boost::scoped_ptr<XLineStyleItem> mpStyleItem;
::boost::scoped_ptr< XLineDashItem > mpDashItem; boost::scoped_ptr<XLineDashItem> mpDashItem;
sal_uInt16 mnTrans;
SfxMapUnit meMapUnit; sal_uInt16 mnTrans;
sal_Int32 mnWidthCoreValue; SfxMapUnit meMapUnit;
XLineEndListRef mxLineEndList; sal_Int32 mnWidthCoreValue;
XDashListRef mxLineStyleList; XLineEndListRef mxLineEndList;
::boost::scoped_ptr< XLineStartItem > mpStartItem; XDashListRef mxLineStyleList;
::boost::scoped_ptr< XLineEndItem > mpEndItem; boost::scoped_ptr<XLineStartItem> mpStartItem;
boost::scoped_ptr<XLineEndItem> mpEndItem;
//popup windows //popup windows
LineWidthPopup maLineWidthPopup; LineWidthPopup maLineWidthPopup;
// images from resource // images from resource
Image maIMGNone; Image maIMGNone;
// multi-images // multi-images
::boost::scoped_array<Image> mpIMGWidthIcon; boost::scoped_array<Image> mpIMGWidthIcon;
css::uno::Reference< css::frame::XFrame > mxFrame; css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings; SfxBindings* mpBindings;
/// bitfield /// bitfield
bool mbWidthValuable : 1; bool mbWidthValuable : 1;
......
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