User: kz Date: 2008-03-07 11:20:50+0000 Modified: dba/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
Log: INTEGRATION: CWS textconnectionsettings (1.9.170); FILE MERGED 2008/03/05 12:55:50 fs 1.9.170.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]: AutoControls_tmpl.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc?r1=1.9&r2=1.10 Delta lines: +69 -40 --------------------- --- AutoControls_tmpl.hrc 2007-04-19 14:57:30+0000 1.9 +++ AutoControls_tmpl.hrc 2008-03-07 11:20:47+0000 1.10 @@ -73,8 +73,11 @@ #define FT_AUTOWIZARDHEADER 92 #define FT_AUTOEXTENSIONHEADER 93 #define FT_AUTOOWNEXTENSIONAPPENDIX 94 +#define FT_CHARSET 95 #define FL_AUTOSEPARATOR2 80 +#define FL_DATACONVERT 81 +#define FL_SEPARATOR1 82 #define CB_AUTOHEADER 80 @@ -99,6 +102,7 @@ #define RB_AUTOACCESSCCSVFILES 81 #define RB_AUTOACCESSOTHERS 82 +#define LB_CHARSET 80 #define STR_AUTOFIELDSEPARATORLIST 100 #define STR_AUTOTEXTSEPARATORLIST 101 @@ -242,6 +246,32 @@ Text[ en-US ] = "" ; \ }; +//------------------------------------------------------------------------- + +#define AUTO_CHARSET( AUTO_Y, AUTOPAGE_X ) \ + FixedLine FL_DATACONVERT \ + { \ + Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \ + Size = MAP_APPFONT ( AUTOPAGE_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 ( AUTOPAGE_X - EDIT_X - 6 , 60 ) ; \ + TabStop = TRUE ; \ + HelpId = HID_DSADMIN_CHARSET; \ + DropDown = TRUE ; \ + CurPos = 0 ; \ + }; \ + // -------------------------------------------------------------------------------------------------- #define AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X) \ \ @@ -287,7 +317,7 @@ \ FIXEDTEXT FT_AUTOOWNEXTENSIONAPPENDIX \ { \ - Pos = MAP_APPFONT (START_X + 130 , AUTO_Y + 3*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS); \ + Pos = MAP_APPFONT (START_X + 130 , AUTO_Y + 3 * ( FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ); \ Size = MAP_APPFONT ( AUTOPAGE_X - 6 -(START_X + 130), FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Custom: *.abc" ; \ }; \ @@ -299,40 +329,31 @@ Text[ en-US ] = "Row Format"; \ }; \ \ - CheckBox CB_AUTOHEADER \ - { \ - TabStop = TRUE ; \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 1) ; \ - Size = MAP_APPFONT ( 150 , CHECKBOX_HEIGHT ) ; \ - HelpId = HID_DSADMIN_TEXT_HEADER; \ - Text [ en-US ] = "~Text contains headers" ; \ - }; \ - \ - \ FixedText FT_AUTOFIELDSEPARATOR \ { \ - Pos = MAP_APPFONT ( START_X + INDENTED_X , AUTO_Y +50 + UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT) ; \ + Pos = MAP_APPFONT ( START_X + INDENTED_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ; \ Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Field separator" ; \ }; \ ComboBox CM_AUTOFIELDSEPARATOR \ { \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +50 + UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT -1 ) ; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \ Size = MAP_APPFONT ( 32 , 60 ) ; \ Text = ";" ; \ TabStop = TRUE ; \ DropDown = TRUE ; \ HelpId = HID_DSADMIN_FIELD_SEPARATOR; \ }; \ + \ FixedText FT_AUTOTEXTSEPARATOR \ { \ - Pos = MAP_APPFONT ( START_X + INDENTED_X, AUTO_Y +50 + 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT ) ; \ + Pos = MAP_APPFONT ( START_X + INDENTED_X, AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + EDIT_HEIGHT ) ; \ Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Text separator" ; \ }; \ ComboBox CM_AUTOTEXTSEPARATOR \ { \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y+50 + 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT -1 ) ; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + EDIT_HEIGHT - 2 ) ; \ Size = MAP_APPFONT ( 32 , 60 ) ; \ Text = "\"" ; \ TabStop = TRUE ; \ @@ -341,13 +362,13 @@ }; \ FixedText FT_AUTODECIMALSEPARATOR \ { \ - Pos = MAP_APPFONT (START_X + INDENTED_X , AUTO_Y +50 + 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT ) ; \ + Pos = MAP_APPFONT ( START_X + INDENTED_X, AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS + 2*EDIT_HEIGHT ) ; \ Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Decimal separator" ; \ }; \ ComboBox CM_AUTODECIMALSEPARATOR \ { \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +50 + 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT -1 ) ; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS + 2*EDIT_HEIGHT - 2 ) ; \ Size = MAP_APPFONT ( 32 , 60 ) ; \ TabStop = TRUE ; \ MaxTextLength = 1 ; \ @@ -363,13 +384,13 @@ }; \ FixedText FT_AUTOTHOUSANDSSEPARATOR \ { \ - Pos = MAP_APPFONT ( START_X + INDENTED_X , AUTO_Y +50 + 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT ) ; \ + Pos = MAP_APPFONT ( START_X + INDENTED_X, AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + 3*EDIT_HEIGHT ) ; \ Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "Thousands separator" ; \ }; \ ComboBox CM_AUTOTHOUSANDSSEPARATOR \ { \ - Pos = MAP_APPFONT ( EDIT_X , AUTO_Y+50 + 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT -1 ) ; \ + Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + 3*EDIT_HEIGHT - 2 ) ; \ Size = MAP_APPFONT ( 32 , 44 ) ; \ Text = "." ; \ TabStop = TRUE ; \ @@ -383,12 +404,22 @@ HelpId = HID_DSADMIN_THOUSANDS_SEPARATOR; \ }; \ \ + CheckBox CB_AUTOHEADER \ + { \ + TabStop = TRUE ; \ + Pos = MAP_APPFONT ( START_X + INDENTED_X, AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*RELATED_CONTROLS + 4*EDIT_HEIGHT ) ; \ + Size = MAP_APPFONT ( 150 , CHECKBOX_HEIGHT ) ; \ + HelpId = HID_DSADMIN_TEXT_HEADER; \ + Text [ en-US ] = "~Text contains headers" ; \ + }; \ + \ + AUTO_CHARSET( AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*RELATED_CONTROLS + 4*EDIT_HEIGHT + CHECKBOX_HEIGHT + UNRELATED_CONTROLS, AUTOPAGE_X ) \ + \ String STR_AUTOTEXT_FIELD_SEP_NONE \ { \ Text[ en-US ] = "{None}"; \ }; \ \ - \ String STR_AUTOTEXTSEPARATORLIST \ { \ Text = "\"\t34\t'\t39" ; \ @@ -400,7 +431,6 @@ Text [ en-US ] = ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" ; \ }; \ \ - \ String STR_AUTODELIMITER_MISSING \ { \ Text[ en-US ] = "#1 must be set." ; \ @@ -415,7 +445,6 @@ }; - #define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT) #define BROWSECONTROLGROUP_HEIGHT ( FIXEDTEXT_HEIGHT + 2 + BUTTON_HEIGHT) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
