Skip to content

C
core
Kaydet (Commit) b232299c authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert position & size tab page to widget UI 

Conflicts:
	cui/source/inc/helpid.hrc

Change-Id: I5265e74e88654136b4eeeabf7cfcae24dec08e38
Reviewed-on: https://gerrit.libreoffice.org/5504Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0ce1070c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 293 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ b232299c
......@@ -89,6 +89,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \
cui/uiconfig/ui/possizetabpage \
cui/uiconfig/ui/querychangelineenddialog \
cui/uiconfig/ui/querydeletechartcolordialog \
cui/uiconfig/ui/querydeletedictionarydialog \
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ b232299c
......@@ -241,7 +241,6 @@
#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
#define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE"
#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME"
#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
#define HID_HYPERLINK_MAIL "CUI_HID_HYPERLINK_MAIL"
......
cui/source/inc/transfrm.hxx
Dosyayı görüntüle @ b232299c
......@@ -78,35 +78,29 @@ class SvxPositionSizeTabPage : public SvxTabPage
private:
// position
FixedLine maFlPosition;
FixedText maFtPosX;
MetricField maMtrPosX;
FixedText maFtPosY;
MetricField maMtrPosY;
FixedText maFtPosReference;
SvxRectCtl maCtlPos;
VclFrame* m_pFlPosition;
MetricField* m_pMtrPosX;
MetricField* m_pMtrPosY;
SvxRectCtl* m_pCtlPos;
// size
FixedLine maFlSize;
FixedText maFtWidth;
MetricField maMtrWidth;
FixedText maFtHeight;
MetricField maMtrHeight;
CheckBox maCbxScale;
FixedText maFtSizeReference;
SvxRectCtl maCtlSize;
VclFrame* m_pFlSize;
FixedText* m_pFtWidth;
MetricField* m_pMtrWidth;
FixedText* m_pFtHeight;
MetricField* m_pMtrHeight;
CheckBox* m_pCbxScale;
SvxRectCtl* m_pCtlSize;
// protect
FixedLine maFlProtect;
TriStateBox maTsbPosProtect;
TriStateBox maTsbSizeProtect;
VclFrame* m_pFlProtect;
TriStateBox* m_pTsbPosProtect;
TriStateBox* m_pTsbSizeProtect;
// adjust
FixedLine maFlAdjust;
TriStateBox maTsbAutoGrowWidth;
TriStateBox maTsbAutoGrowHeight;
FixedLine maFlDivider;
VclFrame* m_pFlAdjust;
TriStateBox* m_pTsbAutoGrowWidth;
TriStateBox* m_pTsbAutoGrowHeight;
private:
const SfxItemSet& mrOutAttrs;
......
cui/source/tabpages/transfrm.src
Dosyayı görüntüle @ b232299c
......@@ -25,275 +25,6 @@
#define MA_TABPAGE_HEIGHT 185
// RID_SVXPAGE_POSITION_SIZE ------------------------------------------------
TabPage RID_SVXPAGE_POSITION_SIZE
{
HelpId = HID_TRANS_POSITION_SIZE ;
Hide = TRUE ;
Text [ en-US ] = "Position and Size" ;
Size = MAP_APPFONT ( 260 , MA_TABPAGE_HEIGHT ) ;
FixedLine FL_POSITION
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Position" ;
};
FixedText FT_POS_X
{
Pos = MAP_APPFONT ( 12 , 16 + 8 ) ;
Size = MAP_APPFONT ( 40 , 10 ) ;
Text [ en-US ] = "Position ~X" ;
};
FixedText FT_POS_Y
{
Pos = MAP_APPFONT ( 12 , 32 + 8 ) ;
Size = MAP_APPFONT ( 40 , 10 ) ;
Text [ en-US ] = "Position ~Y" ;
};
MetricField MTR_FLD_POS_X
{
HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X";
Border = TRUE ;
Pos = MAP_APPFONT ( 56 , 14 + 8 ) ;
Size = MAP_APPFONT ( 54 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = -120000 ;
Maximum = 240000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
SpinSize = 10 ;
};
MetricField MTR_FLD_POS_Y
{
HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y";
Border = TRUE ;
Pos = MAP_APPFONT ( 56 , 30 + 8 ) ;
Size = MAP_APPFONT ( 54 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = -120000 ;
Maximum = 240000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
SpinSize = 10 ;
};
FixedText FT_POSREFERENCE
{
Pos = MAP_APPFONT ( 178 , 2 + 8 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "Base point";
};
Control CTL_POSRECT
{
HelpId = HID_TPPOSITION_CTRL ;
Border = TRUE ;
Pos = MAP_APPFONT ( 178 , 12 + 8 ) ;
Size = MAP_APPFONT ( 48 , 34 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Base point" ;
};
// size
FixedLine FL_SIZE
{
Pos = MAP_APPFONT ( 6 , 56 ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Size" ;
};
FixedText FT_WIDTH
{
Pos = MAP_APPFONT ( 12 , 16 + 61 ) ;
Size = MAP_APPFONT ( 40 , 10 ) ;
Text [ en-US ] = "Wi~dth" ;
};
FixedText FT_HEIGHT
{
Pos = MAP_APPFONT ( 12 , 32 + 61 ) ;
Size = MAP_APPFONT ( 40 , 10 ) ;
Text [ en-US ] = "H~eight" ;
};
MetricField MTR_FLD_WIDTH
{
HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH";
Border = TRUE ;
Pos = MAP_APPFONT ( 56 , 14 + 61 ) ;
Size = MAP_APPFONT ( 54 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 120000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
SpinSize = 10 ;
};
MetricField MTR_FLD_HEIGHT
{
HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 56 , 30 + 61 ) ;
Size = MAP_APPFONT ( 54 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 1 ;
Maximum = 120000 ;
StrictFormat = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
SpinSize = 10 ;
};
FixedText FT_SIZEREFERENCE
{
Pos = MAP_APPFONT ( 178 , 2 + 61 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "Base point";
};
Control CTL_SIZERECT
{
HelpId = HID_TPSIZE_CTRL ;
Border = TRUE ;
Pos = MAP_APPFONT ( 178 , 12 + 61 ) ;
Size = MAP_APPFONT ( 48 , 34 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Base point" ;
};
CheckBox CBX_SCALE
{
HelpID = "cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE";
Pos = MAP_APPFONT ( 12 , 47 + 61 ) ;
Size = MAP_APPFONT ( 162 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Keep ratio" ;
};
// Protect
FixedLine FL_PROTECT
{
Pos = MAP_APPFONT ( 6 , 120 ) ;
Size = MAP_APPFONT ( 119 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Protect" ;
};
TriStateBox TSB_POSPROTECT
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT";
Pos = MAP_APPFONT ( 12 , 10 + 120 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
Text [ en-US ] = "Position" ;
TabStop = TRUE ;
};
TriStateBox TSB_SIZEPROTECT
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT";
Pos = MAP_APPFONT ( 12 , 24 + 120 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
Text [ en-US ] = "~Size" ;
TabStop = TRUE ;
};
// Adjust
FixedLine FL_ADJUST
{
Pos = MAP_APPFONT ( 6 + 123 + 6 , 120 ) ;
Size = MAP_APPFONT ( 119 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Adapt" ;
};
TriStateBox TSB_AUTOGROW_WIDTH
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH";
Pos = MAP_APPFONT ( 12 + 121 + 8, 10 + 120 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
Text [ en-US ] = "~Fit width to text" ;
TabStop = TRUE ;
};
TriStateBox TSB_AUTOGROW_HEIGHT
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT";
Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ;
Size = MAP_APPFONT ( 113 , 10 ) ;
Text [ en-US ] = "Fit ~height to text" ;
TabStop = TRUE ;
};
FixedLine FL_DIVIDER
{
Pos = MAP_APPFONT( 6 + 119 + 5, 128 );
Size = MAP_APPFONT( RSC_CD_FIXEDLINE_WIDTH, 26 );
Vert = True;
};
// Anchor
FixedLine FL_ANCHOR
{
Pos = MAP_APPFONT ( 6 + 123 + 6 , 120 ) ;
Size = MAP_APPFONT ( 119 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Hide = TRUE ;
Text [ en-US ] = "Anchor" ;
};
FixedText FT_ANCHOR
{
Pos = MAP_APPFONT ( 12 + 121 + 8, 10 + 120 ) ;
Size = MAP_APPFONT ( 37 , 10 ) ;
Hide = TRUE ;
Text [ en-US ] = "~Anchor" ;
};
ListBox LB_ANCHOR
{
HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR";
Pos = MAP_APPFONT ( 46 + 121 + 16 , 8 + 120 ) ;
Size = MAP_APPFONT ( 54 , 60 ) ;
Hide = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
< "To paragraph" ; > ;
< "As character" ; > ;
< "To page" ; > ;
< "To frame" ; > ;
};
};
FixedText FT_ORIENT
{
Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ;
Size = MAP_APPFONT ( 37 , 10 ) ;
Hide = TRUE ;
Text [ en-US ] = "P~osition";
};
ListBox LB_ORIENT
{
HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT";
Pos = MAP_APPFONT ( 46 + 121 + 16 , 22 + 120 );
Size = MAP_APPFONT ( 54 , 60 ) ;
Hide = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
< "From top" ; > ;
< "Above" ; > ;
< "Centered" ; > ;
< "Below" ; > ;
< "Top of character" ; > ;
< "Center of character" ; > ;
< "Bottom of character" ; > ;
< "Top of line" ; > ;
< "Center of line" ; > ;
< "Bottom of line" ; > ;
};
};
};
// RID_SVXPAGE_ANGLE --------------------------------------------------------
TabPage RID_SVXPAGE_ANGLE
......
cui/uiconfig/ui/possizetabpage.ui 0 → 100644
Dosyayı görüntüle @ b232299c
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