[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

Petr Mladek pmladek at kemper.freedesktop.org
Mon Jan 30 11:15:31 PST 2012


 sc/source/ui/namedlg/namedefdlg.cxx |    2 -
 sc/source/ui/src/namedefdlg.src     |   56 ++++++++++++++++++------------------
 sc/source/ui/src/namedlg.src        |   52 ++++++++++++++++-----------------
 3 files changed, 55 insertions(+), 55 deletions(-)

New commits:
commit b15d3b50ba468defd3109e5ec0aef331e222cb5e
Author: Stefan Knorr (astron) <heinzlesspam at gmail.com>
Date:   Thu Jan 26 14:36:16 2012 +0100

    Make named ranges dialog more consistent, localizable (I+II+III)
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 9f87047..45c600b 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -345,7 +345,7 @@ void ScNameDefDlg::MorePushed()
     Size nSize = GetSizePixel();
 
     //depending on the state of the button, move all elements below up/down
-    long nPixel = 75;
+    long nPixel = 65;
     if (!maBtnMore.GetState())
     {
         nPixel *= -1;
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 42538dd..2bf1926 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -34,118 +34,118 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
     HelpId = CMD_FID_ADD_NAME ;
     Hide = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 200 , 120 ) ;
+    Size = MAP_APPFONT ( 225 , 116 ) ;
     Text [ en-US ] = "Define Name" ;
     Moveable = TRUE ;
     Closeable = TRUE;
     PushButton BTN_ADD
     {
-        Pos = MAP_APPFONT( 90, 100 );
+        Pos = MAP_APPFONT( 115, 96 );
         Size = MAP_APPFONT( 50, 15 );
         TabStop = TRUE;
         Text [en-US] = "Add";
     };
     PushButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT( 145, 100 );
+        Pos = MAP_APPFONT( 170, 96 );
         Size = MAP_APPFONT ( 50, 15 );
         TabStop = TRUE;
         Text [en-US] = "Cancel";
     };
     CheckBox BTN_MORE
     {
-        Pos = MAP_APPFONT( 5, 82 );
+        Pos = MAP_APPFONT( 5, 81 );
         Size = MAP_APPFONT( 80, 15 );
         Text [en-US] = "Range Options";
     };
     FixedText FT_INFO
     {
         Pos = MAP_APPFONT( 5, 5 );
-        Size = MAP_APPFONT( 180, 15 );
+        Size = MAP_APPFONT( 215, 15 );
     };
     FixedText FT_NAME
     {
-        Pos = MAP_APPFONT( 5, 25 );
-        Size = MAP_APPFONT( 30, 15 );
+        Pos = MAP_APPFONT( 5, 27 );
+        Size = MAP_APPFONT( 50, 13 );
         Text [en-US] = "Name";
     };
     FixedText FT_RANGE
     {
         Pos = MAP_APPFONT( 5, 45 );
-        Size = MAP_APPFONT( 30, 15 );
+        Size = MAP_APPFONT( 50, 13 );
         Text [en-US] = "Range";
     };
     FixedText FT_SCOPE
     {
-        Pos = MAP_APPFONT( 5, 65 );
-        Size = MAP_APPFONT( 30, 15 );
+        Pos = MAP_APPFONT( 5, 63 );
+        Size = MAP_APPFONT( 50, 13 );
         Text [en-US] = "Scope";
     };
     Edit ED_NAME
     {
         Border = TRUE;
-        Pos = MAP_APPFONT( 40, 25 );
-        Size = MAP_APPFONT( 155, 15 );
+        Pos = MAP_APPFONT( 60, 25 );
+        Size = MAP_APPFONT( 160, 13 );
         TabStop = TRUE;
     };
     Edit ED_RANGE
     {
         Border = TRUE;
-        Pos = MAP_APPFONT( 40, 45 );
-        Size = MAP_APPFONT( 140, 15 );
+        Pos = MAP_APPFONT( 60, 43 );
+        Size = MAP_APPFONT( 145, 13 );
         TabStop = TRUE;
     };
     ImageButton RB_RANGE
     {
-        Pos = MAP_APPFONT ( 180 , 45 ) ;
-        Size = MAP_APPFONT ( 15 , 15 ) ;
+        Pos = MAP_APPFONT ( 205 , 43 ) ;
+        Size = MAP_APPFONT ( 15 , 13 ) ;
         TabStop = TRUE ;
         QuickHelpText [ en-US ] = "Shrink" ;
     };
     CheckBox BTN_PRINTAREA
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA";
-        Pos = MAP_APPFONT ( 5 , 100 ) ;
-        Size = MAP_APPFONT ( 80 , 15 ) ;
+        Pos = MAP_APPFONT ( 5 , 94 ) ;
+        Size = MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "~Print range" ;
         TabStop = TRUE ;
     };
     CheckBox BTN_CRITERIA
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA";
-        Pos = MAP_APPFONT ( 5 , 120 ) ;
-        Size = MAP_APPFONT ( 60 , 15 ) ;
+        Pos = MAP_APPFONT ( 5 , 107 ) ;
+        Size = MAP_APPFONT ( 70 , 10 ) ;
         Text [ en-US ] = "~Filter" ;
         TabStop = TRUE ;
     };
     CheckBox BTN_ROWHEADER
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER";
-        Pos = MAP_APPFONT ( 110, 120 ) ;
-        Size = MAP_APPFONT ( 82 , 15 ) ;
+        Pos = MAP_APPFONT ( 120, 107 ) ;
+        Size = MAP_APPFONT ( 92 , 10 ) ;
         Text [ en-US ] = "Repeat ~row" ;
         TabStop = TRUE ;
     };
     CheckBox BTN_COLHEADER
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER";
-        Pos = MAP_APPFONT ( 110 , 100 ) ;
-        Size = MAP_APPFONT ( 82 , 15 ) ;
+        Pos = MAP_APPFONT ( 120 , 94 ) ;
+        Size = MAP_APPFONT ( 92 , 10 ) ;
         Text [ en-US ] = "Repeat ~column" ;
         TabStop = TRUE ;
     };
     ListBox LB_SCOPE
     {
         Border = TRUE;
-        Pos = MAP_APPFONT ( 40 , 65 );
-        Size = MAP_APPFONT ( 155 , 80 );
+        Pos = MAP_APPFONT ( 60 , 61 );
+        Size = MAP_APPFONT ( 160 , 80 );
         TabStop = TRUE;
         DropDown = TRUE;
     };
     FixedLine FL_DIV
     {
-        Pos = MAP_APPFONT( 0, 95 );
-        Size = MAP_APPFONT(200, 3 );
+        Pos = MAP_APPFONT( 0, 91 );
+        Size = MAP_APPFONT(225, 3 );
     };
     String STR_DEFAULT_INFO
     {
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 6c1c46a..a588f1d 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -38,14 +38,14 @@ ModelessDialog RID_SCDLG_NAMES
     Closeable = TRUE;
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT ( 5 , 227 ) ;
+        Pos = MAP_APPFONT ( 5 , 229 ) ;
         Size = MAP_APPFONT ( 50 , 15 ) ;
         TabStop = TRUE ;
     };
     PushButton BTN_ADD
     {
         HelpID = "sc:PushButton:RID_SCDLG_NAMES:BTN_ADD";
-        Pos = MAP_APPFONT ( 5 , 200 ) ;
+        Pos = MAP_APPFONT ( 5 , 202 ) ;
         Size = MAP_APPFONT ( 50 , 15 ) ;
         Text [ en-US ] = "Add" ;
         TabStop = TRUE ;
@@ -53,21 +53,21 @@ ModelessDialog RID_SCDLG_NAMES
     };
     PushButton BTN_DELETE
     {
-        Pos = MAP_APPFONT( 60, 200) ;
+        Pos = MAP_APPFONT( 60, 202) ;
         Size = MAP_APPFONT ( 50, 15 ) ;
         Text [ en-US ] = "~Delete" ;
         TabStop = TRUE ;
     };
     PushButton BTN_NAME_OK
     {
-        Pos = MAP_APPFONT ( 110 , 227 ) ;
+        Pos = MAP_APPFONT ( 110 , 229 ) ;
         Size = MAP_APPFONT ( 50 , 15 ) ;
         Text [ en-US ] = "OK" ;
         TabStop = TRUE ;
     };
     PushButton BTN_NAME_CANCEL
     {
-        Pos = MAP_APPFONT ( 165 , 227 ) ;
+        Pos = MAP_APPFONT ( 165 , 229 ) ;
         Size = MAP_APPFONT ( 50 , 15 ) ;
         Text [ en-US ] = "Cancel" ;
         TabStop = TRUE ;
@@ -75,35 +75,35 @@ ModelessDialog RID_SCDLG_NAMES
 
     FixedText FT_SCOPE
     {
-        Pos = MAP_APPFONT( 5, 172 );
-        Size = MAP_APPFONT( 40, 8 );
+        Pos = MAP_APPFONT( 5, 174 );
+        Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Scope" ;
     };
     FixedText FT_RANGE
     {
-        Pos = MAP_APPFONT( 5, 157 );
-        Size = MAP_APPFONT( 40, 8 );
+        Pos = MAP_APPFONT( 5, 158 );
+        Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Range" ;
     };
     FixedText FT_NAME
     {
         Pos = MAP_APPFONT( 5, 142 );
-        Size = MAP_APPFONT( 40, 8 );
+        Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Name" ;
     };
 
     Edit ED_NAME2
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 50 , 140 ) ;
-        Size = MAP_APPFONT ( 168 , 12 ) ;
+        Pos = MAP_APPFONT ( 60 , 140 ) ;
+        Size = MAP_APPFONT ( 155 , 13 ) ;
         TabStop = TRUE ;
     };
     ListBox LB_SCOPE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 50 , 170 ) ;
