User: kz Date: 2008-03-07 11:22:20+0000 Modified: dba/dbaccess/source/ui/dlg/dbadmin.src
Log: INTEGRATION: CWS textconnectionsettings (1.157.80); FILE MERGED 2008/03/05 12:55:51 fs 1.157.80.1: #i86720# some re-factoring, owed to the fact that we now have a stand-alone dialog for entering text/csv settings, which re-uses existing functionality 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.157&r2=1.158 Delta lines: +8 -43 -------------------- --- dbadmin.src 2007-11-01 15:11:01+0000 1.157 +++ dbadmin.src 2008-03-07 11:22:17+0000 1.158 @@ -66,32 +66,6 @@ //------------------------------------------------------------------------- -#define AUTO_CHARSET(AUTO_Y) \ - FixedLine FL_DATACONVERT \ - { \ - Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ - Size = MAP_APPFONT ( PAGE_X - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \ - Text [ en-US ] = "Data conversion"; \ - }; \ - FixedText FT_CHARSET \ - { \ - Pos = MAP_APPFONT ( 6 , AUTO_Y + RELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ; \ - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ - Text [ en-US ] = "~Character set" ; \ - }; \ - ListBox LB_CHARSET \ - { \ - Border = TRUE ; \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + RELATED_CONTROLS + FIXEDTEXT_HEIGHT -1 ) ;\ - Size = MAP_APPFONT ( 130 , 60 ) ; \ - TabStop = TRUE ; \ - HelpId = HID_DSADMIN_CHARSET; \ - DropDown = TRUE ; \ - CurPos = 0 ; \ - }; - -//------------------------------------------------------------------------- - #define AUTO_SPECIAL_JDBC(AUTO_Y) \ FixedLine FL_SEPARATOR1 \ { \ @@ -342,7 +316,7 @@ Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; HelpId = HID_DSADMIN_PAGE_DBASE; - AUTO_CHARSET( UNRELATED_CONTROLS) + AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X) FixedLine FL_SEPARATOR1 { @@ -388,7 +362,7 @@ Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; Hide = TRUE; HelpId = HID_DSADMIN_PAGE_ADO; - AUTO_CHARSET(UNRELATED_CONTROLS) + AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X) }; //......................................................................... @@ -401,7 +375,7 @@ Hide = TRUE; HelpId = HID_DSADMIN_PAGE_ODBC; - AUTO_CHARSET( UNRELATED_CONTROLS) + AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X) FixedLine FL_SEPARATOR1 { Pos = MAP_APPFONT ( 4 , 2*UNRELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ; @@ -538,7 +512,7 @@ Text[ en-US ] = "E~xtended..."; }; - AUTO_CHARSET( 7*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT) + AUTO_CHARSET( 7*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT, PAGE_X ) }; //......................................................................... @@ -553,7 +527,7 @@ Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; Hide = TRUE; - AUTO_CHARSET( UNRELATED_CONTROLS ) + AUTO_CHARSET( UNRELATED_CONTROLS, PAGE_X ) }; TabPage PAGE_MYSQL_JDBC @@ -586,7 +560,7 @@ Text [ en-US ] = "Test class" ; }; - AUTO_CHARSET( 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT ) + AUTO_CHARSET( 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT, PAGE_X ) }; TabPage PAGE_ORACLE_JDBC @@ -621,7 +595,7 @@ Text [ en-US ] = "Test class" ; }; - AUTO_CHARSET( 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT ) + AUTO_CHARSET( 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT, PAGE_X ) }; //......................................................................... @@ -709,15 +683,6 @@ AUTO_SEPARATORCONTROLGROUP(UNRELATED_CONTROLS, PAGE_X) - FixedLine FL_SEPARATOR1 - { - Pos = MAP_APPFONT ( 4 , 124) ; - Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "File format"; - }; - - AUTO_CHARSET(143) - }; //......................................................................... TabPage PAGE_USERDRIVER @@ -769,6 +734,6 @@ Border = TRUE ; TabStop = TRUE ; }; - AUTO_CHARSET( 4*UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + RELATED_CONTROLS) + AUTO_CHARSET( 4*UNRELATED_CONTROLS+ 3*FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X) }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
