INTEGRATION: CWS dbwizard1 (1.57.6); FILE MERGED

2004/08/16 12:27:49 bc 1.57.6.1: #i20313# several fileds added for database wizard

1 files changed, 103 insertions, 27 deletions

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 2c343f1501e6..ea92989d9be9 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbaccess_helpid.hrc,v $
  *
- *  $Revision: 1.57 $
+ *  $Revision: 1.58 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-02 14:41:30 $
+ *  last change: $Author: pjunck $ $Date: 2004-10-27 12:53:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -273,10 +273,10 @@
 #define HID_DOCLINKEDIT_URL                         (HID_DBACCESS_START + 207)
 #define HID_QUERY_SQLMODE                           (HID_DBACCESS_START + 208)
 
-#define HID_BROWSER_REFRESH_REBUILDVIEW             (HID_DBACCESS_START + 209)
+#define HID_BROWSER_REFRESH_REBUILDVIEW                 (HID_DBACCESS_START + 209)
 #define HID_BROWSER_RENAME_ENTRY                    (HID_DBACCESS_START + 210)
 
-#define HID_QUERY_EDIT_JOINCONNECTION               (HID_DBACCESS_START + 211)
+#define HID_QUERY_EDIT_JOINCONNECTION                   (HID_DBACCESS_START + 211)
 
 #define HID_DLG_QRY_WINDOW_CONTROL                  (HID_DBACCESS_START + 212)
 #define HID_DLG_QRY_LEFT_TABLE                      (HID_DBACCESS_START + 213)
@@ -285,24 +285,24 @@
 #define HID_DLG_REL_CASC_DEL                        (HID_DBACCESS_START + 215)
 #define HID_DLG_REL_NO_CASC_DEL                     (HID_DBACCESS_START + 216)
 #define HID_DLG_REL_CASC_DEL_NULL                   (HID_DBACCESS_START + 217)
-#define HID_DLG_REL_CASC_DEL_DEFAULT                (HID_DBACCESS_START + 218)
+#define HID_DLG_REL_CASC_DEL_DEFAULT                    (HID_DBACCESS_START + 218)
 
 #define HID_DLG_REL_CASC_UPD                        (HID_DBACCESS_START + 219)
 #define HID_DLG_REL_NO_CASC_UPD                     (HID_DBACCESS_START + 220)
 #define HID_DLG_REL_CASC_UPD_NULL                   (HID_DBACCESS_START + 221)
-#define HID_DLG_REL_CASC_UPD_DEFAULT                (HID_DBACCESS_START + 222)
+#define HID_DLG_REL_CASC_UPD_DEFAULT                    (HID_DBACCESS_START + 222)
 #define HID_BROWSER_SAVE_RECORD                     (HID_DBACCESS_START + 223)
 #define HID_BROWSER_UNDO_RECORD                     (HID_DBACCESS_START + 224)
 
 #define HID_DSADMIN_SQL92CHECK                      (HID_DBACCESS_START + 225)
-#define HID_DSADMIN_AUTOINCREMENTVALUE              (HID_DBACCESS_START + 226)
+#define HID_DSADMIN_AUTOINCREMENTVALUE                  (HID_DBACCESS_START + 226)
 #define HID_DOCUMENT_CREATE_REPWIZ                  (HID_DBACCESS_START + 227)
 #define HID_TAB_AUTOINCREMENTVALUE                  (HID_DBACCESS_START + 228)
 #define HID_DSADMIN_RETRIEVE_AUTO                   (HID_DBACCESS_START + 229)
-#define HID_DSADMIN_AUTORETRIEVEENABLED             (HID_DBACCESS_START + 230)
+#define HID_DSADMIN_AUTORETRIEVEENABLED                 (HID_DBACCESS_START + 230)
 
 #define HID_DSADMIN_PAGE_MYSQL_ODBC                 (HID_DBACCESS_START + 231)
-#define HID_TAB_PAGE_TABLEPRIVILEGES                (HID_DBACCESS_START + 232)
+#define HID_TAB_PAGE_TABLEPRIVILEGES                    (HID_DBACCESS_START + 232)
 
 #define HID_DSADMIN_PAGE_USERDRIVER                 (HID_DBACCESS_START + 233)
 #define HID_DSADMIN_USER_DEFINED                    (HID_DBACCESS_START + 234)
@@ -313,46 +313,46 @@
 #define HID_DSADMIN_USESSL_LDAP                     (HID_DBACCESS_START + 239)
 #define HID_BROWSER_QUERY_WIZARD                    (HID_DBACCESS_START + 237)
 
-#define HID_DLG_RENAME                              (HID_DBACCESS_START + 237)
+#define HID_DLG_RENAME                          (HID_DBACCESS_START + 237)
 
 #define HID_DSADMIN_PAGE_MYSQL_JDBC                 (HID_DBACCESS_START + 238)
 
 #define HID_DSADMIN_DBASE_PATH                      (HID_DBACCESS_START + 239)
 #define HID_DSADMIN_MYSQL_DATABASE                  (HID_DBACCESS_START + 240)
