User: kz Date: 2006/12/13 08:50:00 Modified: dba/dbaccess/source/ui/dlg/dbadmin.src
Log: INTEGRATION: CWS dba22ui (1.153.4); FILE MERGED 2006/12/05 09:47:55 fs 1.153.4.1: copying the fix for #i72252# from CWS dba22b to dba22ui - intended for the latter, but wrongly checked in into the former File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbadmin.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.src?r1=1.153&r2=1.154 Delta lines: +136 -293 ----------------------- --- dbadmin.src 5 Oct 2006 13:04:21 -0000 1.153 +++ dbadmin.src 13 Dec 2006 16:49:57 -0000 1.154 @@ -53,7 +53,16 @@ #endif #define ADVANCED_PAGE_X 200 -#define ADVANCED_PAGE_Y (105 + 4*CHECKBOX_HEIGHT + 4*RELATED_CONTROLS) + +#define ADVANCED_CHECKBOX_OPTIONS 11 +#define ADVANCED_LISTBOX_OPTIONS 1 +#define ADVANCED_PAGE_Y \ + /* top space */ START_X + \ + /* label */ FIXEDTEXT_HEIGHT + RELATED_CONTROLS + \ + /* check boxes */ ( ADVANCED_CHECKBOX_OPTIONS * ( CHECKBOX_HEIGHT + RELATED_CONTROLS ) ) + \ + /* list boxes */ ( ADVANCED_LISTBOX_OPTIONS * ( LISTBOX_HEIGHT + RELATED_CONTROLS ) ) + \ + /* bottom space */ START_Y - RELATED_CONTROLS +//#define ADVANCED_PAGE_Y (105 + 5*CHECKBOX_HEIGHT + 4*RELATED_CONTROLS) //------------------------------------------------------------------------- @@ -70,6 +79,19 @@ //------------------------------------------------------------------------- +#define AUTO_AS_BEFORE_CORR_NAME(AUTO_Y) \ + CheckBox CB_AS_BEFORE_CORR_NAME \ + { \ + Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_AS_BEFORE_CORRELATION_NAME; \ + Text [ de ] = "Schlüsselwort AS vor Tabellen-Alias-Namen verwenden"; \ + Text[ en-US ] = "Use keyword AS before table alias names"; \ + }; + +//------------------------------------------------------------------------- + #define AUTO_IGNOREINDEXAPPENDIX(AUTO_Y) \ CheckBox CB_IGNOREINDEXAPPENDIX \ { \ @@ -161,20 +183,18 @@ -// ListBox removed due merge errors -/* #define AUTO_BOOLEANCOMPARISON(AUTO_Y) \ FixedText FT_BOOLEANCOMPARISON \ { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( 100 , FIXEDTEXT_HEIGHT ) ; \ + Pos = MAP_APPFONT ( 6 , AUTO_Y + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) ; \ + Size = MAP_APPFONT ( 100 , CHECKBOX_HEIGHT ); \ Text [ de ] = "Vergleich von Wahrheitswerten"; \ Text [ en-US ] = "Comparison of Boolean values"; \ }; \ ListBox LB_BOOLEANCOMPARISON \ { \ - Pos = MAP_APPFONT ( 107 , AUTO_Y -1) ; \ - Size = MAP_APPFONT ( 60 , CHECKBOX_HEIGHT ) ; \ + Pos = MAP_APPFONT ( 107 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( 60 , LISTBOX_HEIGHT ) ; \ Group = TRUE ; \ TabStop = TRUE ; \ SvLook = TRUE; \ @@ -195,15 +215,6 @@ < "Mixed" ; Default ; > ; \ < "MS Access" ; Default ; > ; \ }; \ - }; -*/ -#define AUTO_BOOLEANCOMPARISON(AUTO_Y) \ - FixedText FT_BOOLEANCOMPARISON \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( 100 , FIXEDTEXT_HEIGHT ) ; \ - Text [ de ] = "Vergleich von Wahrheitswerten"; \ - Text [ en-US ] = "Comparison of Boolean values"; \ }; \ @@ -696,47 +707,7 @@ //......................................................................... -TabPage PAGE_DS_PROPERTIES_1 -{ - SVLook = TRUE ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ; - Hide = TRUE; - AUTO_DATAHANDLING( RELATED_CONTROLS ) - AUTO_APPENDTABLEALIAS( RELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) - AUTO_BOOLEANCOMPARISON( 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - - ListBox LB_BOOLEANCOMPARISON - { - Pos = MAP_APPFONT ( 107 ,2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + UNRELATED_CONTROLS -1) ; - Size = MAP_APPFONT ( 60 , CHECKBOX_HEIGHT ) ; - Group = TRUE ; - TabStop = TRUE ; - SvLook = TRUE; - DropDown = TRUE; - Border = TRUE; - HelpId = HID_DSADMIN_BOOLEANCOMPARISON; - StringList [ de ] = - { - < "Normal" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Gemischt" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - StringList [ en-US ] = - { - < "Default" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Mixed" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - }; - -}; - -//......................................................................... - -TabPage PAGE_DS_PROPERTIES_2 +TabPage PAGE_DS_ADABAS_SETTINGS { SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; @@ -748,75 +719,24 @@ AUTO_SUPPRESVERSIONCOLUMN( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_DOSLINEENDS( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) AUTO_BOOLEANCOMPARISON( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - ListBox LB_BOOLEANCOMPARISON - { - Pos = MAP_APPFONT ( 107 , 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS -1) ; - Size = MAP_APPFONT ( 60 , CHECKBOX_HEIGHT ) ; - Group = TRUE ; - TabStop = TRUE ; - SvLook = TRUE; - DropDown = TRUE; - Border = TRUE; - HelpId = HID_DSADMIN_BOOLEANCOMPARISON; - StringList [ de ] = - { - < "Normal" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Gemischt" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - StringList [ en-US ] = - { - < "Default" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Mixed" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - }; - }; //......................................................................... -TabPage PAGE_DS_PROPERTIES_3 +TabPage PAGE_DS_ADO_SETTINGS { SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ; Hide = TRUE; AUTO_DATAHANDLING( RELATED_CONTROLS ) - AUTO_SQL92CHECK( RELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) - AUTO_APPENDTABLEALIAS( 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_ENABLEOUTERJOIN( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_SUPPRESVERSIONCOLUMN( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_DOSLINEENDS( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - AUTO_BOOLEANCOMPARISON( 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - ListBox LB_BOOLEANCOMPARISON - { - Pos = MAP_APPFONT ( 107 , 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS -1) ; - Size = MAP_APPFONT ( 60 , CHECKBOX_HEIGHT ) ; - Group = TRUE ; - TabStop = TRUE ; - SvLook = TRUE; - DropDown = TRUE; - Border = TRUE; - HelpId = HID_DSADMIN_BOOLEANCOMPARISON; - StringList [ de ] = - { - < "Normal" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Gemischt" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - StringList [ en-US ] = - { - < "Default" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Mixed" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - }; - + AUTO_SQL92CHECK( 1*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) + AUTO_APPENDTABLEALIAS( 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 1*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_AS_BEFORE_CORR_NAME( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_ENABLEOUTERJOIN( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_SUPPRESVERSIONCOLUMN( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_DOSLINEENDS( 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) + AUTO_BOOLEANCOMPARISON( 7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) }; //......................................................................... @@ -846,37 +766,11 @@ AUTO_ENABLEOUTERJOIN( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_DOSLINEENDS( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) AUTO_BOOLEANCOMPARISON( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - ListBox LB_BOOLEANCOMPARISON - { - Pos = MAP_APPFONT ( 107 , 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS -1) ; - Size = MAP_APPFONT ( 60 , CHECKBOX_HEIGHT ) ; - Group = TRUE ; - TabStop = TRUE ; - SvLook = TRUE; - DropDown = TRUE; - Border = TRUE; - HelpId = HID_DSADMIN_BOOLEANCOMPARISON; - StringList [ de ] = - { - < "Normal" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Gemischt" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - StringList [ en-US ] = - { - < "Default" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Mixed" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - }; - }; //......................................................................... -TabPage PAGE_DS_PROPERTIES_ENABLEOJ +TabPage PAGE_DS_MYSQL_SETTINGS { SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; @@ -890,80 +784,29 @@ AUTO_SUPPRESVERSIONCOLUMN( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS ) AUTO_DOSLINEENDS( 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) AUTO_BOOLEANCOMPARISON( 7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - ListBox LB_BOOLEANCOMPARISON - { - Pos = MAP_APPFONT ( 107 , 7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + UNRELATED_CONTROLS -1) ; - Size = MAP_APPFONT ( 60 , CHECKBOX_HEIGHT ) ; - Group = TRUE ; - TabStop = TRUE ; - SvLook = TRUE; - DropDown = TRUE; - Border = TRUE; - HelpId = HID_DSADMIN_BOOLEANCOMPARISON; - StringList [ de ] = - { - < "Normal" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Gemischt" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - StringList [ en-US ] = - { - < "Default" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Mixed" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - }; - }; //......................................................................... -TabPage PAGE_DS_PROPERTIES_4 +TabPage PAGE_DS_FULL_ADVANCED_SETTINGS { SVLook = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ; Hide = TRUE; AUTO_DATAHANDLING( RELATED_CONTROLS ) - AUTO_SQL92CHECK( RELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) - AUTO_APPENDTABLEALIAS( 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_ENABLEOUTERJOIN( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_IGNOREDRIVER_PRIV( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_PARAMETERNAMESUBST( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_SUPPRESVERSIONCOLUMN( 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_CATALOG( 7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_SCHEMA( 8*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 7*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_IGNOREINDEXAPPENDIX( 9*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 8*CHECKBOX_HEIGHT + RELATED_CONTROLS ) - AUTO_DOSLINEENDS( 10*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 9*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - AUTO_BOOLEANCOMPARISON( 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + UNRELATED_CONTROLS ) - ListBox LB_BOOLEANCOMPARISON - { - Pos = MAP_APPFONT ( 107 , 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + UNRELATED_CONTROLS -1) ; - Size = MAP_APPFONT ( 60 , CHECKBOX_HEIGHT ) ; - Group = TRUE ; - TabStop = TRUE ; - SvLook = TRUE; - DropDown = TRUE; - Border = TRUE; - HelpId = HID_DSADMIN_BOOLEANCOMPARISON; - StringList [ de ] = - { - < "Normal" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Gemischt" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - StringList [ en-US ] = - { - < "Default" ; Default ; > ; - < "SQL" ; Default ; > ; - < "Mixed" ; Default ; > ; - < "MS Access" ; Default ; > ; - }; - }; - + AUTO_SQL92CHECK( 1*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) + AUTO_APPENDTABLEALIAS( 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 1*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_AS_BEFORE_CORR_NAME( 3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_ENABLEOUTERJOIN( 4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_IGNOREDRIVER_PRIV( 5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_PARAMETERNAMESUBST( 6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_SUPPRESVERSIONCOLUMN( 7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_CATALOG( 8*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 7*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_SCHEMA( 9*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 8*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_IGNOREINDEXAPPENDIX( 10*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 9*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_DOSLINEENDS( 11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS ) + AUTO_BOOLEANCOMPARISON( 12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 11*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) }; //......................................................................... --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
