Kaydet (Commit) 77f6c7bb authored tarafından Caolán McNamara's avatar Caolán McNamara

split out background page and adapt code to .ui

I've being putting this one off for a while as its a complicated
set of hidden pieces shows for different background types

format->frame->background shows transparency option
table->properties->background shows "for cell/table/row" options
flipping as graphic/color should show different contents

Change-Id: I4a63d3bbe8898ad2421d6ddef011da9ae67b5a4f
üst a17a052e
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
$(eval $(call gb_UI_UI,cui)) $(eval $(call gb_UI_UI,cui))
$(eval $(call gb_UI_add_uifiles,cui,\ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \ cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/charnamepage \ cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/effectspage \ cui/uiconfig/ui/effectspage \
......
...@@ -71,36 +71,37 @@ private: ...@@ -71,36 +71,37 @@ private:
SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ); SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
~SvxBackgroundTabPage(); ~SvxBackgroundTabPage();
FixedText aSelectTxt; FixedText* m_pSelectTxt;
ListBox aLbSelect; ListBox* m_pLbSelect;
const String aStrBrowse; FixedText* m_pTblDesc;
const String aStrUnlinked; ListBox* m_pTblLBox;
FixedText aTblDesc; ListBox* m_pParaLBox;
ListBox aTblLBox;
ListBox aParaLBox; VclFrame* m_pBackGroundColorFrame;
Control aBorderWin; ValueSet* m_pBackgroundColorSet;
ValueSet aBackgroundColorSet; BackgroundPreviewImpl* m_pPreviewWin1;
FixedLine aBackgroundColorBox;
BackgroundPreviewImpl* pPreviewWin1; FixedText* m_pColTransFT;///<color transparency
MetricField* m_pColTransMF;
FixedText aColTransFT;///<color transparency CheckBox* m_pBtnPreview;
MetricField aColTransMF;
CheckBox aBtnPreview;
// Background Bitmap ---------------------------------- // Background Bitmap ----------------------------------
FixedLine aGbFile; VclContainer* m_pFileFrame;
PushButton aBtnBrowse; PushButton* m_pBtnBrowse;
CheckBox aBtnLink; CheckBox* m_pBtnLink;
FixedLine aGbPosition; FixedText* m_pFtUnlinked;
RadioButton aBtnPosition; FixedText* m_pFtFile;
RadioButton aBtnArea;
RadioButton aBtnTile; VclContainer* m_pTypeFrame;
SvxRectCtl aWndPosition; RadioButton* m_pBtnPosition;
FixedInfo aFtFile; RadioButton* m_pBtnArea;
RadioButton* m_pBtnTile;
FixedLine aGraphTransFL;///<transparency of graphics SvxRectCtl* m_pWndPosition;
MetricField aGraphTransMF;
VclContainer* m_pGraphTransFrame;///<transparency of graphics
BackgroundPreviewImpl* pPreviewWin2; MetricField* m_pGraphTransMF;
BackgroundPreviewImpl* m_pPreviewWin2;
// DDListBox for Writer ------------------------------- // DDListBox for Writer -------------------------------
//------------------------------------------------------ //------------------------------------------------------
......
This diff is collapsed.
...@@ -42,9 +42,14 @@ class SvxTabPage : public SfxTabPage ...@@ -42,9 +42,14 @@ class SvxTabPage : public SfxTabPage
{ {
public: public:
SvxTabPage( Window* pParent, ResId Id, const SfxItemSet& rInAttrs ) : SvxTabPage(Window* pParent, ResId Id, const SfxItemSet& rInAttrs)
SfxTabPage( pParent, Id, rInAttrs ) {} : SfxTabPage(pParent, Id, rInAttrs)
{
}
SvxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
: SfxTabPage(pParent, rID, rUIXMLDescription, rAttrSet)
{
}
virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) = 0; virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) = 0;
}; };
...@@ -95,6 +100,8 @@ protected: ...@@ -95,6 +100,8 @@ protected:
public: public:
SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM, SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM,
sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT ); sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
SvxRectCtl( Window* pParent, RECT_POINT eRpt = RP_MM,
sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
virtual ~SvxRectCtl(); virtual ~SvxRectCtl();
virtual void Paint( const Rectangle& rRect ); virtual void Paint( const Rectangle& rRect );
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <tools/shl.hxx> #include <tools/shl.hxx>
#include <vcl/builder.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <svx/xtable.hxx> #include <svx/xtable.hxx>
...@@ -81,6 +82,28 @@ SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt, ...@@ -81,6 +82,28 @@ SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt,
Resize_Impl(); Resize_Impl();
} }
SvxRectCtl::SvxRectCtl(Window* pParent, RECT_POINT eRpt,
sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle)
: Control(pParent, WB_BORDER | WB_TABSTOP)
, pAccContext(NULL)
, nBorderWidth(nBorder)
, nRadius(nCircle)
, eDefRP(eRpt)
, eCS(eStyle)
, pBitmap(NULL)
, m_nState(0)
, mbCompleteDisable(false)
{
SetMapMode(MAP_100TH_MM);
Resize_Impl();
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRectCtl(Window *pParent, VclBuilder::stringmap &)
{
return new SvxRectCtl(pParent);
}
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SvxRectCtl::~SvxRectCtl() SvxRectCtl::~SvxRectCtl()
......
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