Skip to content

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

Widget UI for Text Flow tab page 

* Need to address help for the page

Conflicts:
	cui/UI_cui.mk

Change-Id: I7e4d9c9827ba80986059ff628d02f798eabbb4f6
Reviewed-on: https://gerrit.libreoffice.org/2184Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst e0210c3e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 335 deletions
cui/UI_cui.mk
Dosyayı görüntüle @ f54e175e
...@@ -52,6 +52,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\ ...@@ -52,6 +52,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/spellingdialog \ cui/uiconfig/ui/spellingdialog \
cui/uiconfig/ui/splitcellsdialog \ cui/uiconfig/ui/splitcellsdialog \
cui/uiconfig/ui/storedwebconnectiondialog \ cui/uiconfig/ui/storedwebconnectiondialog \
cui/uiconfig/ui/textflowpage \
cui/uiconfig/ui/thesaurus \ cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/twolinespage \ cui/uiconfig/ui/twolinespage \
cui/uiconfig/ui/zoomdialog \ cui/uiconfig/ui/zoomdialog \
......
cui/source/inc/paragrph.hxx
Dosyayı görüntüle @ f54e175e
...@@ -222,41 +222,37 @@ private: ...@@ -222,41 +222,37 @@ private:
SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
// hyphenation // hyphenation
FixedLine aExtFL; TriStateBox* m_pHyphenBox;
TriStateBox aHyphenBox; FixedText* m_pBeforeText;
FixedText aBeforeText; NumericField* m_pExtHyphenBeforeBox;
NumericField aExtHyphenBeforeBox; FixedText* m_pAfterText;
FixedText aAfterText; NumericField* m_pExtHyphenAfterBox;
NumericField aExtHyphenAfterBox; FixedText* m_pMaxHyphenLabel;
FixedText aMaxHyphenLabel; NumericField* m_pMaxHyphenEdit;
NumericField aMaxHyphenEdit;
// pagebreak // pagebreak
FixedLine aBreaksFL; TriStateBox* m_pPageBreakBox;
TriStateBox aPageBreakBox; FixedText* m_pBreakTypeFT;
FixedText aBreakTypeFT; ListBox* m_pBreakTypeLB;
ListBox aBreakTypeLB; FixedText* m_pBreakPositionFT;
FixedText aBreakPositionFT; ListBox* m_pBreakPositionLB;
ListBox aBreakPositionLB; TriStateBox* m_pApplyCollBtn;
TriStateBox aApplyCollBtn; ListBox* m_pApplyCollBox;
ListBox aApplyCollBox; FixedText* m_pPagenumText;
FixedText aPagenumText; NumericField* m_pPagenumEdit;
NumericField aPagenumEdit;
FixedLine aExtendFL;
// paragraph division // paragraph division
TriStateBox aKeepTogetherBox; TriStateBox* m_pKeepTogetherBox;
TriStateBox aKeepParaBox; TriStateBox* m_pKeepParaBox;
// orphan/widow // orphan/widow
TriStateBox aOrphanBox; TriStateBox* m_pOrphanBox;
NumericField aOrphanRowNo; NumericField* m_pOrphanRowNo;
FixedText aOrphanRowLabel; FixedText* m_pOrphanRowLabel;
TriStateBox aWidowBox; TriStateBox* m_pWidowBox;
NumericField aWidowRowNo; NumericField* m_pWidowRowNo;
FixedText aWidowRowLabel; FixedText* m_pWidowRowLabel;
sal_Bool bPageBreak; sal_Bool bPageBreak;
sal_Bool bHtmlMode; sal_Bool bHtmlMode;
......
cui/source/tabpages/paragrph.hrc
Dosyayı görüntüle @ f54e175e
...@@ -61,37 +61,6 @@ ...@@ -61,37 +61,6 @@
#define ST_LEFTALIGN_ASIAN 53 #define ST_LEFTALIGN_ASIAN 53
#define ST_RIGHTALIGN_ASIAN 54 #define ST_RIGHTALIGN_ASIAN 54
// ExtendedTabPage ----------------------------------------------------------
#define BTN_HYPHEN 50
#define ED_HYPHENBEFORE 52
#define FT_HYPHENBEFORE 53
#define ED_HYPHENAFTER 55
#define FT_HYPHENAFTER 56
#define FL_HYPHEN 57
#define BTN_PAGEBREAK 60
#define FT_BREAKTYPE 61
#define LB_BREAKTYPE 62
#define FT_BREAKPOSITION 63
#define LB_BREAKPOSITION 64
#define BTN_PAGECOLL 65
#define LB_PAGECOLL 66
#define BTN_KEEPTOGETHER 67
#define BTN_WIDOWS 68
#define ED_WIDOWS 69
#define FT_WIDOWS 70
#define BTN_ORPHANS 71
#define ED_ORPHANS 72
#define FT_ORPHANS 73
#define FL_OPTIONS 74
#define FT_PAGENUM 75
#define ED_PAGENUM 76
#define FL_BREAKS 77
#define CB_KEEPTOGETHER 80
#define FT_MAXHYPH 81
#define ED_MAXHYPH 83
#define CB_REGISTER 84 #define CB_REGISTER 84
#define FL_REGISTER 85 #define FL_REGISTER 85
......
cui/source/tabpages/paragrph.src
Dosyayı görüntüle @ f54e175e
...@@ -416,282 +416,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH ...@@ -416,282 +416,7 @@ TabPage RID_SVXPAGE_ALIGN_PARAGRAPH
Hide = TRUE ; Hide = TRUE ;
}; };
}; };
// RID_SVXPAGE_EXT_PARAGRAPH ---------------------------------------------
TabPage RID_SVXPAGE_EXT_PARAGRAPH
{
HelpId = HID_FORMAT_PARAGRAPH_EXT ;
Hide = TRUE ;
Text [ en-US ] = "Text Flow" ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
TriStateBox BTN_HYPHEN
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "A~utomatically" ;
};
NumericField ED_HYPHENBEFORE
{
HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 26 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Group = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 2 ;
Maximum = 9 ;
Value = 2 ;
First = 2 ;
Last = 9 ;
};
FixedText FT_HYPHENBEFORE
{
Disable = TRUE ;
Pos = MAP_APPFONT ( 48 , 29 ) ;
Size = MAP_APPFONT ( 200 , 8 ) ;
Text [ en-US ] = "C~haracters at line end" ;
Left = TRUE ;
};
NumericField ED_HYPHENAFTER
{
HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 41 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Group = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 2 ;
Maximum = 9 ;
Value = 2 ;
First = 2 ;
Last = 9 ;
};
FixedText FT_HYPHENAFTER
{
Disable = TRUE ;
Pos = MAP_APPFONT ( 48 , 43 ) ;
Size = MAP_APPFONT ( 200 , 8 ) ;
Text [ en-US ] = "Cha~racters at line begin" ;
Left = TRUE ;
};
FixedText FT_MAXHYPH
{
Pos = MAP_APPFONT ( 48 , 57 ) ;
Size = MAP_APPFONT ( 200 , 8 ) ;
WordBreak = TRUE ;
Text [ en-US ] = "~Maximum number of consecutive hyphens" ;
};
NumericField ED_MAXHYPH
{
HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH";
Border = TRUE ;
Pos = MAP_APPFONT ( 21 , 55 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Group = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Maximum = 99 ;
Last = 99 ;
};
FixedLine FL_HYPHEN
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Hyphenation" ;
};
FixedLine FL_OPTIONS
{ // is moved one section deeper to not raise unnecessary translations
Pos = MAP_APPFONT ( 6 , 116 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Options" ;
Group = TRUE ;
};
FixedLine FL_BREAKS
{
Pos = MAP_APPFONT ( 6 , 73 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Breaks" ;
Group = TRUE ;
};
TriStateBox BTN_PAGEBREAK
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK";
// Disable = TRUE;
Pos = MAP_APPFONT ( 12 , 86 ) ;
Size = MAP_APPFONT ( 61 , 10 ) ;
Text [ en-US ] = "Insert" ;
Group = TRUE ;
};
FixedText FT_BREAKTYPE
{
Pos = MAP_APPFONT ( 75 , 86 ) ;
Size = MAP_APPFONT ( 21 , 10 ) ;
Text [ en-US ] = "~Type";
};
ListBox LB_BREAKTYPE
{
HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE";
Border = TRUE ;
Pos = MAP_APPFONT ( 98 , 84 ) ;
Size = MAP_APPFONT ( 61 , 50 ) ;
DropDown = TRUE ;
StringList [ en-US ] =
{
< "Page" ; 0; > ;
< "Column" ; 1; > ;
};
};
FixedText FT_BREAKPOSITION
{
Pos = MAP_APPFONT ( 163 , 86 ) ;
Size = MAP_APPFONT ( 45 , 10 ) ;
Right = TRUE;
Text [ en-US ] = "Position";
};
ListBox LB_BREAKPOSITION
{
HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION";
Border = TRUE ;
Pos = MAP_APPFONT ( 211 , 84 ) ;
Size = MAP_APPFONT ( 40 , 50 ) ;
DropDown = TRUE ;
StringList [ en-US ] =
{
< "Before" ; 0; > ;
< "After" ; 1; > ;
};
};
TriStateBox BTN_PAGECOLL
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL";
// Disable = TRUE;
Pos = MAP_APPFONT (21 , 100 ) ;
Size = MAP_APPFONT ( 75 , 10 ) ;
Text [ en-US ] = "With Page St~yle" ;
Group = TRUE ;
};
ListBox LB_PAGECOLL
{
HelpID = "cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL";
// Disable = TRUE;
Pos = MAP_APPFONT ( 98 , 98 ) ;
Size = MAP_APPFONT ( 61 , 50 ) ;
DropDown = TRUE ;
Sort = TRUE;
};
FixedText FT_PAGENUM
{
Pos = MAP_APPFONT ( 163 , 100 ) ;
Size = MAP_APPFONT ( 45 , 8 ) ;
Right = TRUE ;
Text [ en-US ] = "Page ~number" ;
};
NumericField ED_PAGENUM
{
HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM";
Border = TRUE ;
Pos = MAP_APPFONT ( 211 , 98 ) ;
Size = MAP_APPFONT ( 26 , 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 0 ;
Maximum = 9999 ;
Value = 0 ;
First = 0 ;
Last = 9999 ;
};
TriStateBox BTN_KEEPTOGETHER
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER";
Pos = MAP_APPFONT ( 12 , 127 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "~Do not split paragraph" ;
Group = TRUE ;
};
TriStateBox CB_KEEPTOGETHER
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER";
Pos = MAP_APPFONT ( 12, 141 ) ;
Size = MAP_APPFONT ( 236 , 10 ) ;
Text [ en-US ] = "~Keep with next paragraph" ;
};
TriStateBox BTN_ORPHANS
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS";
Disable = TRUE ;
Pos = MAP_APPFONT ( 12 , 155 ) ;
Size = MAP_APPFONT ( 120 , 10 ) ;
Group = TRUE ;
Text [ en-US ] = "~Orphan control";
};
NumericField ED_ORPHANS
{
HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 134 , 153 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Group = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 2 ;
Maximum = 9 ;
Value = 2 ;
First = 2 ;
Last = 9 ;
};
FixedText FT_ORPHANS
{
Disable = TRUE ;
Pos = MAP_APPFONT ( 161 , 155 ) ;
Size = MAP_APPFONT ( 86 , 8 ) ;
Text [ en-US ] = "Lines" ;
Left = TRUE ;
};
TriStateBox BTN_WIDOWS
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS";
Disable = TRUE ;
Pos = MAP_APPFONT ( 12 , 169 ) ;
Size = MAP_APPFONT ( 120 , 10 ) ;
Group = TRUE ;
Text [ en-US ] = "~Widow control";
};
NumericField ED_WIDOWS
{
HelpID = "cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS";
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 134 , 167 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Group = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
Minimum = 2 ;
Maximum = 9 ;
Value = 2 ;
First = 2 ;
Last = 9 ;
};
FixedText FT_WIDOWS
{
Disable = TRUE ;
Pos = MAP_APPFONT ( 161 , 169 ) ;
Size = MAP_APPFONT ( 86 , 8 ) ;
Text [ en-US ] = "Lines" ;
Left = TRUE ;
};
};
String STR_EXAMPLE String STR_EXAMPLE
{ {
Text [ en-US ] = "Example" ; Text [ en-US ] = "Example" ;
......
cui/uiconfig/ui/textflowpage.ui 0 → 100644
Dosyayı görüntüle @ f54e175e
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