commit 1535eed3d40d9741f3cdf68d32bc132e2a39f287
author Ivan Timofeev <timofeev.i.s@gmail.com> Sun Feb 05 11:51:09 2012 +0400
committer Ivan Timofeev <timofeev.i.s@gmail.com> Sun Feb 05 13:23:23 2012 +0400
tree 06a229702e581410898afc4148e26fd2deedf692
parent 9377bb4dcc0d179293c044663c0bea5a113b64d9

fix various overlapped controls in the Options dialog

cui/source/options/optgdlg.hrc

diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 5e54e0b..d870e29 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -64,8 +64,7 @@
#define ROW11                   (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define ROW12                   (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define ROW13                   (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW14                   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define ROW15                   (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW14                   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6)

#define DIFF(v1,v2)                     (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base)    (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)

cui/source/options/optgdlg.src

diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 730aa24..0e01fe0 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -188,7 +188,7 @@ TabPage OFA_TP_MISC
    };
    CheckBox CB_EXPERIMENTAL
    {
        Pos = MAP_APPFONT( COL1, ROW15 );
        Pos = MAP_APPFONT( COL1, ROW14 );
        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
        Text [ en-US ] = "Enable experimental (unstable) features";
    };
@@ -456,7 +456,7 @@ TabPage OFA_TP_VIEW
    {
        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION";
        Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
        Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
        Size = MAP_APPFONT ( 83 , RSC_CD_CHECKBOX_HEIGHT ) ;
        Text [ en-US ] = "Transparency" ;
    };

cui/source/options/optsave.src

diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index da94bd4..845336f 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -101,7 +101,7 @@ TabPage RID_SFXPAGE_SAVE
    {
        HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE";
        Border = TRUE ;
        Pos = MAP_APPFONT ( 210 , 61 ) ;
        Pos = MAP_APPFONT ( 210 , 62 ) ;
        Size = MAP_APPFONT ( 21 , 12 ) ;
        Left = TRUE ;
        Repeat = TRUE ;
@@ -116,7 +116,7 @@ TabPage RID_SFXPAGE_SAVE
    };
    FixedText FT_MINUTE
    {
        Pos = MAP_APPFONT ( 234 , 63 ) ;
        Pos = MAP_APPFONT ( 234 , 64 ) ;
        Size = MAP_APPFONT ( 35 , 8 ) ;
        Text [ en-US ] = "Minutes" ;
    };