INTEGRATION: CWS dbwizard1 (1.3.6); FILE MERGED

2004/08/16 10:55:22 bc 1.3.6.1: #i20313#Classes for Datasource wizard checked in

1 files changed, 38 insertions, 11 deletions

diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 93c3990182d1..44f3d01ede1e 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_dlg.hrc,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-02 15:58:04 $
+ *  last change: $Author: pjunck $ $Date: 2004-10-27 13:05:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,11 @@
 
 #define PAGE_X              281
 #define PAGE_Y              185
+#define WIZARD_PAGE_X       225
+#define WIZARD_PAGE_Y       210
+#define START_X             6
+
+
 #define CHECKBOX_HEIGHT      8
 #define FIXEDTEXT_HEIGHT     8
 #define RELATED_CONTROLS     4
@@ -75,6 +80,11 @@
 #define BUTTON_HEIGHT       14
 #define BUTTON_WIDTH        50
 
+//constants for the wizards
+#define INIT_X               6
+#define INIT_Y               28
+#define INDENTED_X           6
+
 
 #define STR_ADABAS_HELP_SYSDEVSPACE         RID_STR_DLG_START
 #define STR_ADABAS_HELP_TRANSACT            RID_STR_DLG_START + 1
@@ -98,30 +108,47 @@
 #define STR_ADDRESSBOOK_EVOLUTION           RID_STR_DLG_START + 19
 #define STR_ADDRESSBOOK_LDAP                RID_STR_DLG_START + 20
 #define STR_ADDRESSBOOK_OUTLOOK             RID_STR_DLG_START + 21
-#define STR_COMMAND_EXECUTED_SUCCESSFULLY   RID_STR_DLG_START + 22
-#define STR_DIRECTSQL_CONNECTIONLOST        RID_STR_DLG_START + 23
+#define STR_COMMAND_EXECUTED_SUCCESSFULLY       RID_STR_DLG_START + 22
+#define STR_DIRECTSQL_CONNECTIONLOST            RID_STR_DLG_START + 23
 #define STR_CALCDOC_DOESNOTEXIST            RID_STR_DLG_START + 24
-#define STR_HINT_READONLY_CONNECTION        RID_STR_DLG_START + 25
-#define STR_HINT_CONNECTION_NOT_CAPABLE     RID_STR_DLG_START + 26
+#define STR_HINT_READONLY_CONNECTION            RID_STR_DLG_START + 25
+#define STR_HINT_CONNECTION_NOT_CAPABLE         RID_STR_DLG_START + 26
 #define STR_USERADMIN_NOT_AVAILABLE         RID_STR_DLG_START + 27
 #define STR_TAB_INDEX_SORTORDER             RID_STR_DLG_START + 28
-#define STR_TAB_INDEX_FIELD                 RID_STR_DLG_START + 29
-#define STR_ORDER_ASCENDING                 RID_STR_DLG_START + 30
+#define STR_TAB_INDEX_FIELD             RID_STR_DLG_START + 29
+#define STR_ORDER_ASCENDING             RID_STR_DLG_START + 30
 #define STR_ORDER_DESCENDING                RID_STR_DLG_START + 31
 #define STR_CONFIRM_DROP_INDEX              RID_STR_DLG_START + 32
 #define STR_LOGICAL_INDEX_NAME              RID_STR_DLG_START + 33
-#define STR_CONNECTION_TEST                 RID_STR_DLG_START + 34
+#define STR_CONNECTION_TEST             RID_STR_DLG_START + 34
 #define STR_CONNECTION_SUCCESS              RID_STR_DLG_START + 35
-#define STR_JDBCDRIVER_TEST                 RID_STR_DLG_START + 36
+#define STR_JDBCDRIVER_TEST             RID_STR_DLG_START + 36
 #define STR_JDBCDRIVER_SUCCESS              RID_STR_DLG_START + 37
 #define STR_JDBCDRIVER_NO_SUCCESS           RID_STR_DLG_START + 38
 #define STR_MSACCESS_FILTERNAME             RID_STR_DLG_START + 39
 #define STR_CONNECTION_NO_SUCCESS           RID_STR_DLG_START + 40
+#define STR_DBASE_PATH_OR_FILE              RID_STR_DLG_START + 41
+#define STR_TEXT_PATH_OR_FILE               RID_STR_DLG_START + 45
+#define STR_FLAT_PATH_OR_FILE               RID_STR_DLG_START + 46
+#define STR_CALC_PATH_OR_FILE               RID_STR_DLG_START + 47
+#define STR_NAME_OF_ODBC_DATASOURCE         RID_STR_DLG_START + 48
+#define STR_MYSQL_DATABASE_NAME             RID_STR_DLG_START + 49
+#define STR_ORACLE_DATABASE_NAME            RID_STR_DLG_START + 50
+#define STR_ADABAS_DATABASE_NAME            RID_STR_DLG_START + 51
+#define STR_MSACCESS_MDB_FILE               RID_STR_DLG_START + 52
+#define STR_COMMONURL                       RID_STR_DLG_START + 53
+#define STR_DATABASEDEFAULTNAME             RID_STR_DLG_START + 54
+#define STR_NO_ADABASE_DATASOURCES          RID_STR_DLG_START + 55
+#define STR_NO_ADDITIONAL_SETTINGS          RID_STR_DLG_START + 56
+#define STR_HOSTNAME                        RID_STR_DLG_START + 57
+
+
+
 
 
 // please adjust checking before insert new strings
 
-#if STR_MSACCESS_FILTERNAME > RID_STR_DLG_END
+#if STR_HOSTNAME > RID_STR_DLG_END
 #error Resource-Id Overflow in #file, #line
 #endif