[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 4 02:51:04 PST 2011
sw/source/ui/misc/titlepage.src | 56 ++++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 28 deletions(-)
New commits:
commit d45b32b52f21c6078b2a945bf84864b046dd3a0b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 4 10:42:47 2011 +0000
Resolves: fdo#32633 stretch title dialog to get translations to fix
(cherry picked from commit c75a9e280e3f1282c25d7c1f572cfa4bad3f8ba8)
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index 4eed4f8..deade3e 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -54,7 +54,7 @@ ModalDialog DLG_TITLEPAGE
RadioButton RB_USE_EXISTING_PAGES
{
Pos = MAP_APPFONT ( 12 , 18 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
Text [ en-US ] = "Convert existing pages to title pages" ;
TabStop = TRUE ;
Check = TRUE ;
@@ -63,20 +63,20 @@ ModalDialog DLG_TITLEPAGE
RadioButton RB_INSERT_NEW_PAGES
{
Pos = MAP_APPFONT ( 12 , 34 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
Text [ en-US ] = "Insert new title pages" ;
Text [ x-comment ] = " ";
};
FixedText FT_PAGE_COUNT
{
Pos = MAP_APPFONT ( 12 , 50 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
+ Size = MAP_APPFONT ( 82 , 8 ) ;
Text [ en-US ] = "Number of title pages" ;
Text [ x-comment ] = " ";
};
NumericField NF_PAGE_COUNT
{
- Pos = MAP_APPFONT ( 80 , 50 ) ;
+ Pos = MAP_APPFONT ( 100 , 50 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -91,7 +91,7 @@ ModalDialog DLG_TITLEPAGE
};
FixedText FT_PAGE_PAGES
{
- Pos = MAP_APPFONT ( 116 , 50 ) ;
+ Pos = MAP_APPFONT ( 136 , 50 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = "pages" ;
Text [ x-comment ] = " ";
@@ -99,14 +99,14 @@ ModalDialog DLG_TITLEPAGE
FixedText FT_PAGE_START
{
Pos = MAP_APPFONT ( 12 , 66 ) ;
- Size = MAP_APPFONT ( 58 , 8 ) ;
+ Size = MAP_APPFONT ( 82 , 8 ) ;
Text [ en-US ] = "Place title pages at" ;
Text [ x-comment ] = " ";
};
RadioButton RB_DOCUMENT_START
{
- Pos = MAP_APPFONT ( 80 , 66 ) ;
- Size = MAP_APPFONT ( 80 , 10 ) ;
+ Pos = MAP_APPFONT ( 100 , 66 ) ;
+ Size = MAP_APPFONT ( 110 , 10 ) ;
Text [ en-US ] = "Document Start" ;
TabStop = TRUE ;
Check = TRUE ;
@@ -114,14 +114,14 @@ ModalDialog DLG_TITLEPAGE
};
RadioButton RB_PAGE_START
{
- Pos = MAP_APPFONT ( 80 , 78 ) ;
+ Pos = MAP_APPFONT ( 100 , 78 ) ;
Size = MAP_APPFONT ( 30 , 10 ) ;
Text [ en-US ] = "Page" ;
Text [ x-comment ] = " ";
};
NumericField NF_PAGE_START
{
- Pos = MAP_APPFONT ( 111 , 78 ) ;
+ Pos = MAP_APPFONT ( 131 , 78 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -144,7 +144,7 @@ ModalDialog DLG_TITLEPAGE
CheckBox CB_RESTART_NUMBERING
{
Pos = MAP_APPFONT ( 12, 111 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Reset Page Numbering after title pages" ;
Text [ x-comment ] = " ";
@@ -152,13 +152,13 @@ ModalDialog DLG_TITLEPAGE
FixedText FT_RESTART_NUMBERING
{
Pos = MAP_APPFONT ( 20 , 125 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ Size = MAP_APPFONT ( 74 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_RESTART_NUMBERING
{
- Pos = MAP_APPFONT ( 60 , 125 ) ;
+ Pos = MAP_APPFONT ( 100 , 125 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -174,7 +174,7 @@ ModalDialog DLG_TITLEPAGE
CheckBox CB_SET_PAGE_NUMBER
{
Pos = MAP_APPFONT ( 12 , 139 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Set Page Number for first title page" ;
Text [ x-comment ] = " ";
@@ -182,13 +182,13 @@ ModalDialog DLG_TITLEPAGE
FixedText FT_SET_PAGE_NUMBER
{
Pos = MAP_APPFONT ( 20 , 153 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ Size = MAP_APPFONT ( 74 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 60 , 153 ) ;
+ Pos = MAP_APPFONT ( 100 , 153 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -212,7 +212,7 @@ ModalDialog DLG_TITLEPAGE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 182 ) ;
- Size = MAP_APPFONT ( 150 , 80 ) ;
+ Size = MAP_APPFONT ( 152 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
commit 3748bdef44c7e1649a5db723fad762d314b84646
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 29 20:53:22 2010 +0000
Resolves: fdo#32633 rearrange title dialog to get translations to fix
(cherry picked from commit 049b8e51b06f64fa8b353d65589b55d60ce5b83e)
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index 57b9075..4eed4f8 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -40,7 +40,7 @@ ModalDialog DLG_TITLEPAGE
HelpID = HID_TITLEPAGE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 216 , 201 ) ;
+ Size = MAP_APPFONT ( 216 , 229 ) ;
Text [ en-US ] = "Title Pages" ;
Moveable = TRUE ;
@@ -105,7 +105,7 @@ ModalDialog DLG_TITLEPAGE
};
RadioButton RB_DOCUMENT_START
{
- Pos = MAP_APPFONT ( 70 , 66 ) ;
+ Pos = MAP_APPFONT ( 80 , 66 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = "Document Start" ;
TabStop = TRUE ;
@@ -114,14 +114,14 @@ ModalDialog DLG_TITLEPAGE
};
RadioButton RB_PAGE_START
{
- Pos = MAP_APPFONT ( 70 , 78 ) ;
+ Pos = MAP_APPFONT ( 80 , 78 ) ;
Size = MAP_APPFONT ( 30 , 10 ) ;
Text [ en-US ] = "Page" ;
Text [ x-comment ] = " ";
};
NumericField NF_PAGE_START
{
- Pos = MAP_APPFONT ( 95 , 78 ) ;
+ Pos = MAP_APPFONT ( 111 , 78 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -151,14 +151,14 @@ ModalDialog DLG_TITLEPAGE
};
FixedText FT_RESTART_NUMBERING
{
- Pos = MAP_APPFONT ( 140 , 111 ) ;
+ Pos = MAP_APPFONT ( 20 , 125 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_RESTART_NUMBERING
{
- Pos = MAP_APPFONT ( 180 , 111 ) ;
+ Pos = MAP_APPFONT ( 60 , 125 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -173,7 +173,7 @@ ModalDialog DLG_TITLEPAGE
};
CheckBox CB_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 12 , 125 ) ;
+ Pos = MAP_APPFONT ( 12 , 139 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Set Page Number for first title page" ;
@@ -181,14 +181,14 @@ ModalDialog DLG_TITLEPAGE
};
FixedText FT_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 140 , 125 ) ;
+ Pos = MAP_APPFONT ( 20 , 153 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 180 , 125 ) ;
+ Pos = MAP_APPFONT ( 60 , 153 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -203,7 +203,7 @@ ModalDialog DLG_TITLEPAGE
};
FixedLine FL_PAGE_PROPERTIES
{
- Pos = MAP_APPFONT ( 6 , 141 ) ;
+ Pos = MAP_APPFONT ( 6 , 169 ) ;
Size = MAP_APPFONT ( 204 , 8 ) ;
Text [ en-US ] = "Edit Page Properties" ;
Text [ x-comment ] = " ";
@@ -211,7 +211,7 @@ ModalDialog DLG_TITLEPAGE
ListBox LB_PAGE_PROPERTIES
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 154 ) ;
+ Pos = MAP_APPFONT ( 12 , 182 ) ;
Size = MAP_APPFONT ( 150 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -219,30 +219,30 @@ ModalDialog DLG_TITLEPAGE
};
PushButton PB_PAGE_PROPERTIES
{
- Pos = MAP_APPFONT ( 170 , 154 ) ;
+ Pos = MAP_APPFONT ( 170 , 182 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Text [ en-US ] = "Edit..." ;
};
FixedLine FL_BOTTOM
{
- Pos = MAP_APPFONT ( 6 , 170 ) ;
+ Pos = MAP_APPFONT ( 6 , 198 ) ;
Size = MAP_APPFONT ( 204 , 8 ) ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( 54 , 181 ) ;
+ Pos = MAP_APPFONT ( 54 , 209 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( 107 , 181 ) ;
+ Pos = MAP_APPFONT ( 107 , 209 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE ;
};
HelpButton PB_HELP
{
- Pos = MAP_APPFONT ( 160 , 181 ) ;
+ Pos = MAP_APPFONT ( 160 , 209 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
};
More information about the Libreoffice-commits
mailing list