-#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE           (HID_DBACCESS_START + 241)
+#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE               (HID_DBACCESS_START + 241)
 #define HID_DSADMIN_ODBC_DATASOURCE                 (HID_DBACCESS_START + 242)
 #define HID_DSADMIN_ADABAS_DATABASE                 (HID_DBACCESS_START + 243)
-#define HID_DSADMIN_MSACCESS_MDB_FILE               (HID_DBACCESS_START + 244)
+#define HID_DSADMIN_MSACCESS_MDB_FILE                   (HID_DBACCESS_START + 244)
 #define HID_DSADMIN_PAGE_MSACCESS                   (HID_DBACCESS_START + 245)
 #define HID_DSADMIN_FLAT_PATH                       (HID_DBACCESS_START + 246)
 #define HID_DSADMIN_CALC_PATH                       (HID_DBACCESS_START + 247)
 #define HID_DSADMIN_ADVANCED                        (HID_DBACCESS_START + 248)
-#define HID_DSADMIN_BOOLEANCOMPARISON               (HID_DBACCESS_START + 249)
+#define HID_DSADMIN_BOOLEANCOMPARISON                   (HID_DBACCESS_START + 249)
 #define HID_DSADMIN_ORACLE_DATABASE                 (HID_DBACCESS_START + 250)
 
-#define UID_APP_VIEW                                (HID_DBACCESS_START + 251)
-#define HID_APP_TABLE_TREE                          (HID_DBACCESS_START + 252)
-#define HID_APP_FORM_TREE                           (HID_DBACCESS_START + 253)
-#define HID_APP_QUERY_TREE                          (HID_DBACCESS_START + 254)
-#define HID_APP_REPORT_TREE                         (HID_DBACCESS_START + 255)
-#define UID_APP_DETAIL_VIEW                         (HID_DBACCESS_START + 256)
+#define UID_APP_VIEW                            (HID_DBACCESS_START + 251)
+#define HID_APP_TABLE_TREE                      (HID_DBACCESS_START + 252)
+#define HID_APP_FORM_TREE                       (HID_DBACCESS_START + 253)
+#define HID_APP_QUERY_TREE                      (HID_DBACCESS_START + 254)
+#define HID_APP_REPORT_TREE                     (HID_DBACCESS_START + 255)
+#define UID_APP_DETAIL_VIEW                     (HID_DBACCESS_START + 256)
 #define UID_APP_VIEW_VERT_SPLIT                     (HID_DBACCESS_START + 257)
 #define UID_APP_VIEW_BORDER_WIN                     (HID_DBACCESS_START + 258)
 #define HID_APP_CREATION_LIST                       (HID_DBACCESS_START + 259)
-#define UID_APP_SWAP_VIEW                           (HID_DBACCESS_START + 260)
+#define UID_APP_SWAP_VIEW                       (HID_DBACCESS_START + 260)
 #define UID_DLG_TABLE_FILTER                        (HID_DBACCESS_START + 261)
 #define HID_APP_SWAP_ICONCONTROL                    (HID_DBACCESS_START + 262)
 
-#define HID_DSADMIN_APPENDTABLEALIAS                (HID_DBACCESS_START + 263)
-#define HID_DSADMIN_PARAMETERNAMESUBST              (HID_DBACCESS_START + 264)
-#define HID_DSADMIN_IGNOREDRIVER_PRIV               (HID_DBACCESS_START + 265)
+#define HID_DSADMIN_APPENDTABLEALIAS                    (HID_DBACCESS_START + 263)
+#define HID_DSADMIN_PARAMETERNAMESUBST                  (HID_DBACCESS_START + 264)
+#define HID_DSADMIN_IGNOREDRIVER_PRIV                   (HID_DBACCESS_START + 265)
 #define HID_DSADMIN_HOSTNAME                        (HID_DBACCESS_START + 266)
 #define HID_DSADMIN_PORTNUMBER                      (HID_DBACCESS_START + 267)
 
-#define HID_APP_HELP_TEXT                           (HID_DBACCESS_START + 268)
+#define HID_APP_HELP_TEXT                       (HID_DBACCESS_START + 268)
 #define HID_EXPLORERDLG_COLLECTION                  (HID_DBACCESS_START + 269)
 #define UID_APP_DATABASE_VIEW                       (HID_DBACCESS_START + 270)
-#define UID_APP_TASKS_VIEW                          (HID_DBACCESS_START + 271)
+#define UID_APP_TASKS_VIEW                      (HID_DBACCESS_START + 271)
 #define UID_APP_CONTAINER_VIEW                      (HID_DBACCESS_START + 272)
 #define UID_APP_TASKS_WINDOW                        (HID_DBACCESS_START + 273)
 #define HID_APP_DESCRIPTION_TEXT                    (HID_DBACCESS_START + 274)
