Kaydet (Commit) 0651e83d authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara

Convert line end tab page to widget UI

Change-Id: If7317c33142d0854a4e10953e1a8bbcb0403ec59
Reviewed-on: https://gerrit.libreoffice.org/5282Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e289eb65
......@@ -41,6 +41,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/messbox \
cui/uiconfig/ui/namedialog \
......
......@@ -332,18 +332,14 @@ class SvxLineEndDefTabPage : public SfxTabPage
using TabPage::DeactivatePage;
private:
FixedLine aFlTip;
FixedText aFTTitle;
Edit aEdtName;
FixedText aFTLineEndStyle;
LineEndLB aLbLineEnds;
PushButton aBtnAdd;
PushButton aBtnModify;
PushButton aBtnDelete;
ImageButton aBtnLoad;
ImageButton aBtnSave;
FixedInfo aFiTip;
SvxXLinePreview aCtlPreview;
Edit* m_pEdtName;
LineEndLB* m_pLbLineEnds;
PushButton* m_pBtnAdd;
PushButton* m_pBtnModify;
PushButton* m_pBtnDelete;
PushButton* m_pBtnLoad;
PushButton* m_pBtnSave;
SvxXLinePreview* m_pCtlPreview;
const SfxItemSet& rOutAttrs;
const SdrObject* pPolyObj;
......
......@@ -242,7 +242,7 @@
#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
#define HID_LINE_ENDDEF "CUI_HID_LINE_ENDDEF"
#define HID_LINE_DEF "CUI_HID_LINE_DEF"
#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
......
......@@ -48,11 +48,5 @@
#define BTN_DELETE 3
#define BTN_LOAD 5
#define BTN_SAVE 6
#define EDT_NAME 1
#define LB_LINEENDS 1
#define FL_TIP 1
#define FI_TIP 10
#define FT_LINE_END_STYLE 11
#define FT_TITLE 12
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -300,124 +300,6 @@ TabPage RID_SVXPAGE_LINE_DEF
};
};
// Defining LineEnds --------------------
TabPage RID_SVXPAGE_LINEEND_DEF
{
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
HelpId = HID_LINE_ENDDEF ;
Hide = TRUE ;
Text [ en-US ] = "Arrowheads" ;
FixedLine FL_TIP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Organize arrow styles" ;
};
FixedText FI_TIP
{
Pos = MAP_APPFONT ( 6 , 123 ) ;
Size = MAP_APPFONT ( 252 , 8 ) ;
Text [ en-US ] = "Add a selected object to create new arrow styles." ;
WordBreak = TRUE ;
};
FixedText FT_LINE_END_STYLE
{
Pos = MAP_APPFONT ( 12 , 32 ) ;
Size = MAP_APPFONT ( 84 , 8 ) ;
Text [ en-US ] = "Arrow style" ;
};
Edit EDT_NAME
{
HelpID = "cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 98 , 14 ) ;
Size = MAP_APPFONT ( 87 , 12 ) ;
TabStop = TRUE ;
};
FixedText FT_TITLE
{
Pos = MAP_APPFONT ( 12 , 16 ) ;
Size = MAP_APPFONT ( 84 , 8 ) ;
Text [ en-US ] = "~Title" ;
};
ListBox LB_LINEENDS
{
HelpID = "cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS";
Border = TRUE ;
Pos = MAP_APPFONT ( 98 , 30 ) ;
Size = MAP_APPFONT ( 87 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
DDExtraWidth = TRUE ;
};
PushButton BTN_ADD
{
HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD";
Pos = MAP_APPFONT ( 198 , 14 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add..." ;
TabStop = TRUE ;
};
PushButton BTN_MODIFY
{
HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY";
Pos = MAP_APPFONT ( 198 , 34 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Modify..." ;
TabStop = TRUE ;
};
PushButton BTN_DELETE
{
HelpID = "cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE";
Pos = MAP_APPFONT ( 198 , 54 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Delete..." ;
TabStop = TRUE ;
};
ImageButton BTN_LOAD
{
HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD";
Pos = MAP_APPFONT ( 198 , 74 ) ;
Size = MAP_APPFONT ( 16 , 16 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Load Arrow Styles" ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "sc05501.bmp" ;
};
MASKCOLOR
};
};
ImageButton BTN_SAVE
{
HelpID = "cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE";
Pos = MAP_APPFONT ( 198 , 96 ) ;
Size = MAP_APPFONT ( 16 , 16 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Save Arrow Styles" ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "sc05502.bmp" ;
};
MASKCOLOR
};
};
Control CTL_PREVIEW
{
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 135 ) ;
Size = MAP_APPFONT ( 248 , 40 ) ;
};
};
// RID_SVXDLG_LINE ----------------------------------------------------------
TabDialog RID_SVXDLG_LINE
{
......
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