Skip to content

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

convert RID_SVXDLG_BMPMASK dockingwindow to .ui 

Change-Id: I1a160bd08d3be0356076789539d551f4dc6edfd4
üst eabf036c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 341 deletions
include/svx/bmpmask.hxx
Dosyayı görüntüle @ 0ef2fa80
...@@ -81,44 +81,38 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow ...@@ -81,44 +81,38 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
friend class MaskData; friend class MaskData;
friend class MaskSet; friend class MaskSet;
ToolBox aTbxPipette; ToolBox* m_pTbxPipette;
ColorWindow* pCtlPipette; ColorWindow* m_pCtlPipette;
PushButton aBtnExec; PushButton* m_pBtnExec;
FixedLine aGrpQ;
CheckBox* m_pCbx1;
FixedText aFt1; MaskSet* m_pQSet1;
FixedText aFt2; MetricField* m_pSp1;
FixedText aFt3; ColorLB* m_pLbColor1;
CheckBox aCbx1;
MaskSet* pQSet1; CheckBox* m_pCbx2;
MetricField aSp1; MaskSet* m_pQSet2;
ColorLB aLbColor1; MetricField* m_pSp2;
ColorLB* m_pLbColor2;
CheckBox aCbx2;
MaskSet* pQSet2; CheckBox* m_pCbx3;
MetricField aSp2; MaskSet* m_pQSet3;
ColorLB aLbColor2; MetricField* m_pSp3;
ColorLB* m_pLbColor3;
CheckBox aCbx3;
MaskSet* pQSet3; CheckBox* m_pCbx4;
MetricField aSp3; MaskSet* m_pQSet4;
ColorLB aLbColor3; MetricField* m_pSp4;
ColorLB* m_pLbColor4;
CheckBox aCbx4;
MaskSet* pQSet4;
MetricField aSp4;
ColorLB aLbColor4;
MaskData* pData; MaskData* pData;
CheckBox aCbxTrans; CheckBox* m_pCbxTrans;
ColorLB aLbColorTrans; ColorLB* m_pLbColorTrans;
XColorListRef pColLst; XColorListRef pColLst;
Color aPipetteColor; Color aPipetteColor;
SvxBmpMaskSelectItem aSelItem; SvxBmpMaskSelectItem aSelItem;
Image maImgPipette;
virtual bool Close() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE;
#ifdef BMPMASK_PRIVATE #ifdef BMPMASK_PRIVATE
...@@ -143,11 +137,8 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow ...@@ -143,11 +137,8 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
public: public:
SvxBmpMask( SfxBindings *pBindinx, SvxBmpMask(SfxBindings *pBindinx, SfxChildWindow *pCW, vcl::Window* pParent);
SfxChildWindow *pCW, virtual ~SvxBmpMask();
vcl::Window* pParent,
const ResId& rResId );
virtual ~SvxBmpMask();
void SetColor( const Color& rColor ); void SetColor( const Color& rColor );
void PipetteClicked(); void PipetteClicked();
...@@ -163,9 +154,6 @@ public: ...@@ -163,9 +154,6 @@ public:
void onSelect( MaskSet* pSet ); void onSelect( MaskSet* pSet );
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
void ApplyStyle();
private: private:
/** Set names for accessible objects. This is necessary for objects /** Set names for accessible objects. This is necessary for objects
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 0ef2fa80
...@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ ...@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/datanavigator \ svx/uiconfig/ui/datanavigator \
svx/uiconfig/ui/deleteheaderdialog \ svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \ svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/dockingcolorreplace \
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/source/dialog/_bmpmask.cxx
Dosyayı görüntüle @ 0ef2fa80
This diff is collapsed.
svx/source/dialog/bmpmask.hrc
Dosyayı görüntüle @ 0ef2fa80
...@@ -16,38 +16,10 @@ ...@@ -16,38 +16,10 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#define RID_SVXDLG_BMPMASK (RID_SVX_BMPMASK_START)
#define RID_SVXDLG_BMPMASK_STR_TRANSP (RID_SVX_BMPMASK_START + 1) #define RID_SVXDLG_BMPMASK_STR_TRANSP (RID_SVX_BMPMASK_START + 1)
#define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR (RID_SVX_BMPMASK_START + 2) #define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR (RID_SVX_BMPMASK_START + 2)
#define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3) #define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3)
#define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4) #define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4)
#define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5) #define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5)
#define GRP_Q 1
#define CBX_1 1
#define CBX_2 4
#define CBX_3 3
#define CBX_4 2
#define CBX_TRANS 5
#define QCOL_1 2
#define QCOL_2 5
#define QCOL_3 4
#define QCOL_4 3
#define SP_1 2
#define SP_2 4
#define SP_3 1
#define SP_4 3
#define TBX_PIPETTE 1
#define TBI_PIPETTE 1
#define WND_PIPETTE 10
#define BTN_EXEC 1
#define LB_1 1
#define LB_2 2
#define LB_3 3
#define LB_4 4
#define LB_TRANS 5
#define FT_1 1
#define FT_2 2
#define FT_3 3
#define IMG_PIPETTE 11
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/dialog/bmpmask.src
Dosyayı görüntüle @ 0ef2fa80
...@@ -22,280 +22,6 @@ ...@@ -22,280 +22,6 @@
#include "bmpmask.hrc" #include "bmpmask.hrc"
#include "helpid.hrc" #include "helpid.hrc"
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
// RID_SVXDLG_BMPMASK ----------------------------------------------------
DockingWindow RID_SVXDLG_BMPMASK
{
HelpId = CMD_SID_BMPMASK ;
OutputSize = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 163 , 126 ) ;
Sizeable = FALSE ;
Moveable = TRUE ;
Closeable = TRUE ;
Zoomable = TRUE ;
Dockable = TRUE ;
EnableResizing = TRUE ;
FixedLine GRP_Q
{
Pos = MAP_APPFONT ( 6 , 26 ) ;
Size = MAP_APPFONT ( 151 , 8 ) ;
Text [ en-US ] = "Colors" ;
};
FixedText FT_1
{
Pos = MAP_APPFONT ( 12 , 37 ) ;
Size = MAP_APPFONT ( 44 , 8 ) ;
Text [ en-US ] = "Source color" ;
};
FixedText FT_2
{
Pos = MAP_APPFONT ( 58 , 37 ) ;
Size = MAP_APPFONT ( 34 , 8 ) ;
Text [ en-US ] = "Tolerance" ;
};
FixedText FT_3
{
Pos = MAP_APPFONT ( 93 , 37 ) ;
Size = MAP_APPFONT ( 64 , 8 ) ;
Text [ en-US ] = "Replace with..." ;
};
// line 1
CheckBox CBX_1
{
HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1";
Pos = MAP_APPFONT ( 12 , 50 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
};
Control QCOL_1
{
HelpId = HID_BMPMASK_CTL_QCOL_1 ;
Pos = MAP_APPFONT ( 24 , 48 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
MetricField SP_1
{
HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 58 , 48 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 99 ;
Last = 99 ;
SpinSize = 1 ;
Unit = FUNIT_PERCENT ;
};
ListBox LB_1
{
HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_1";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 48 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
// line 2
CheckBox CBX_2
{
HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2";
Pos = MAP_APPFONT ( 12 , 65 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
};
Control QCOL_2
{
HelpId = HID_BMPMASK_CTL_QCOL_1 ;
Pos = MAP_APPFONT ( 24 , 63 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
MetricField SP_2
{
HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 58 , 63 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 99 ;
Last = 99 ;
SpinSize = 1 ;
Unit = FUNIT_PERCENT ;
};
ListBox LB_2
{
HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_2";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 63 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
// line 3
CheckBox CBX_3
{
HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3";
Pos = MAP_APPFONT ( 12 , 80 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
};
Control QCOL_3
{
HelpId = HID_BMPMASK_CTL_QCOL_1 ;
Pos = MAP_APPFONT ( 24 , 78 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
MetricField SP_3
{
HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_3";
Border = TRUE ;
Pos = MAP_APPFONT ( 58, 78 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 99 ;
Last = 99 ;
SpinSize = 1 ;
Unit = FUNIT_PERCENT ;
};
ListBox LB_3
{
HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_3";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 78 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
// Line 4
CheckBox CBX_4
{
HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4";
Pos = MAP_APPFONT ( 12 , 95 ) ;
Size = MAP_APPFONT ( 10 , 10 ) ;
TabStop = TRUE ;
};
Control QCOL_4
{
HelpId = HID_BMPMASK_CTL_QCOL_1 ;
Pos = MAP_APPFONT ( 24 , 93 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
MetricField SP_4
{
HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_4";
Border = TRUE ;
Pos = MAP_APPFONT ( 58 , 93 ) ;
Size = MAP_APPFONT ( 29 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 99 ;
Last = 99 ;
SpinSize = 1 ;
Unit = FUNIT_PERCENT ;
};
ListBox LB_4
{
HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_4";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 93 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
CheckBox CBX_TRANS
{
HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS";
Pos = MAP_APPFONT ( 12 , 110 ) ;
Size = MAP_APPFONT ( 71 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Tr~ansparency" ;
};
PushButton BTN_EXEC
{
HelpID = "svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC";
Pos = MAP_APPFONT ( 93 , 6 ) ;
Size = MAP_APPFONT ( 64 , 14 ) ;
Text [ en-US ] = "~Replace" ;
};
ListBox LB_TRANS
{
HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS";
Border = TRUE ;
Pos = MAP_APPFONT ( 93 , 108 ) ;
Size = MAP_APPFONT ( 64 , 75 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
ToolBox TBX_PIPETTE
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 7 ) ;
ItemList =
{
ToolBoxItem
{
AutoCheck = TRUE ;
Identifier = TBI_PIPETTE ;
HelpId = HID_BMPMASK_TBI_PIPETTE ;
ItemImage = Image
{
ImageBitmap = Bitmap { File = "sc10350.bmp" ; };
MASKCOLOR
};
Text [ en-US ] = "Pipette" ;
};
};
};
Control WND_PIPETTE
{
HelpId = HID_BMPMASK_CTL_PIPETTE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 22 , 6 ) ;
Size = MAP_APPFONT ( 43 , 14 ) ;
};
Text [ en-US ] = "Color Replacer" ;
Image IMG_PIPETTE
{
ImageBitmap = Bitmap { File = "sc10350.bmp" ; };
MASKCOLOR
};
};
String RID_SVXDLG_BMPMASK_STR_TRANSP String RID_SVXDLG_BMPMASK_STR_TRANSP
{ {
Text [ en-US ] = "Transparent"; Text [ en-US ] = "Transparent";
...@@ -312,10 +38,12 @@ String RID_SVXDLG_BMPMASK_STR_PALETTE ...@@ -312,10 +38,12 @@ String RID_SVXDLG_BMPMASK_STR_PALETTE
{ {
Text [ en-US ] = "Color Palette"; Text [ en-US ] = "Color Palette";
}; };
String RID_SVXDLG_BMPMASK_STR_TOLERANCE String RID_SVXDLG_BMPMASK_STR_TOLERANCE
{ {
Text [ en-US ] = "Tolerance"; Text [ en-US ] = "Tolerance";
}; };
String RID_SVXDLG_BMPMASK_STR_REPLACEWITH String RID_SVXDLG_BMPMASK_STR_REPLACEWITH
{ {
Text [ en-US ] = "Replace with"; Text [ en-US ] = "Replace with";
......
svx/uiconfig/ui/dockingcolorreplace.ui 0 → 100644
Dosyayı görüntüle @ 0ef2fa80
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