@@ -360,7 +360,7 @@
 #define HID_APP_VIEW_PREVIEW_CB                     (HID_DBACCESS_START + 276)
 #define HID_APP_VIEW_PREVIEW_1                      (HID_DBACCESS_START + 277)
 #define HID_APP_VIEW_PREVIEW_2                      (HID_DBACCESS_START + 278)
-#define HID_APP_STATUS_BAR                          (HID_DBACCESS_START + 279)
+#define HID_APP_STATUS_BAR                      (HID_DBACCESS_START + 279)
 #define UID_APP_VIEW_HORZ_SPLIT                     (HID_DBACCESS_START + 280)
 #define UID_APP_VIEW_PREVIEW_1                      (HID_DBACCESS_START + 281)
 #define HID_APP_VIEW_PREVIEW_3                      (HID_DBACCESS_START + 282)
@@ -378,9 +378,85 @@
 
 #define HID_DSADMIN_CATALOG                         (HID_DBACCESS_START + 292)
 #define HID_DSADMIN_SCHEMA                          (HID_DBACCESS_START + 293)
-#define HID_DSADMIN_IGNOREINDEXAPPENDIX             (HID_DBACCESS_START + 294)
+#define HID_DSADMIN_IGNOREINDEXAPPENDIX                     (HID_DBACCESS_START + 294)
 #define HID_DSADMIN_DOSLINEENDS                     (HID_DBACCESS_START + 295)
 
+#define HID_PAGE_DBWIZARD_GENERALPAGE                           (HID_DBACCESS_START + 300)
+#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE           (HID_DBACCESS_START + 301)
+#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE        (HID_DBACCESS_START + 302)
+
+#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION                (HID_DBACCESS_START + 304)
+#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION                (HID_DBACCESS_START + 305)
+
+
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES                (HID_DBACCESS_START + 307)
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES                (HID_DBACCESS_START + 308)
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES              (HID_DBACCESS_START + 309)
+#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION                  (HID_DBACCESS_START + 310)
+
+
+#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE              (HID_DBACCESS_START + 311)
+#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE              (HID_DBACCESS_START + 312)
+#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR                (HID_DBACCESS_START + 313)
+#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR                 (HID_DBACCESS_START + 314)
+#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR              (HID_DBACCESS_START + 315)
+#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR            (HID_DBACCESS_START + 316)
+
+#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION          (HID_DBACCESS_START + 317)
+#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION          (HID_DBACCESS_START + 318)
+
+#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER                    (HID_DBACCESS_START + 319)
+#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN                        (HID_DBACCESS_START + 320)
+#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER                    (HID_DBACCESS_START + 321)
+#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL                        (HID_DBACCESS_START + 322)
+#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION            (HID_DBACCESS_START + 323)
+
+#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME                  (HID_DBACCESS_START + 326)
+#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME                  (HID_DBACCESS_START + 327)
+
+#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC               (HID_DBACCESS_START + 329)
+#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC               (HID_DBACCESS_START + 330)
+
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME                (HID_DBACCESS_START + 333)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER            (HID_DBACCESS_START + 334)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT                  (HID_DBACCESS_START + 335)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS                 (HID_DBACCESS_START + 336)
+#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS             (HID_DBACCESS_START + 337)
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL               (HID_DBACCESS_START + 340)
+#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL               (HID_DBACCESS_START + 341)
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS                 (HID_DBACCESS_START + 342)
+#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS             (HID_DBACCESS_START + 343)
+
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME               (HID_DBACCESS_START + 344)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER           (HID_DBACCESS_START + 345)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT                 (HID_DBACCESS_START + 346)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS                (HID_DBACCESS_START + 347)
+#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS            (HID_DBACCESS_START + 348)
+
+
+#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL                 (HID_DBACCESS_START + 349)
+#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL                 (HID_DBACCESS_START + 350)
+#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION              (HID_DBACCESS_START + 351)
+
+#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE          (HID_DBACCESS_START + 355)
+#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE          (HID_DBACCESS_START + 356)
+
+#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH        (HID_DBACCESS_START + 359)
+#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH        (HID_DBACCESS_START + 360)
+#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED    (HID_DBACCESS_START + 361)
+
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED   (HID_DBACCESS_START + 365)
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME       (HID_DBACCESS_START + 366)
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION        (HID_DBACCESS_START + 367)
+
+#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE           (HID_DBACCESS_START + 373)
+#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE       (HID_DBACCESS_START + 374)
+#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD             (HID_DBACCESS_START + 375)
+#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS               (HID_DBACCESS_START + 376)
+
+
 // don't forget to update the file util/hidother.src