-        Size = MAP_APPFONT ( 168 , 80 ) ;
+        Pos = MAP_APPFONT ( 60 , 172 ) ;
+        Size = MAP_APPFONT ( 155 , 80 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
     };
@@ -112,34 +112,34 @@ ModelessDialog RID_SCDLG_NAMES
     {
         HelpID = "sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN";
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 50 , 155 ) ;
-        Size = MAP_APPFONT ( 152 , 12 ) ;
+        Pos = MAP_APPFONT ( 60 , 156 ) ;
+        Size = MAP_APPFONT ( 142 , 13 ) ;
         TabStop = TRUE ;
     };
     ImageButton RB_ASSIGN
     {
         HelpID = "sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN";
-        Pos = MAP_APPFONT ( 202 , 155 ) ;
-        Size = MAP_APPFONT ( 13 , 12 ) ;
+        Pos = MAP_APPFONT ( 202 , 156 ) ;
+        Size = MAP_APPFONT ( 13 , 13 ) ;
         TabStop = TRUE ;
         QuickHelpText [ en-US ] = "Shrink" ;
     };
     CheckBox BTN_MORE
     {
         HelpID = "sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE";
-        Pos = MAP_APPFONT ( 5 , 185 ) ;
+        Pos = MAP_APPFONT ( 5 , 190 ) ;
         Size = MAP_APPFONT ( 80 , 15 ) ;
         Text [en-US] = "Range Options";
     };
     FixedLine FL_DIV
     {
-        Pos = MAP_APPFONT ( 0, 220 ) ;
+        Pos = MAP_APPFONT ( 0, 222 ) ;
         Size = MAP_APPFONT ( 220, 2 ) ;
     };
     CheckBox BTN_PRINTAREA
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA";
-        Pos = MAP_APPFONT ( 5 , 200 ) ;
+        Pos = MAP_APPFONT ( 5 , 203 ) ;
         Size = MAP_APPFONT ( 80 , 10 ) ;
         Text [ en-US ] = "~Print range" ;
         TabStop = TRUE ;
