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 @@
$(eval $(call gb_UI_UI,cui))
$(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/effectspage \
......
......@@ -71,36 +71,37 @@ private:
SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
~SvxBackgroundTabPage();
FixedText aSelectTxt;
ListBox aLbSelect;
const String aStrBrowse;
const String aStrUnlinked;
FixedText aTblDesc;
ListBox aTblLBox;
ListBox aParaLBox;
Control aBorderWin;
ValueSet aBackgroundColorSet;
FixedLine aBackgroundColorBox;
BackgroundPreviewImpl* pPreviewWin1;
FixedText aColTransFT;///<color transparency
MetricField aColTransMF;
CheckBox aBtnPreview;
FixedText* m_pSelectTxt;
ListBox* m_pLbSelect;
FixedText* m_pTblDesc;
ListBox* m_pTblLBox;
ListBox* m_pParaLBox;
VclFrame* m_pBackGroundColorFrame;
ValueSet* m_pBackgroundColorSet;
BackgroundPreviewImpl* m_pPreviewWin1;
FixedText* m_pColTransFT;///<color transparency
MetricField* m_pColTransMF;
CheckBox* m_pBtnPreview;
// Background Bitmap ----------------------------------
FixedLine aGbFile;
PushButton aBtnBrowse;
CheckBox aBtnLink;
FixedLine aGbPosition;
RadioButton aBtnPosition;
RadioButton aBtnArea;
RadioButton aBtnTile;
SvxRectCtl aWndPosition;
FixedInfo aFtFile;
FixedLine aGraphTransFL;///<transparency of graphics
MetricField aGraphTransMF;
BackgroundPreviewImpl* pPreviewWin2;
VclContainer* m_pFileFrame;
PushButton* m_pBtnBrowse;
CheckBox* m_pBtnLink;
FixedText* m_pFtUnlinked;
FixedText* m_pFtFile;
VclContainer* m_pTypeFrame;
RadioButton* m_pBtnPosition;
RadioButton* m_pBtnArea;
RadioButton* m_pBtnTile;
SvxRectCtl* m_pWndPosition;
VclContainer* m_pGraphTransFrame;///<transparency of graphics
MetricField* m_pGraphTransMF;
BackgroundPreviewImpl* m_pPreviewWin2;
// DDListBox for Writer -------------------------------
//------------------------------------------------------
......
This diff is collapsed.
......@@ -42,9 +42,14 @@ class SvxTabPage : public SfxTabPage
{
public:
SvxTabPage( Window* pParent, ResId Id, const SfxItemSet& rInAttrs ) :
SfxTabPage( pParent, Id, rInAttrs ) {}
SvxTabPage(Window* pParent, ResId Id, const SfxItemSet& 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;
};
......@@ -95,6 +100,8 @@ protected:
public:
SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM,
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 void Paint( const Rectangle& rRect );
......
......@@ -18,6 +18,7 @@
*/
#include <tools/shl.hxx>
#include <vcl/builder.hxx>
#include <vcl/svapp.hxx>
#include <svx/xtable.hxx>
......@@ -81,6 +82,28 @@ SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt,
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()
......
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