Skip to content

C
core
Kaydet (Commit) b59b183c authored tarafından Jan Holesovsky's avatar Jan Holesovsky
Dosyalara gözat
Seçenekler

line spacing: Convert the ParaLineSpacingControl to .ui. 

Change-Id: I81dd0d541e7f7dd3e3fb881c2c318f9adc733fde
üst 5929a87b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 234 deletions
include/svx/dialogs.hrc
Dosyayı görüntüle @ b59b183c
......@@ -1015,16 +1015,6 @@
#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1241)
#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0)
#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1)
#define IMG_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 2)
#define IMG_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 3)
#define IMG_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 4)
#define IMG_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 5)
#define IMG_SEL_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 6)
#define IMG_SEL_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 7)
#define IMG_SEL_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 8)
#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 9)
#define IMG_PARA_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 10)
#define IMG_PARA_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 11)
#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 12)
#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 13)
#define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21)
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ b59b183c
......@@ -41,6 +41,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/namespacedialog \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/paralinespacingcontrol \
svx/uiconfig/ui/passwd \
svx/uiconfig/ui/querydeletecontourdialog \
svx/uiconfig/ui/querydeleteobjectdialog \
......
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
Dosyayı görüntüle @ b59b183c
......@@ -62,36 +62,10 @@ private:
long nMinFixDist;
Edit* pActLineDistFld;
svx::sidebar::ValueSetWithTextControl maLineSpacing;
ListBox* mpLineDist;
FixedText maCustomFT;
FixedText maLSpacingFT;
ListBox aLineDist;
FixedText maOfFT;
MetricField aLineDistAtPercentBox;
MetricField aLineDistAtMetricBox;
Image maSpacing1;
Image maSpacing115;
Image maSpacing15;
Image maSpacing2;
Image maSelSpacing1;
Image maSelSpacing115;
Image maSelSpacing15;
Image maSelSpacing2;
Image maSelSelHanging;
Image maImgCus;
Image maImgCusGrey;
OUString maStrCus;
Image* mpImg;
Image* mpImgSel;
OUString* mpStr;
OUString* mpStrTip;
OUString maLine;
OUString maOf;
MetricField* mpLineDistAtPercentBox;
MetricField* mpLineDistAtMetricBox;
sal_Int64 maValue;
sal_uInt16 maPos;
......
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
Dosyayı görüntüle @ b59b183c
......@@ -37,22 +37,6 @@
#define ED_SBINDE_LINEDISTPERCENT 2
#define ED_SBINDE_LINEDISTPOINT 3
#define FT_CUSTOM 14
#define FT_LINE_SPACING 15
#define FT_OF 16
#define LINE_SPACING 29
#define STR_SPACING1 30
#define STR_SPACING115 31
#define STR_SPACING15 32
#define STR_SPACING2 33
#define STR_LCVALUE 36
#define STR_LS_SINGLE 37
#define STR_LS_115 38
#define STR_LS_15 39
#define STR_LS_DOUBLE 40
#define STR_LSPACING 41
#define STR_LS_OF 42
//============================== Help ID ==============================
#define HID_POPUP_BULLET_CB_BULLET_MORE "HID_POPUP_BULLET_CB_BULLET_MORE"
#define HID_POPUP_BULLET_VS_VALUES "HID_POPUP_BULLET_VS_VALUES"
......
svx/source/sidebar/paragraph/ParaPropertyPanel.src
Dosyayı görüntüle @ b59b183c
......@@ -146,185 +146,6 @@ Control RID_POPUPPANEL_PARAPAGE_NUMBERING
};
};
//===========================================Line Space popup page==============================
Image IMG_SPACING1
{
ImageBitmap = Bitmap{File = "symphony/lpspacing-1.png";};
};
Image IMG_SPACING115
{
ImageBitmap = Bitmap{File = "symphony/lpspacing-1_15.png";};
};
Image IMG_SPACING15
{
ImageBitmap = Bitmap{File = "symphony/lpspacing-1_5.png";};
};
Image IMG_SPACING2
{
ImageBitmap = Bitmap{File = "symphony/lpspacing-2.png";};
};
Image IMG_SEL_SPACING1
{
ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1.png";};
};
Image IMG_SEL_SPACING115
{
ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1_15.png";};
};
Image IMG_SEL_SPACING15
{
ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1_5.png";};
};
Image IMG_SEL_SPACING2
{
ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-2.png";};
};
Image IMG_PARA_CUSTOM
{
ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
};
Image IMG_PARA_CUSTOM_GRAY
{
ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
};
Control RID_POPUPPANEL_PARAPAGE_LINESPACING
{
OutputSize = TRUE;
DialogControl = TRUE;
Border = FALSE;
Size = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_SPACING_WIDTH, POPUP_PAGE_HEIGHT );
Control LINE_SPACING
{
Pos = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y );
Size = MAP_APPFONT ( VS_SPACING_WIDTH , 17 * 5);
TabStop = TRUE ;
Text = "Line Spacing";
};
FixedText FT_CUSTOM
{
Pos = MAP_APPFONT ( POP_FT_CUSTOM_X, POP_FT_CUSTOM_Y );
Size = MAP_APPFONT ( _FIXED_TEXT_WIDTH + 50 , _FIXED_TEXT_HEIGHT) ;
Text [ en-US ] = "Custom:";
};
FixedText FT_LINE_SPACING
{
Pos = MAP_APPFONT ( FT_1_X, FT_1_Y );
Size = MAP_APPFONT ( _FIXED_TEXT_WIDTH + 10, _FIXED_TEXT_HEIGHT) ;
Text [ en-US ] = "~Line Spacing:";
};
FixedText FT_OF
{
Pos = MAP_APPFONT ( FT_2_X, FT_2_Y );
Size = MAP_APPFONT ( _FIXED_TEXT_WIDTH , _FIXED_TEXT_HEIGHT) ;
Text [ en-US ] = "~Of:";
};
ListBox LB_LINE_SPACING
{
Border = TRUE ;
Pos = MAP_APPFONT ( EDIT_1_X, EDIT_1_Y );
Size = MAP_APPFONT ( BD_WIDTH - POPUPPANEL_MARGIN_LARGE * 2,LISTBOX_HEIGHT ) ;
TabStop = TRUE ;
DropDown = TRUE ;
HelpID = HID_POPUP_LS_LB_LINE_SPACING ;
StringList [ en-US ] =
{
< "Single" ; Default ; > ;
< "1.5 Lines" ; Default ; > ;
< "Double" ; Default ; > ;
< "Proportional" ; Default ; > ;
< "At least" ; Default ; > ;
< "Leading" ; Default ; > ;
< "Fixed" ; Default ; > ;
};
};
MetricField ED_SBINDE_LINEDISTPERCENT
{
Disable = TRUE;
Border = TRUE;
Pos = MAP_APPFONT ( EDIT_2_X, EDIT_2_Y );
Size = MAP_APPFONT ( BD_WIDTH - POPUPPANEL_MARGIN_LARGE * 2,MBOX_HEIGHT ) ;
HelpID = HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT ;
Repeat = TRUE;
Spin = TRUE;
Minimum = 50;
Maximum = 200;
Value = 100;
StrictFormat = TRUE;
Unit = FUNIT_PERCENT ;
First = 50;
Last = 200;
SpinSize = 1;
};
MetricField ED_SBINDE_LINEDISTPOINT
{
Disable = TRUE;
Border = TRUE;
Pos = MAP_APPFONT ( EDIT_2_X, EDIT_2_Y );
Size = MAP_APPFONT ( BD_WIDTH - POPUPPANEL_MARGIN_LARGE * 2, MBOX_HEIGHT ) ;
HelpID = HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT ;
Repeat = TRUE;
Spin = TRUE;
Maximum = 9999;
DecimalDigits = 2;
StrictFormat = TRUE ;
Unit = FUNIT_INCH;
Last = 9999;
SpinSize = 2;
};
String STR_LS_SINGLE
{
Text [ en-US ] = "Line spacing: Single";
};
String STR_LS_115
{
Text [ en-US ] = "Line spacing: 1.15 Lines";
};
String STR_LS_15
{
Text [ en-US ] = "Line spacing: 1.5 Lines";
};
String STR_LS_DOUBLE
{
Text [ en-US ] = "Line spacing: Double";
};
String STR_LSPACING
{
Text [ en-US ] = "Line spacing:";
};
String STR_LS_OF
{
Text [ en-US ] = "of:";
};
String STR_SPACING1
{
Text [ en-US ] = "Spacing: 1";
};
String STR_SPACING115
{
Text [ en-US ] = "Spacing: 1.15";
};
String STR_SPACING15
{
Text [ en-US ] = "Spacing: 1.5";
};
String STR_SPACING2
{
Text [ en-US ] = "Spacing: 2";
};
String STR_LCVALUE
{
Text [ en-US ] = "Last Custom Value";
};
};
String RID_SVXSTR_NUMBULLET_NONE
{
Text [en-US] = "None";
......
svx/uiconfig/ui/paralinespacingcontrol.ui 0 → 100644
Dosyayı görüntüle @ b59b183c
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