@@ -147,7 +147,7 @@ ModelessDialog RID_SCDLG_NAMES
     CheckBox BTN_CRITERIA
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA";
-        Pos = MAP_APPFONT ( 5 , 215 ) ;
+        Pos = MAP_APPFONT ( 5 , 216 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "~Filter" ;
         TabStop = TRUE ;
@@ -155,7 +155,7 @@ ModelessDialog RID_SCDLG_NAMES
     CheckBox BTN_ROWHEADER
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER";
-        Pos = MAP_APPFONT ( 110, 215 ) ;
+        Pos = MAP_APPFONT ( 110, 216 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Repeat ~row" ;
         TabStop = TRUE ;
@@ -163,7 +163,7 @@ ModelessDialog RID_SCDLG_NAMES
     CheckBox BTN_COLHEADER
     {
         HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER";
-        Pos = MAP_APPFONT ( 110 , 200 ) ;
+        Pos = MAP_APPFONT ( 110 , 203 ) ;
         Size = MAP_APPFONT ( 82 , 10 ) ;
         Text [ en-US ] = "Repeat ~column" ;
         TabStop = TRUE ;
@@ -171,8 +171,8 @@ ModelessDialog RID_SCDLG_NAMES
 
     FixedText FT_INFO
     {
-        Pos = MAP_APPFONT( 5, 125 );
-        Size = MAP_APPFONT( 210, 12 );
+        Pos = MAP_APPFONT( 5, 122 );
+        Size = MAP_APPFONT( 210, 15 );
         TabStop = FALSE;
     };
 


More information about the Libreoffice-commits mailing list