Skip to content

C
core
Kaydet (Commit) 13c71694 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert docking window RID_SVXDLG_FONTWORK to .ui 

This is the "old" pre OOo2 fontwork stuff, take the document from #i14297# to
see an example of this old fontwork object and use
tools->customize->add->format->fontwork to enable the fontwork dialog

Change-Id: Ic7151937f8dccd8bfaf146f6a058fc03c49632ae
üst 42addf58
Show whitespace changes
Inline Side-by-side
Showing with 745 additions and 671 deletions
include/svx/dialogs.hrc
Dosyayı görüntüle @ 13c71694
...@@ -174,9 +174,6 @@ ...@@ -174,9 +174,6 @@
// Menu for the ruler // Menu for the ruler
#define RID_SVXMN_RULER (RID_SVX_START + 92) #define RID_SVXMN_RULER (RID_SVX_START + 92)
// FontWork dialog
#define RID_SVXDLG_FONTWORK (RID_SVX_START + 93)
// for Toolbox-Control style // for Toolbox-Control style
#define RID_SVXTBX_STYLE (RID_SVX_START + 120) #define RID_SVXTBX_STYLE (RID_SVX_START + 120)
#define RID_SVX_STYLE_MENU (RID_SVX_START + 121) #define RID_SVX_STYLE_MENU (RID_SVX_START + 121)
...@@ -1086,9 +1083,13 @@ ...@@ -1086,9 +1083,13 @@
#define RID_SVXIMG_FONTWORK_ALIGN_RIGHT (RID_SVX_START + 1375) #define RID_SVXIMG_FONTWORK_ALIGN_RIGHT (RID_SVX_START + 1375)
#define RID_SVXIMG_FONTWORK_ALIGN_WORD (RID_SVX_START + 1376) #define RID_SVXIMG_FONTWORK_ALIGN_WORD (RID_SVX_START + 1376)
#define RID_SVXIMG_FONTWORK_ALIGN_STRETCH (RID_SVX_START + 1377) #define RID_SVXIMG_FONTWORK_ALIGN_STRETCH (RID_SVX_START + 1377)
#define RID_SVXIMG_SHADOW_ANGLE (RID_SVX_START + 1378)
#define RID_SVXIMG_SHADOW_SIZE (RID_SVX_START + 1379)
#define RID_SVXIMG_SHADOW_XDIST (RID_SVX_START + 1380)
#define RID_SVXIMG_SHADOW_YDIST (RID_SVX_START + 1381)
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!! // !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1378) #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1382)
// if we have _a_lot_ time, we should group the resource ids by type, instead // if we have _a_lot_ time, we should group the resource ids by type, instead
// of grouping them by semantics. The reason is that resource ids have to be // of grouping them by semantics. The reason is that resource ids have to be
......
include/svx/fontwork.hxx
Dosyayı görüntüle @ 13c71694
...@@ -91,36 +91,50 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow ...@@ -91,36 +91,50 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
SvxFontWorkControllerItem* pCtrlItems[CONTROLLER_COUNT]; SvxFontWorkControllerItem* pCtrlItems[CONTROLLER_COUNT];
ToolBox aTbxStyle; ToolBox* m_pTbxStyle;
ToolBox aTbxAdjust; ToolBox* m_pTbxAdjust;
FixedImage aFbDistance; MetricField* m_pMtrFldDistance;
MetricField aMtrFldDistance; MetricField* m_pMtrFldTextStart;
FixedImage aFbTextStart;
MetricField aMtrFldTextStart;
ToolBox aTbxShadow; ToolBox* m_pTbxShadow;
FixedImage aFbShadowX; FixedImage* m_pFbShadowX;
MetricField aMtrFldShadowX; MetricField* m_pMtrFldShadowX;
FixedImage aFbShadowY; FixedImage* m_pFbShadowY;
MetricField aMtrFldShadowY; MetricField* m_pMtrFldShadowY;
ColorLB aShadowColorLB; ColorLB* m_pShadowColorLB;
SfxBindings& rBindings; SfxBindings& rBindings;
Idle aInputIdle; Idle aInputIdle;
sal_uInt16 nLastStyleTbxId; sal_uInt16 nLastStyleTbxId;
sal_uInt16 nStyleOffId;
sal_uInt16 nStyleRotateId;
sal_uInt16 nStyleUprightId;
sal_uInt16 nStyleSlantXId;
sal_uInt16 nStyleSlantYId;
sal_uInt16 nLastAdjustTbxId; sal_uInt16 nLastAdjustTbxId;
sal_uInt16 nAdjustMirrorId;
sal_uInt16 nAdjustLeftId;
sal_uInt16 nAdjustCenterId;
sal_uInt16 nAdjustRightId;
sal_uInt16 nAdjustAutoSizeId;
sal_uInt16 nLastShadowTbxId; sal_uInt16 nLastShadowTbxId;
sal_uInt16 nShowFormId;
sal_uInt16 nOutlineId;
sal_uInt16 nShadowOffId;
sal_uInt16 nShadowNormalId;
sal_uInt16 nShadowSlantId;
long nSaveShadowX; long nSaveShadowX;
long nSaveShadowY; long nSaveShadowY;
long nSaveShadowAngle; long nSaveShadowAngle;
long nSaveShadowSize; long nSaveShadowSize;
ImageList maImageList;
XColorListRef pColorList; XColorListRef pColorList;
friend class SvxFontWorkChildWindow; friend class SvxFontWorkChildWindow;
...@@ -147,7 +161,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow ...@@ -147,7 +161,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
void SetShadowXVal_Impl(const XFormTextShadowXValItem*); void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
void SetShadowYVal_Impl(const XFormTextShadowYValItem*); void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
void ApplyImageList(); void ApplyImageList();
protected: protected:
...@@ -156,10 +169,8 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow ...@@ -156,10 +169,8 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
SfxChildAlignment eAlign ) SAL_OVERRIDE; SfxChildAlignment eAlign ) SAL_OVERRIDE;
public: public:
SvxFontWorkDialog( SfxBindings *pBindinx, SvxFontWorkDialog(SfxBindings *pBinding, SfxChildWindow *pCW,
SfxChildWindow *pCW, vcl::Window* pParent);
vcl::Window* pParent,
const ResId& rResId );
virtual ~SvxFontWorkDialog(); virtual ~SvxFontWorkDialog();
void SetColorList(const XColorListRef &pTable); void SetColorList(const XColorListRef &pTable);
......
svx/AllLangResTarget_svx.mk
Dosyayı görüntüle @ 13c71694
...@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ ...@@ -42,7 +42,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/dialog/compressgraphicdialog.src \ svx/source/dialog/compressgraphicdialog.src \
svx/source/dialog/dlgctrl.src \ svx/source/dialog/dlgctrl.src \
svx/source/dialog/docrecovery.src \ svx/source/dialog/docrecovery.src \
svx/source/dialog/fontwork.src \
svx/source/dialog/frmsel.src \ svx/source/dialog/frmsel.src \
svx/source/dialog/imapdlg.src \ svx/source/dialog/imapdlg.src \
svx/source/dialog/language.src \ svx/source/dialog/language.src \
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 13c71694
...@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ ...@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/deletefooterdialog \ svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/docking3deffects \ svx/uiconfig/ui/docking3deffects \
svx/uiconfig/ui/dockingcolorreplace \ svx/uiconfig/ui/dockingcolorreplace \
svx/uiconfig/ui/dockingfontwork \
svx/uiconfig/ui/docrecoverybrokendialog \ svx/uiconfig/ui/docrecoverybrokendialog \
svx/uiconfig/ui/docrecoveryprogressdialog \ svx/uiconfig/ui/docrecoveryprogressdialog \
svx/uiconfig/ui/docrecoveryrecoverdialog \ svx/uiconfig/ui/docrecoveryrecoverdialog \
......
svx/inc/helpid.hrc
Dosyayı görüntüle @ 13c71694
...@@ -37,21 +37,6 @@ ...@@ -37,21 +37,6 @@
#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" #define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE"
#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX" #define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX"
#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX" #define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX"
#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE"
#define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER"
#define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT"
#define HID_FONTWORK_TBI_ADJUST_MIRROR "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR"
#define HID_FONTWORK_TBI_ADJUST_RIGHT "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT"
#define HID_FONTWORK_TBI_OUTLINE "SVX_HID_FONTWORK_TBI_OUTLINE"
#define HID_FONTWORK_TBI_SHADOW_NORMAL "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL"
#define HID_FONTWORK_TBI_SHADOW_OFF "SVX_HID_FONTWORK_TBI_SHADOW_OFF"
#define HID_FONTWORK_TBI_SHADOW_SLANT "SVX_HID_FONTWORK_TBI_SHADOW_SLANT"
#define HID_FONTWORK_TBI_SHOWFORM "SVX_HID_FONTWORK_TBI_SHOWFORM"
#define HID_FONTWORK_TBI_STYLE_OFF "SVX_HID_FONTWORK_TBI_STYLE_OFF"
#define HID_FONTWORK_TBI_STYLE_ROTATE "SVX_HID_FONTWORK_TBI_STYLE_ROTATE"
#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX"
#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY"
#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT"
#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" #define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW"
#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" #define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW"
#define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD" #define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD"
......
svx/source/dialog/fontwork.cxx
Dosyayı görüntüle @ 13c71694
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "svx/dlgutil.hxx" #include "svx/dlgutil.hxx"
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#include "fontwork.hrc"
#include <svx/fontwork.hxx> #include <svx/fontwork.hxx>
#include <editeng/outlobj.hxx> #include <editeng/outlobj.hxx>
#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx>
...@@ -163,11 +162,9 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow ...@@ -163,11 +162,9 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
) : ) :
SfxChildWindow( _pParent, nId ) SfxChildWindow( _pParent, nId )
{ {
pWindow = new SvxFontWorkDialog( pBindings, this, _pParent, SvxFontWorkDialog* pDlg = new SvxFontWorkDialog(pBindings, this, _pParent);
SVX_RES( RID_SVXDLG_FONTWORK ) ); pWindow = pDlg;
SvxFontWorkDialog* pDlg = static_cast<SvxFontWorkDialog*>(pWindow);
eChildAlignment = SFX_ALIGN_NOALIGNMENT; eChildAlignment = SFX_ALIGN_NOALIGNMENT;
...@@ -175,42 +172,62 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow ...@@ -175,42 +172,62 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow
} }
// Floating Window to the attribution of text effects // Floating Window to the attribution of text effects
SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx,
SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
SfxChildWindow *pCW, SfxChildWindow *pCW,
vcl::Window* _pParent, vcl::Window* _pParent)
const ResId& rResId ) : : SfxDockingWindow(pBindinx, pCW, _pParent, "DockingFontwork", "svx/ui/dockingfontwork.ui")
SfxDockingWindow( pBindinx, pCW, _pParent, rResId ), , rBindings(*pBindinx)
, nLastStyleTbxId(0)
aTbxStyle (this, ResId(TBX_STYLE,*rResId.GetResMgr())), , nLastAdjustTbxId(0)
aTbxAdjust (this, ResId(TBX_ADJUST,*rResId.GetResMgr())), , nLastShadowTbxId(0)
, nSaveShadowX(0)
aFbDistance (this, ResId(FB_DISTANCE,*rResId.GetResMgr())), , nSaveShadowY(0)
aMtrFldDistance (this, ResId(MTR_FLD_DISTANCE,*rResId.GetResMgr())), , nSaveShadowAngle(450)
aFbTextStart (this, ResId(FB_TEXTSTART,*rResId.GetResMgr())), , nSaveShadowSize (100)
aMtrFldTextStart(this, ResId(MTR_FLD_TEXTSTART,*rResId.GetResMgr())),
aTbxShadow (this, ResId(TBX_SHADOW,*rResId.GetResMgr())),
aFbShadowX (this, ResId(FB_SHADOW_X,*rResId.GetResMgr())),
aMtrFldShadowX (this, ResId(MTR_FLD_SHADOW_X,*rResId.GetResMgr())),
aFbShadowY (this, ResId(FB_SHADOW_Y,*rResId.GetResMgr())),
aMtrFldShadowY (this, ResId(MTR_FLD_SHADOW_Y,*rResId.GetResMgr())),
aShadowColorLB (this, ResId(CLB_SHADOW_COLOR,*rResId.GetResMgr())),
rBindings (*pBindinx),
nLastStyleTbxId(0),
nLastAdjustTbxId(0),
nLastShadowTbxId(0),
nSaveShadowX (0),
nSaveShadowY (0),
nSaveShadowAngle(450),
nSaveShadowSize (100),
maImageList (ResId(IL_FONTWORK,*rResId.GetResMgr()))
{ {
FreeResource(); get(m_pMtrFldDistance, "distance");
get(m_pMtrFldTextStart, "indent");
get(m_pMtrFldShadowX, "distancex");
get(m_pMtrFldShadowY, "distancey");
get(m_pShadowColorLB, "color");
get(m_pFbShadowX, "shadowx");
get(m_pFbShadowY, "shadowy");
get(m_pTbxStyle, "style");
nStyleOffId = m_pTbxStyle->GetItemId(0);
m_pTbxStyle->SetItemBits(nStyleOffId, ToolBoxItemBits::AUTOCHECK);
nStyleRotateId = m_pTbxStyle->GetItemId(1);
m_pTbxStyle->SetItemBits(nStyleRotateId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nStyleUprightId = m_pTbxStyle->GetItemId(2);
m_pTbxStyle->SetItemBits(nStyleUprightId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nStyleSlantXId = m_pTbxStyle->GetItemId(3);
m_pTbxStyle->SetItemBits(nStyleSlantXId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nStyleSlantYId = m_pTbxStyle->GetItemId(4);
m_pTbxStyle->SetItemBits(nStyleSlantYId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
get(m_pTbxShadow, "shadow");
nShowFormId = m_pTbxShadow->GetItemId(0);
m_pTbxShadow->SetItemBits(nShowFormId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE);
nOutlineId = m_pTbxShadow->GetItemId(1);
m_pTbxShadow->SetItemBits(nOutlineId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nShadowOffId = m_pTbxShadow->GetItemId(2);
m_pTbxShadow->SetItemBits(nShadowOffId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nShadowNormalId = m_pTbxShadow->GetItemId(3);
m_pTbxShadow->SetItemBits(nShadowNormalId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nShadowSlantId = m_pTbxShadow->GetItemId(4);
m_pTbxShadow->SetItemBits(nShadowSlantId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
get(m_pTbxAdjust, "adjust");
nAdjustMirrorId = m_pTbxAdjust->GetItemId(0);
m_pTbxAdjust->SetItemBits(nAdjustMirrorId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE);
nAdjustLeftId = m_pTbxAdjust->GetItemId(1);
m_pTbxAdjust->SetItemBits(nAdjustLeftId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE);
nAdjustCenterId = m_pTbxAdjust->GetItemId(2);
m_pTbxAdjust->SetItemBits(nAdjustCenterId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nAdjustRightId = m_pTbxAdjust->GetItemId(3);
m_pTbxAdjust->SetItemBits(nAdjustRightId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
nAdjustAutoSizeId = m_pTbxAdjust->GetItemId(4);
m_pTbxAdjust->SetItemBits(nAdjustAutoSizeId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK);
ApplyImageList(); ApplyImageList();
...@@ -226,44 +243,44 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, ...@@ -226,44 +243,44 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
pCtrlItems[9] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWXVAL, *this, rBindings); pCtrlItems[9] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWXVAL, *this, rBindings);
pCtrlItems[10] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWYVAL, *this, rBindings); pCtrlItems[10] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWYVAL, *this, rBindings);
Size aSize = aTbxStyle.CalcWindowSizePixel(); Size aSize = m_pTbxStyle->CalcWindowSizePixel();
aTbxStyle.SetSizePixel(aSize); m_pTbxStyle->SetSizePixel(aSize);
aTbxStyle.SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectStyleHdl_Impl) ); m_pTbxStyle->SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectStyleHdl_Impl) );
aTbxAdjust.SetSizePixel(aSize); m_pTbxAdjust->SetSizePixel(aSize);
aTbxAdjust.SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectAdjustHdl_Impl) ); m_pTbxAdjust->SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectAdjustHdl_Impl) );
aTbxShadow.SetSizePixel(aSize); m_pTbxShadow->SetSizePixel(aSize);
aTbxShadow.SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectShadowHdl_Impl) ); m_pTbxShadow->SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectShadowHdl_Impl) );
Link aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl); Link aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl);
aMtrFldDistance.SetModifyHdl( aLink ); m_pMtrFldDistance->SetModifyHdl( aLink );
aMtrFldTextStart.SetModifyHdl( aLink ); m_pMtrFldTextStart->SetModifyHdl( aLink );
aMtrFldShadowX.SetModifyHdl( aLink ); m_pMtrFldShadowX->SetModifyHdl( aLink );
aMtrFldShadowY.SetModifyHdl( aLink ); m_pMtrFldShadowY->SetModifyHdl( aLink );
// Set System metric // Set System metric
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
SetFieldUnit( aMtrFldDistance, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldDistance, eDlgUnit, true);
SetFieldUnit( aMtrFldTextStart, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldTextStart, eDlgUnit, true);
SetFieldUnit( aMtrFldShadowX, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldShadowX, eDlgUnit, true);
SetFieldUnit( aMtrFldShadowY, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldShadowY, eDlgUnit, true);
if( eDlgUnit == FUNIT_MM ) if( eDlgUnit == FUNIT_MM )
{ {
aMtrFldDistance.SetSpinSize( 50 ); m_pMtrFldDistance->SetSpinSize( 50 );
aMtrFldTextStart.SetSpinSize( 50 ); m_pMtrFldTextStart->SetSpinSize( 50 );
aMtrFldShadowX.SetSpinSize( 50 ); m_pMtrFldShadowX->SetSpinSize( 50 );
aMtrFldShadowY.SetSpinSize( 50 ); m_pMtrFldShadowY->SetSpinSize( 50 );
} }
else else
{ {
aMtrFldDistance.SetSpinSize( 10 ); m_pMtrFldDistance->SetSpinSize( 10 );
aMtrFldTextStart.SetSpinSize( 10 ); m_pMtrFldTextStart->SetSpinSize( 10 );
aMtrFldShadowX.SetSpinSize( 10 ); m_pMtrFldShadowX->SetSpinSize( 10 );
aMtrFldShadowY.SetSpinSize( 10 ); m_pMtrFldShadowY->SetSpinSize( 10 );
} }
aShadowColorLB.SetSelectHdl( LINK(this, SvxFontWorkDialog, ColorSelectHdl_Impl) ); m_pShadowColorLB->SetSelectHdl( LINK(this, SvxFontWorkDialog, ColorSelectHdl_Impl) );
aInputIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST); aInputIdle.SetPriority(VCL_IDLE_PRIORITY_LOWEST);
aInputIdle.SetIdleHdl(LINK(this, SvxFontWorkDialog, InputTimoutHdl_Impl)); aInputIdle.SetIdleHdl(LINK(this, SvxFontWorkDialog, InputTimoutHdl_Impl));
...@@ -325,38 +342,38 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) ...@@ -325,38 +342,38 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
{ {
if ( pItem ) if ( pItem )
{ {
sal_uInt16 nId = TBI_STYLE_OFF; sal_uInt16 nId = nStyleOffId;
switch ( pItem->GetValue() ) switch ( pItem->GetValue() )
{ {
case XFT_ROTATE : nId = TBI_STYLE_ROTATE; break; case XFT_ROTATE : nId = nStyleRotateId; break;
case XFT_UPRIGHT: nId = TBI_STYLE_UPRIGHT; break; case XFT_UPRIGHT: nId = nStyleUprightId; break;
case XFT_SLANTX : nId = TBI_STYLE_SLANTX; break; case XFT_SLANTX : nId = nStyleSlantXId; break;
case XFT_SLANTY : nId = TBI_STYLE_SLANTY; break; case XFT_SLANTY : nId = nStyleSlantYId; break;
default: ;//prevent warning default: ;//prevent warning
} }
aTbxStyle.Enable(); m_pTbxStyle->Enable();
// Make sure that there is always exactly one checked toolbox item. // Make sure that there is always exactly one checked toolbox item.
if ( pItem->GetValue() == XFT_NONE ) if ( pItem->GetValue() == XFT_NONE )
{ {
aTbxStyle.CheckItem(TBI_STYLE_ROTATE, false); m_pTbxStyle->CheckItem(nStyleRotateId, false);
aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, false); m_pTbxStyle->CheckItem(nStyleUprightId, false);
aTbxStyle.CheckItem(TBI_STYLE_SLANTX, false); m_pTbxStyle->CheckItem(nStyleSlantXId, false);
aTbxStyle.CheckItem(TBI_STYLE_SLANTY, false); m_pTbxStyle->CheckItem(nStyleSlantYId, false);
aTbxStyle.CheckItem(TBI_STYLE_OFF, true); m_pTbxStyle->CheckItem(nStyleOffId, true);
} }
else else
{ {
aTbxStyle.CheckItem(TBI_STYLE_OFF, false); m_pTbxStyle->CheckItem(nStyleOffId, false);
aTbxStyle.CheckItem(nId); m_pTbxStyle->CheckItem(nId);
} }
nLastStyleTbxId = nId; nLastStyleTbxId = nId;
} }
else else
aTbxStyle.Disable(); m_pTbxStyle->Disable();
} }
// Set adjust buttons // Set adjust buttons
...@@ -367,33 +384,33 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem) ...@@ -367,33 +384,33 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem)
{ {
sal_uInt16 nId; sal_uInt16 nId;
aTbxAdjust.Enable(); m_pTbxAdjust->Enable();
aMtrFldDistance.Enable(); m_pMtrFldDistance->Enable();
if ( pItem->GetValue() == XFT_LEFT || pItem->GetValue() == XFT_RIGHT ) if ( pItem->GetValue() == XFT_LEFT || pItem->GetValue() == XFT_RIGHT )
{ {
if ( pItem->GetValue() == XFT_LEFT ) nId = TBI_ADJUST_LEFT; if ( pItem->GetValue() == XFT_LEFT ) nId = nAdjustLeftId;
else nId = TBI_ADJUST_RIGHT; else nId = nAdjustRightId;
aMtrFldTextStart.Enable(); m_pMtrFldTextStart->Enable();
} }
else else
{ {
if ( pItem->GetValue() == XFT_CENTER ) nId = TBI_ADJUST_CENTER; if ( pItem->GetValue() == XFT_CENTER ) nId = nAdjustCenterId;
else nId = TBI_ADJUST_AUTOSIZE; else nId = nAdjustAutoSizeId;
aMtrFldTextStart.Disable(); m_pMtrFldTextStart->Disable();
} }
if ( !aTbxAdjust.IsItemChecked(nId) ) if ( !m_pTbxAdjust->IsItemChecked(nId) )
{ {
aTbxAdjust.CheckItem(nId); m_pTbxAdjust->CheckItem(nId);
} }
nLastAdjustTbxId = nId; nLastAdjustTbxId = nId;
} }
else else
{ {
aTbxAdjust.Disable(); m_pTbxAdjust->Disable();
aMtrFldTextStart.Disable(); m_pMtrFldTextStart->Disable();
aMtrFldDistance.Disable(); m_pMtrFldDistance->Disable();
} }
} }
...@@ -402,9 +419,9 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem) ...@@ -402,9 +419,9 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem)
void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem) void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem)
{ {
// Use HasChildPathFocus() instead of HasFocus() at SpinFields // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldDistance.HasChildPathFocus() ) if ( pItem && !m_pMtrFldDistance->HasChildPathFocus() )
{ {
SetMetricValue( aMtrFldDistance, pItem->GetValue(), SFX_MAPUNIT_100TH_MM ); SetMetricValue(*m_pMtrFldDistance, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
} }
} }
...@@ -413,9 +430,9 @@ void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem) ...@@ -413,9 +430,9 @@ void SvxFontWorkDialog::SetDistance_Impl(const XFormTextDistanceItem* pItem)
void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem) void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem)
{ {
// Use HasChildPathFocus() instead of HasFocus() at SpinFields // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldTextStart.HasChildPathFocus() ) if ( pItem && !m_pMtrFldTextStart->HasChildPathFocus() )
{ {
SetMetricValue( aMtrFldTextStart, pItem->GetValue(), SFX_MAPUNIT_100TH_MM ); SetMetricValue(*m_pMtrFldTextStart, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
} }
} }
...@@ -424,7 +441,7 @@ void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem) ...@@ -424,7 +441,7 @@ void SvxFontWorkDialog::SetStart_Impl(const XFormTextStartItem* pItem)
void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem) void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem)
{ {
if ( pItem ) if ( pItem )
aTbxAdjust.CheckItem(TBI_ADJUST_MIRROR, pItem->GetValue()); m_pTbxAdjust->CheckItem(nAdjustMirrorId, pItem->GetValue());
} }
// Set button for contour display // Set button for contour display
...@@ -432,7 +449,7 @@ void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem) ...@@ -432,7 +449,7 @@ void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem)
void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem) void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem)
{ {
if ( pItem ) if ( pItem )
aTbxShadow.CheckItem(TBI_SHOWFORM, !pItem->GetValue()); m_pTbxShadow->CheckItem(nShowFormId, !pItem->GetValue());
} }
// Set button for text border // Set button for text border
...@@ -440,7 +457,7 @@ void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem) ...@@ -440,7 +457,7 @@ void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem)
void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem) void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem)
{ {
if ( pItem ) if ( pItem )
aTbxShadow.CheckItem(TBI_OUTLINE, pItem->GetValue()); m_pTbxShadow->CheckItem(nOutlineId, pItem->GetValue());
} }
// Set shadow buttons // Set shadow buttons
...@@ -452,52 +469,52 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, ...@@ -452,52 +469,52 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
{ {
sal_uInt16 nId; sal_uInt16 nId;
aTbxShadow.Enable(); m_pTbxShadow->Enable();
if ( pItem->GetValue() == XFTSHADOW_NONE ) if ( pItem->GetValue() == XFTSHADOW_NONE )
{ {
nId = TBI_SHADOW_OFF; nId = nShadowOffId;
aFbShadowX.Hide(); m_pFbShadowX->Hide();
aFbShadowY.Hide(); m_pFbShadowY->Hide();
aMtrFldShadowX.Disable(); m_pMtrFldShadowX->Disable();
aMtrFldShadowY.Disable(); m_pMtrFldShadowY->Disable();
aShadowColorLB.Disable(); m_pShadowColorLB->Disable();
} }
else else
{ {
aFbShadowX.Show(); m_pFbShadowX->Show();
aFbShadowY.Show(); m_pFbShadowY->Show();
aMtrFldShadowX.Enable(); m_pMtrFldShadowX->Enable();
aMtrFldShadowY.Enable(); m_pMtrFldShadowY->Enable();
aShadowColorLB.Enable(); m_pShadowColorLB->Enable();
if ( pItem->GetValue() == XFTSHADOW_NORMAL ) if ( pItem->GetValue() == XFTSHADOW_NORMAL )
{ {
nId = TBI_SHADOW_NORMAL; nId = nShadowNormalId;
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
aMtrFldShadowX.SetUnit( eDlgUnit ); m_pMtrFldShadowX->SetUnit( eDlgUnit );
aMtrFldShadowX.SetDecimalDigits(2); m_pMtrFldShadowX->SetDecimalDigits(2);
aMtrFldShadowX.SetMin(LONG_MIN); m_pMtrFldShadowX->SetMin(LONG_MIN);
aMtrFldShadowX.SetMax(LONG_MAX); m_pMtrFldShadowX->SetMax(LONG_MAX);
if( eDlgUnit == FUNIT_MM ) if( eDlgUnit == FUNIT_MM )
aMtrFldShadowX.SetSpinSize( 50 ); m_pMtrFldShadowX->SetSpinSize( 50 );
else else
aMtrFldShadowX.SetSpinSize( 10 ); m_pMtrFldShadowX->SetSpinSize( 10 );
aMtrFldShadowY.SetUnit( eDlgUnit ); m_pMtrFldShadowY->SetUnit( eDlgUnit );
aMtrFldShadowY.SetDecimalDigits(2); m_pMtrFldShadowY->SetDecimalDigits(2);
aMtrFldShadowY.SetMin(LONG_MIN); m_pMtrFldShadowY->SetMin(LONG_MIN);
aMtrFldShadowY.SetMax(LONG_MAX); m_pMtrFldShadowY->SetMax(LONG_MAX);
if( eDlgUnit == FUNIT_MM ) if( eDlgUnit == FUNIT_MM )
aMtrFldShadowY.SetSpinSize( 50 ); m_pMtrFldShadowY->SetSpinSize( 50 );
else else
aMtrFldShadowY.SetSpinSize( 10 ); m_pMtrFldShadowY->SetSpinSize( 10 );
if ( bRestoreValues ) if ( bRestoreValues )
{ {
SetMetricValue( aMtrFldShadowX, nSaveShadowX, SFX_MAPUNIT_100TH_MM ); SetMetricValue(*m_pMtrFldShadowX, nSaveShadowX, SFX_MAPUNIT_100TH_MM);
SetMetricValue( aMtrFldShadowY, nSaveShadowY, SFX_MAPUNIT_100TH_MM ); SetMetricValue(*m_pMtrFldShadowY, nSaveShadowY, SFX_MAPUNIT_100TH_MM);
XFormTextShadowXValItem aXItem( nSaveShadowX ); XFormTextShadowXValItem aXItem( nSaveShadowX );
XFormTextShadowYValItem aYItem( nSaveShadowY ); XFormTextShadowYValItem aYItem( nSaveShadowY );
...@@ -508,24 +525,24 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, ...@@ -508,24 +525,24 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
} }
else else
{ {
nId = TBI_SHADOW_SLANT; nId = nShadowSlantId;
aMtrFldShadowX.SetUnit(FUNIT_CUSTOM); m_pMtrFldShadowX->SetUnit(FUNIT_DEGREE);
aMtrFldShadowX.SetDecimalDigits(1); m_pMtrFldShadowX->SetDecimalDigits(1);
aMtrFldShadowX.SetMin(-1800); m_pMtrFldShadowX->SetMin(-1800);
aMtrFldShadowX.SetMax( 1800); m_pMtrFldShadowX->SetMax( 1800);
aMtrFldShadowX.SetSpinSize(10); m_pMtrFldShadowX->SetSpinSize(10);
aMtrFldShadowY.SetUnit(FUNIT_PERCENT); m_pMtrFldShadowY->SetUnit(FUNIT_PERCENT);
aMtrFldShadowY.SetDecimalDigits(0); m_pMtrFldShadowY->SetDecimalDigits(0);
aMtrFldShadowY.SetMin(-999); m_pMtrFldShadowY->SetMin(-999);
aMtrFldShadowY.SetMax( 999); m_pMtrFldShadowY->SetMax( 999);
aMtrFldShadowY.SetSpinSize(10); m_pMtrFldShadowY->SetSpinSize(10);
if ( bRestoreValues ) if ( bRestoreValues )
{ {
aMtrFldShadowX.SetValue(nSaveShadowAngle); m_pMtrFldShadowX->SetValue(nSaveShadowAngle);
aMtrFldShadowY.SetValue(nSaveShadowSize); m_pMtrFldShadowY->SetValue(nSaveShadowSize);
XFormTextShadowXValItem aXItem(nSaveShadowAngle); XFormTextShadowXValItem aXItem(nSaveShadowAngle);
XFormTextShadowYValItem aYItem(nSaveShadowSize); XFormTextShadowYValItem aYItem(nSaveShadowSize);
GetBindings().GetDispatcher()->Execute( GetBindings().GetDispatcher()->Execute(
...@@ -534,9 +551,9 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, ...@@ -534,9 +551,9 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
} }
} }
if ( !aTbxShadow.IsItemChecked(nId) ) if ( !m_pTbxShadow->IsItemChecked(nId) )
{ {
aTbxShadow.CheckItem(nId); m_pTbxShadow->CheckItem(nId);
} }
nLastShadowTbxId = nId; nLastShadowTbxId = nId;
...@@ -544,10 +561,10 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, ...@@ -544,10 +561,10 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
} }
else else
{ {
aTbxShadow.Disable(); m_pTbxShadow->Disable();
aMtrFldShadowX.Disable(); m_pMtrFldShadowX->Disable();
aMtrFldShadowY.Disable(); m_pMtrFldShadowY->Disable();
aShadowColorLB.Disable(); m_pShadowColorLB->Disable();
} }
} }
...@@ -556,7 +573,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, ...@@ -556,7 +573,7 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pItem) void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pItem)
{ {
if ( pItem ) if ( pItem )
aShadowColorLB.SelectEntry(pItem->GetColorValue()); m_pShadowColorLB->SelectEntry(pItem->GetColorValue());
} }
// Enter X-value for shadow in edit field // Enter X-value for shadow in edit field
...@@ -564,7 +581,7 @@ void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pIte ...@@ -564,7 +581,7 @@ void SvxFontWorkDialog::SetShadowColor_Impl(const XFormTextShadowColorItem* pIte
void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
{ {
// Use HasChildPathFocus() instead of HasFocus() at SpinFields // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldShadowX.HasChildPathFocus() ) if ( pItem && !m_pMtrFldShadowX->HasChildPathFocus() )
{ {
// #i19251# // #i19251#
// sal_Int32 nValue = pItem->GetValue(); // sal_Int32 nValue = pItem->GetValue();
...@@ -573,7 +590,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) ...@@ -573,7 +590,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
// The two involved fields/items are used double and contain/give different // The two involved fields/items are used double and contain/give different
// values regarding to the access method. Thus, here we need to separate the access // values regarding to the access method. Thus, here we need to separate the access
// methos regarding to the kind of value accessed. // methos regarding to the kind of value accessed.
if(aTbxShadow.IsItemChecked(TBI_SHADOW_SLANT)) if (m_pTbxShadow->IsItemChecked(nShadowSlantId))
{ {
// #i19251# // #i19251#
// There is no value correction necessary at all, i think this // There is no value correction necessary at all, i think this
...@@ -581,11 +598,11 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) ...@@ -581,11 +598,11 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
// involved fields/items are used double and contain/give different // involved fields/items are used double and contain/give different
// values regarding to the access method. // values regarding to the access method.
// nValue = nValue - ( int( float( nValue ) / 360.0 ) * 360 ); // nValue = nValue - ( int( float( nValue ) / 360.0 ) * 360 );
aMtrFldShadowX.SetValue(pItem->GetValue()); m_pMtrFldShadowX->SetValue(pItem->GetValue());
} }
else else
{ {
SetMetricValue( aMtrFldShadowX, pItem->GetValue(), SFX_MAPUNIT_100TH_MM ); SetMetricValue(*m_pMtrFldShadowX, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
} }
} }
} }
...@@ -595,43 +612,45 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) ...@@ -595,43 +612,45 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem)
{ {
// Use HasChildPathFocus() instead of HasFocus() at SpinFields // Use HasChildPathFocus() instead of HasFocus() at SpinFields
if ( pItem && !aMtrFldShadowY.HasChildPathFocus() ) if ( pItem && !m_pMtrFldShadowY->HasChildPathFocus() )
{ {
// #i19251# // #i19251#
// The two involved fields/items are used double and contain/give different // The two involved fields/items are used double and contain/give different
// values regarding to the access method. Thus, here we need to separate the access // values regarding to the access method. Thus, here we need to separate the access
// methos regarding to the kind of value accessed. // methos regarding to the kind of value accessed.
if(aTbxShadow.IsItemChecked(TBI_SHADOW_SLANT)) if (m_pTbxShadow->IsItemChecked(nShadowSlantId))
{ {
aMtrFldShadowY.SetValue(pItem->GetValue()); m_pMtrFldShadowY->SetValue(pItem->GetValue());
} }
else else
{ {
SetMetricValue( aMtrFldShadowY, pItem->GetValue(), SFX_MAPUNIT_100TH_MM ); SetMetricValue(*m_pMtrFldShadowY, pItem->GetValue(), SFX_MAPUNIT_100TH_MM);
} }
} }
} }
IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl) IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl)
{ {
sal_uInt16 nId = aTbxStyle.GetCurItemId(); sal_uInt16 nId = m_pTbxStyle->GetCurItemId();
// Execute this block when a different toolbox item has been clicked or // Execute this block when a different toolbox item has been clicked or
// when the off item has been clicked. The later is necessary to // when the off item has been clicked. The later is necessary to
// override the toolbox behaviour of unchecking the item after second // override the toolbox behaviour of unchecking the item after second
// click on it: One of the items has to be checked at all times (when // click on it: One of the items has to be checked at all times (when
// enabled that is.) // enabled that is.)
if (nId == TBI_STYLE_OFF || nId != nLastStyleTbxId ) if (nId == nStyleOffId || nId != nLastStyleTbxId )
{ {
XFormTextStyle eStyle = XFT_NONE; XFormTextStyle eStyle = XFT_NONE;
switch ( nId ) if (nId == nStyleRotateId)
{ eStyle = XFT_ROTATE;
case TBI_STYLE_ROTATE : eStyle = XFT_ROTATE; break; else if (nId == nStyleUprightId)
case TBI_STYLE_UPRIGHT : eStyle = XFT_UPRIGHT; break; eStyle = XFT_UPRIGHT;
case TBI_STYLE_SLANTX : eStyle = XFT_SLANTX; break; else if (nId == nStyleSlantXId)
case TBI_STYLE_SLANTY : eStyle = XFT_SLANTY; break; eStyle = XFT_SLANTX;
} else if (nId == nStyleSlantYId)
eStyle = XFT_SLANTY;
XFormTextStyleItem aItem( eStyle ); XFormTextStyleItem aItem( eStyle );
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_STYLE, SfxCallMode::RECORD, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_STYLE, SfxCallMode::RECORD, &aItem, 0L );
SetStyle_Impl( &aItem ); SetStyle_Impl( &aItem );
...@@ -642,23 +661,24 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl) ...@@ -642,23 +661,24 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl)
IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl) IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl)
{ {
sal_uInt16 nId = aTbxAdjust.GetCurItemId(); sal_uInt16 nId = m_pTbxAdjust->GetCurItemId();
if ( nId == TBI_ADJUST_MIRROR ) if (nId == nAdjustMirrorId)
{ {
XFormTextMirrorItem aItem(aTbxAdjust.IsItemChecked(nId)); XFormTextMirrorItem aItem(m_pTbxAdjust->IsItemChecked(nId));
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_MIRROR, SfxCallMode::SLOT, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_MIRROR, SfxCallMode::SLOT, &aItem, 0L );
} }
else if ( nId != nLastAdjustTbxId ) else if ( nId != nLastAdjustTbxId )
{ {
XFormTextAdjust eAdjust = XFT_AUTOSIZE; XFormTextAdjust eAdjust = XFT_AUTOSIZE;
switch ( nId ) if (nId == nAdjustLeftId)
{ eAdjust = XFT_LEFT;
case TBI_ADJUST_LEFT : eAdjust = XFT_LEFT; break; else if (nId == nAdjustCenterId)
case TBI_ADJUST_CENTER : eAdjust = XFT_CENTER; break; eAdjust = XFT_CENTER;
case TBI_ADJUST_RIGHT : eAdjust = XFT_RIGHT; break; else if (nId == nAdjustRightId)
} eAdjust = XFT_RIGHT;
XFormTextAdjustItem aItem(eAdjust); XFormTextAdjustItem aItem(eAdjust);
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_ADJUST, SfxCallMode::RECORD, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_ADJUST, SfxCallMode::RECORD, &aItem, 0L );
SetAdjust_Impl(&aItem); SetAdjust_Impl(&aItem);
...@@ -669,36 +689,36 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl) ...@@ -669,36 +689,36 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl)
IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl) IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl)
{ {
sal_uInt16 nId = aTbxShadow.GetCurItemId(); sal_uInt16 nId = m_pTbxShadow->GetCurItemId();
if ( nId == TBI_SHOWFORM ) if (nId == nShowFormId)
{ {
XFormTextHideFormItem aItem(!aTbxShadow.IsItemChecked(nId)); XFormTextHideFormItem aItem(!m_pTbxShadow->IsItemChecked(nId));
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_HIDEFORM, SfxCallMode::RECORD, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_HIDEFORM, SfxCallMode::RECORD, &aItem, 0L );
} }
else if ( nId == TBI_OUTLINE ) else if (nId == nOutlineId)
{ {
XFormTextOutlineItem aItem(aTbxShadow.IsItemChecked(nId)); XFormTextOutlineItem aItem(m_pTbxShadow->IsItemChecked(nId));
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_OUTLINE, SfxCallMode::RECORD, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_OUTLINE, SfxCallMode::RECORD, &aItem, 0L );
} }
else if ( nId != nLastShadowTbxId ) else if (nId != nLastShadowTbxId)
{ {
XFormTextShadow eShadow = XFTSHADOW_NONE; XFormTextShadow eShadow = XFTSHADOW_NONE;
if ( nLastShadowTbxId == TBI_SHADOW_NORMAL ) if (nLastShadowTbxId == nShadowNormalId)
{ {
nSaveShadowX = GetCoreValue( aMtrFldShadowX, SFX_MAPUNIT_100TH_MM ); nSaveShadowX = GetCoreValue(*m_pMtrFldShadowX, SFX_MAPUNIT_100TH_MM);
nSaveShadowY = GetCoreValue( aMtrFldShadowY, SFX_MAPUNIT_100TH_MM ); nSaveShadowY = GetCoreValue(*m_pMtrFldShadowY, SFX_MAPUNIT_100TH_MM);
} }
else if ( nLastShadowTbxId == TBI_SHADOW_SLANT ) else if (nLastShadowTbxId == nShadowSlantId)
{ {
nSaveShadowAngle = static_cast<long>(aMtrFldShadowX.GetValue()); nSaveShadowAngle = static_cast<long>(m_pMtrFldShadowX->GetValue());
nSaveShadowSize = static_cast<long>(aMtrFldShadowY.GetValue()); nSaveShadowSize = static_cast<long>(m_pMtrFldShadowY->GetValue());
} }
nLastShadowTbxId = nId; nLastShadowTbxId = nId;
if ( nId == TBI_SHADOW_NORMAL ) eShadow = XFTSHADOW_NORMAL; if ( nId == nShadowNormalId) eShadow = XFTSHADOW_NORMAL;
else if ( nId == TBI_SHADOW_SLANT ) eShadow = XFTSHADOW_SLANT; else if (nId == nShadowSlantId) eShadow = XFTSHADOW_SLANT;
XFormTextShadowItem aItem(eShadow); XFormTextShadowItem aItem(eShadow);
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SfxCallMode::RECORD, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SfxCallMode::RECORD, &aItem, 0L );
...@@ -720,25 +740,25 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl) ...@@ -720,25 +740,25 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
// listen, this is however not possible at the moment due to compabillity // listen, this is however not possible at the moment due to compabillity
// issues. // issues.
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
if( eDlgUnit != aMtrFldDistance.GetUnit() ) if( eDlgUnit != m_pMtrFldDistance->GetUnit() )
{ {
SetFieldUnit( aMtrFldDistance, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldDistance, eDlgUnit, true);
SetFieldUnit( aMtrFldTextStart, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldTextStart, eDlgUnit, true);
aMtrFldDistance.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); m_pMtrFldDistance->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
aMtrFldTextStart.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); m_pMtrFldTextStart->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
} }
if( eDlgUnit != aMtrFldShadowX.GetUnit() && if( eDlgUnit != m_pMtrFldShadowX->GetUnit() &&
aTbxShadow.IsItemChecked( TBI_SHADOW_NORMAL ) ) m_pTbxShadow->IsItemChecked(nShadowNormalId) )
{ {
SetFieldUnit( aMtrFldShadowX, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldShadowX, eDlgUnit, true);
SetFieldUnit( aMtrFldShadowY, eDlgUnit, true ); SetFieldUnit(*m_pMtrFldShadowY, eDlgUnit, true);
aMtrFldShadowX.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); m_pMtrFldShadowX->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
aMtrFldShadowY.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); m_pMtrFldShadowY->SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
} }
long nValue = GetCoreValue( aMtrFldDistance, SFX_MAPUNIT_100TH_MM ); long nValue = GetCoreValue(*m_pMtrFldDistance, SFX_MAPUNIT_100TH_MM);
XFormTextDistanceItem aDistItem( nValue ); XFormTextDistanceItem aDistItem( nValue );
nValue = GetCoreValue( aMtrFldTextStart, SFX_MAPUNIT_100TH_MM ); nValue = GetCoreValue(*m_pMtrFldTextStart, SFX_MAPUNIT_100TH_MM);
XFormTextStartItem aStartItem( nValue ); XFormTextStartItem aStartItem( nValue );
sal_Int32 nValueX(0L); sal_Int32 nValueX(0L);
...@@ -748,15 +768,15 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl) ...@@ -748,15 +768,15 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
// The two involved fields/items are used double and contain/give different // The two involved fields/items are used double and contain/give different
// values regarding to the access method. Thus, here we need to separate the access // values regarding to the access method. Thus, here we need to separate the access
// methos regarding to the kind of value accessed. // methos regarding to the kind of value accessed.
if(nLastShadowTbxId == TBI_SHADOW_NORMAL) if (nLastShadowTbxId == nShadowNormalId)
{ {
nValueX = GetCoreValue( aMtrFldShadowX, SFX_MAPUNIT_100TH_MM ); nValueX = GetCoreValue(*m_pMtrFldShadowX, SFX_MAPUNIT_100TH_MM);
nValueY = GetCoreValue( aMtrFldShadowY, SFX_MAPUNIT_100TH_MM ); nValueY = GetCoreValue(*m_pMtrFldShadowY, SFX_MAPUNIT_100TH_MM);
} }
else if(nLastShadowTbxId == TBI_SHADOW_SLANT) else if (nLastShadowTbxId == nShadowSlantId)
{ {
nValueX = static_cast<long>(aMtrFldShadowX.GetValue()); nValueX = static_cast<long>(m_pMtrFldShadowX->GetValue());
nValueY = static_cast<long>(aMtrFldShadowY.GetValue()); nValueY = static_cast<long>(m_pMtrFldShadowY->GetValue());
} }
XFormTextShadowXValItem aShadowXItem( nValueX ); XFormTextShadowXValItem aShadowXItem( nValueX );
...@@ -770,7 +790,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl) ...@@ -770,7 +790,7 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl) IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl)
{ {
XFormTextShadowColorItem aItem( "", aShadowColorLB.GetSelectEntryColor() ); XFormTextShadowColorItem aItem( "", m_pShadowColorLB->GetSelectEntryColor() );
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SfxCallMode::RECORD, &aItem, 0L ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SfxCallMode::RECORD, &aItem, 0L );
return 0; return 0;
} }
...@@ -780,8 +800,8 @@ void SvxFontWorkDialog::SetColorList(const XColorListRef &pList) ...@@ -780,8 +800,8 @@ void SvxFontWorkDialog::SetColorList(const XColorListRef &pList)
if ( pList.is() && pList != pColorList ) if ( pList.is() && pList != pColorList )
{ {
pColorList = pList; pColorList = pList;
aShadowColorLB.Clear(); m_pShadowColorLB->Clear();
aShadowColorLB.Fill(pColorList); m_pShadowColorLB->Fill(pColorList);
} }
} }
...@@ -789,37 +809,18 @@ void SvxFontWorkDialog::SetActive(bool /*bActivate*/) ...@@ -789,37 +809,18 @@ void SvxFontWorkDialog::SetActive(bool /*bActivate*/)
{ {
} }
void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
ApplyImageList();
SfxDockingWindow::DataChanged( rDCEvt );
}
void SvxFontWorkDialog::ApplyImageList() void SvxFontWorkDialog::ApplyImageList()
{ {
ImageList& rImgLst = maImageList; if (nLastShadowTbxId == nShadowSlantId)
aTbxStyle.SetImageList( rImgLst );
aTbxAdjust.SetImageList( rImgLst );
aTbxShadow.SetImageList( rImgLst );
switch( nLastShadowTbxId )
{ {
case TBI_SHADOW_SLANT: m_pFbShadowX->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_ANGLE)));
aFbShadowX.SetImage( rImgLst.GetImage( TBI_SHADOW_ANGLE ) ); m_pFbShadowY->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_SIZE)));
aFbShadowY.SetImage( rImgLst.GetImage( TBI_SHADOW_SIZE ) ); }
break; else
default: {
aFbShadowX.SetImage( rImgLst.GetImage( TBI_SHADOW_XDIST ) ); m_pFbShadowX->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_XDIST)));
aFbShadowY.SetImage( rImgLst.GetImage( TBI_SHADOW_YDIST ) ); m_pFbShadowY->SetImage(Image(SVX_RES(RID_SVXIMG_SHADOW_YDIST)));
break;
} }
aFbDistance.SetImage( rImgLst.GetImage( TBI_DISTANCE ) );
aFbTextStart.SetImage( rImgLst.GetImage( TBI_TEXTSTART ) );
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/dialog/fontwork.hrc deleted 100644 → 0
Dosyayı görüntüle @ 42addf58
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define TBX_STYLE 1
#define TBX_ADJUST 2
#define TBX_SHADOW 3
#define FB_DISTANCE 1
#define FB_TEXTSTART 2
#define FB_SHADOW_X 3
#define FB_SHADOW_Y 4
#define MTR_FLD_DISTANCE 1
#define MTR_FLD_TEXTSTART 2
#define MTR_FLD_SHADOW_X 3
#define MTR_FLD_SHADOW_Y 4
#define CLB_SHADOW_COLOR 1
#define IL_FONTWORK 1200
// the following ids are also used to identify the
// bitmaps for the image list
#define TBI_STYLE_OFF 1
#define TBI_STYLE_ROTATE 2
#define TBI_STYLE_UPRIGHT 3
#define TBI_STYLE_SLANTX 4
#define TBI_STYLE_SLANTY 5
#define TBI_ADJUST_MIRROR 6
#define TBI_ADJUST_LEFT 7
#define TBI_ADJUST_CENTER 8
#define TBI_ADJUST_RIGHT 9
#define TBI_ADJUST_AUTOSIZE 10
#define TBI_SHOWFORM 11
#define TBI_OUTLINE 12
#define TBI_SHADOW_OFF 13
#define TBI_SHADOW_NORMAL 14
#define TBI_SHADOW_SLANT 15
#define TBI_SHADOW_XDIST 16
#define TBI_SHADOW_YDIST 17
#define TBI_SHADOW_ANGLE 18
#define TBI_SHADOW_SIZE 19
#define TBI_DISTANCE 20
#define TBI_TEXTSTART 21
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/dialog/fontwork.src deleted 100644 → 0
Dosyayı görüntüle @ 42addf58
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>
#include "fontwork.hrc"
#include "helpid.hrc"
#define REDUCED_WIDTH 6
#define REMOVED_VS_FORMS_HEIGHT (30 + 6)
// RID_SVXDLG_FONTWORK ---------------------------------------------------
DockingWindow RID_SVXDLG_FONTWORK
{
HelpId = CMD_SID_FONTWORK ;
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 89 - REDUCED_WIDTH , 193 - REMOVED_VS_FORMS_HEIGHT ) ;
Text [ en-US ] = "Fontwork" ;
Moveable = TRUE ;
Zoomable = TRUE ;
Closeable = TRUE ;
Dockable = TRUE ;
EnableResizing = TRUE ;
ToolBox TBX_STYLE
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 41 - REMOVED_VS_FORMS_HEIGHT ) ;
ItemList =
{
ToolBoxItem
{
AutoCheck = TRUE ;
Identifier = TBI_STYLE_OFF ;
HelpId = HID_FONTWORK_TBI_STYLE_OFF ;
Text [ en-US ] = "Off" ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_STYLE_ROTATE ;
HelpId = HID_FONTWORK_TBI_STYLE_ROTATE ;
Text [ en-US ] = "Rotate" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_STYLE_UPRIGHT ;
HelpId = HID_FONTWORK_TBI_STYLE_UPRIGHT ;
Text [ en-US ] = "Upright" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_STYLE_SLANTX ;
HelpId = HID_FONTWORK_TBI_STYLE_SLANTX ;
Text [ en-US ] = "Slant Horizontal" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_STYLE_SLANTY ;
HelpId = HID_FONTWORK_TBI_STYLE_SLANTY ;
Text [ en-US ] = "Slant Vertical" ;
};
};
};
ToolBox TBX_ADJUST
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 63 - REMOVED_VS_FORMS_HEIGHT ) ;
ItemList =
{
ToolBoxItem
{
AutoCheck = TRUE ;
Checkable = TRUE ;
Identifier = TBI_ADJUST_MIRROR ;
HelpId = HID_FONTWORK_TBI_ADJUST_MIRROR ;
Text [ en-US ] = "Orientation" ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_ADJUST_LEFT ;
HelpId = HID_FONTWORK_TBI_ADJUST_LEFT ;
Text [ en-US ] = "Align Left" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_ADJUST_CENTER ;
HelpId = HID_FONTWORK_TBI_ADJUST_CENTER ;
Text [ en-US ] = "Center" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_ADJUST_RIGHT ;
HelpId = HID_FONTWORK_TBI_ADJUST_RIGHT ;
Text [ en-US ] = "Align Right" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_ADJUST_AUTOSIZE ;
HelpId = HID_FONTWORK_TBI_ADJUST_AUTOSIZE ;
Text [ en-US ] = "AutoSize Text" ;
};
};
};
FixedImage FB_DISTANCE
{
Pos = MAP_APPFONT ( 10 , 84 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_DISTANCE
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 85 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = -5000000 ;
Maximum = 5000000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
First = -5000000 ;
Last = 5000000 ;
SpinSize = 50 ;
QuickHelpText [ en-US ] = "Distance" ;
};
FixedImage FB_TEXTSTART
{
Pos = MAP_APPFONT ( 10 , 99 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_TEXTSTART
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 100 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 5000000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
Last = 5000000 ;
SpinSize = 50 ;
QuickHelpText [ en-US ] = "Indent" ;
};
ToolBox TBX_SHADOW
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 122 - REMOVED_VS_FORMS_HEIGHT ) ;
ItemList =
{
ToolBoxItem
{
AutoCheck = TRUE ;
Checkable = TRUE ;
Identifier = TBI_SHOWFORM ;
HelpId = HID_FONTWORK_TBI_SHOWFORM ;
Text [ en-US ] = "Contour" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
Checkable = TRUE ;
Identifier = TBI_OUTLINE ;
HelpId = HID_FONTWORK_TBI_OUTLINE ;
Text [ en-US ] = "Text Contour" ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_SEPARATOR ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_SHADOW_OFF ;
HelpId = HID_FONTWORK_TBI_SHADOW_OFF ;
Text [ en-US ] = "No Shadow" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_SHADOW_NORMAL ;
HelpId = HID_FONTWORK_TBI_SHADOW_NORMAL ;
Text [ en-US ] = "Vertical" ;
};
ToolBoxItem
{
AutoCheck = TRUE ;
RadioCheck = TRUE ;
Identifier = TBI_SHADOW_SLANT ;
HelpId = HID_FONTWORK_TBI_SHADOW_SLANT ;
Text [ en-US ] = "Slant" ;
};
};
};
FixedImage FB_SHADOW_X
{
Pos = MAP_APPFONT ( 10 , 143 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_SHADOW_X
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 144 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = -5000000 ;
Maximum = 5000000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
CustomUnitText [ en-US ] = " degrees" ;
First = -5000000 ;
Last = 5000000 ;
SpinSize = 50 ;
QuickHelpText [ en-US ] = "Distance X" ;
};
FixedImage FB_SHADOW_Y
{
Pos = MAP_APPFONT ( 10 , 158 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_SHADOW_Y
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 159 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 5000000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
Last = 5000000 ;
SpinSize = 50 ;
QuickHelpText [ en-US ] = "Distance Y" ;
};
ListBox CLB_SHADOW_COLOR
{
HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 174 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 71 , 60 ) ;
DropDown = TRUE ;
QuickHelpText [ en-US ] = "Shadow Color" ;
Text = "-";
};
#define FONTWORK_IDLIST \
IdList = \
{ \
TBI_STYLE_OFF ; \
TBI_STYLE_ROTATE ; \
TBI_STYLE_UPRIGHT ; \
TBI_STYLE_SLANTX ; \
TBI_STYLE_SLANTY ; \
TBI_ADJUST_MIRROR ; \
TBI_ADJUST_LEFT ; \
TBI_ADJUST_CENTER ; \
TBI_ADJUST_RIGHT ; \
TBI_ADJUST_AUTOSIZE ; \
TBI_SHOWFORM ; \
TBI_OUTLINE ; \
TBI_SHADOW_OFF ; \
TBI_SHADOW_NORMAL ; \
TBI_SHADOW_SLANT ; \
TBI_SHADOW_XDIST ; \
TBI_SHADOW_YDIST ; \
TBI_SHADOW_ANGLE ; \
TBI_SHADOW_SIZE ; \
TBI_DISTANCE ; \
TBI_TEXTSTART ; \
}; \
IdCount = { 21 ; };
#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
ImageList IL_FONTWORK
{
Prefix = "fw";
MaskColor = IMAGE_STDBTN_COLOR ;
FONTWORK_IDLIST
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/dialog/sdstring.src
Dosyayı görüntüle @ 13c71694
...@@ -2302,6 +2302,26 @@ Image RID_SVXIMG_REDCROSS ...@@ -2302,6 +2302,26 @@ Image RID_SVXIMG_REDCROSS
ImageBitmap = Bitmap { File = "nu02.png"; }; ImageBitmap = Bitmap { File = "nu02.png"; };
}; };
Image RID_SVXIMG_SHADOW_ANGLE
{
ImageBitmap = Bitmap { File = "fw018.png"; };
};
Image RID_SVXIMG_SHADOW_SIZE
{
ImageBitmap = Bitmap { File = "fw019.png"; };
};
Image RID_SVXIMG_SHADOW_XDIST
{
ImageBitmap = Bitmap { File = "fw016.png"; };
};
Image RID_SVXIMG_SHADOW_YDIST
{
ImageBitmap = Bitmap { File = "fw017.png"; };
};
String RID_SVXSTR_SUCCESSRECOV String RID_SVXSTR_SUCCESSRECOV
{ {
Text[ en-US ] = "Successfully recovered"; Text[ en-US ] = "Successfully recovered";
......
svx/uiconfig/ui/dockingfontwork.ui 0 → 100644
Dosyayı görüntüle @ 13c71694
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">-50000</property>
<property name="upper">50000</property>
<property name="step_increment">0.10000000000000001</property>
<property name="page_increment">1</property>
</object>
<object class="GtkWindow" id="DockingFontwork">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Fontwork</property>
<property name="type_hint">dock</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkToolbar" id="style">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="off">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Off</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw01.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkSeparatorToolItem" id="toolbutton1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="rotate">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Rotate</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw02.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="upright">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Upright</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw03.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="hori">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Slant Horizontal</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw04.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="vert">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Slant Vertical</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw05.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="adjust">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="orientation">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Orientation</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw06.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkSeparatorToolItem" id="toolbutton2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="left">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Align Left</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw07.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="center">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Center</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw08.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="right">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Align Right</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw09.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="autosize">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">AutoSize Text</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw010.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="pixbuf">svx/res/fw020.png</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="distance:0.00mm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Distance</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="pixbuf">svx/res/fw021.png</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="indent:0.00mm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Indent</property>
<property name="text" translatable="yes">0.00</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="shadow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToolButton" id="contour">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Contour</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw011.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="textcontour">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Text Contour</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw012.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkSeparatorToolItem" id="toolbutton3">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="noshadow">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">No Shadow</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw013.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="vertical">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Vertical</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw014.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkToolButton" id="slant">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Slant</property>
<property name="use_underline">True</property>
<property name="icon_name">svx/res/fw015.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="shadowx">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="pixbuf">svx/res/fw018.png</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="distancex:0.00mm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Distance X</property>
<property name="text" translatable="yes">0.00</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkImage" id="shadowy">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="pixbuf">svx/res/fw019.png</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="distancey:0.00mm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Distance Y</property>
<property name="text" translatable="yes">0</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
</packing>
</child>
<child>
<object class="svxlo-ColorLB" id="color">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Shadow Color</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="distance:0.00mm"/>
<widget name="indent:0.00mm"/>
<widget name="distancex:0.00mm"/>
<widget name="distancey:0.00mm"/>
</widgets>
</object>
</interface>
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