svn commit: r1415028 - in /openoffice/trunk/main/cui/source/options: optinet2.cxx optinet2.src

[arielch]

Author: arielch
Date: Thu Nov 29 01:48:24 2012
New Revision: 1415028

URL: http://svn.apache.org/viewvc?rev=1415028&view=rev
Log:
#i104820# - Fix overlapping controls

Modified:
    openoffice/trunk/main/cui/source/options/optinet2.cxx
    openoffice/trunk/main/cui/source/options/optinet2.src

Modified: openoffice/trunk/main/cui/source/options/optinet2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/options/optinet2.cxx?rev=1415028&r1=1415027&r2=1415028&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/options/optinet2.cxx (original)
+++ openoffice/trunk/main/cui/source/options/optinet2.cxx Thu Nov 29 01:48:24 
2012
@@ -874,14 +874,15 @@ void SvxSearchTabPage::InitControls_Impl
     }
 
     // resize all labels
-    nLabelTextWidth = nLabelTextWidth * 120 / 100; // additional space looks 
better
+    const Size aSpace = aSearchNameFT.LogicToPixel( Size( RSC_SP_CTRL_DESC_Y, 
RSC_SP_CTRL_DESC_Y ), MAP_APPFONT );
+    nLabelTextWidth += aSpace.Width();
     const long nLabelWidth = aSearchNameFT.GetSizePixel().Width();
     const long nDelta = nLabelWidth - nLabelTextWidth;
     pLabel = pLabels;
     for ( i = 0; i < nLabelCount; ++i, ++pLabel )
     {
         Size aNewSize = (*pLabel)->GetSizePixel();
-        aNewSize.Width() += nDelta;
+        aNewSize.Width() = nLabelTextWidth;
         (*pLabel)->SetSizePixel( aNewSize );
     }
 

Modified: openoffice/trunk/main/cui/source/options/optinet2.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/options/optinet2.src?rev=1415028&r1=1415027&r2=1415028&view=diff
==============================================================================
--- openoffice/trunk/main/cui/source/options/optinet2.src (original)
+++ openoffice/trunk/main/cui/source/options/optinet2.src Thu Nov 29 01:48:24 
2012
@@ -255,7 +255,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
 {
        HelpId = HID_OPTIONS_SEARCH ;
        OutputSize = TRUE ;
-       Size = MAP_APPFONT ( 260 , 185 ) ;
+       Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
        SVLook = TRUE ;
        Hide = TRUE ;
        Text [ en-US ] = "Search" ;
@@ -304,7 +304,7 @@ TabPage RID_SVXPAGE_INET_SEARCH
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ;
         Size = MAP_APPFONT ( 125 , 10 ) ;
                Check = TRUE ;
-               Text [ en-US ] = "And" ;
+               Text [ en-US ] = "~And" ;
        };
        RadioButton RB_OR
        {
@@ -379,31 +379,37 @@ TabPage RID_SVXPAGE_INET_SEARCH
                        < "Lower" ; > ;
                };
        };
+
+    #define PB_SEARCH_POS_Y     TP_HEIGHT - RSC_CD_PUSHBUTTON_HEIGHT - 
RSC_SP_TBPG_INNERBORDER_BOTTOM
+    #define PB_SEARCH_POS_X1    TP_WIDTH - ( RSC_CD_PUSHBUTTON_WIDTH * 4 ) - ( 
RSC_SP_CTRL_GROUP_X * 3 ) - RSC_SP_TBPG_INNERBORDER_RIGHT
+    #define PB_SEARCH_POS_X2    TP_WIDTH - ( RSC_CD_PUSHBUTTON_WIDTH * 3 ) - ( 
RSC_SP_CTRL_GROUP_X * 2 ) - RSC_SP_TBPG_INNERBORDER_RIGHT
+    #define PB_SEARCH_POS_X3    TP_WIDTH - ( RSC_CD_PUSHBUTTON_WIDTH * 2 ) - ( 
RSC_SP_CTRL_GROUP_X * 1 ) - RSC_SP_TBPG_INNERBORDER_RIGHT
+    #define PB_SEARCH_POS_X4    TP_WIDTH - RSC_CD_PUSHBUTTON_WIDTH - 
RSC_SP_TBPG_INNERBORDER_RIGHT
     PushButton PB_NEW
        {
         HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW";
-        Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ;
+        Pos = MAP_APPFONT ( PB_SEARCH_POS_X1 , PB_SEARCH_POS_Y ) ;
                Size = MAP_APPFONT ( 50 , 14 ) ;
                Text [ en-US ] = "N~ew";
        };
        PushButton PB_ADD
        {
            HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD";
-        Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ;
+        Pos = MAP_APPFONT (PB_SEARCH_POS_X2 , PB_SEARCH_POS_Y ) ;
                Size = MAP_APPFONT ( 50 , 14 ) ;
                Text [ en-US ] = "~Add" ;
        };
        PushButton PB_CHANGE
        {
            HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE";
-        Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ;
+        Pos = MAP_APPFONT ( PB_SEARCH_POS_X3 , PB_SEARCH_POS_Y ) ;
                Size = MAP_APPFONT ( 50 , 14 ) ;
                Text [ en-US ] = "~Modify" ;
        };
        PushButton PB_DELETE
        {
            HelpID = "cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE";
-        Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ;
+        Pos = MAP_APPFONT ( PB_SEARCH_POS_X4 , PB_SEARCH_POS_Y ) ;
                Size = MAP_APPFONT ( 50 , 14 ) ;
                Text [ en-US ] = "~Delete" ;
        };