INTEGRATION: CWS dbwizard1 (1.2.6); FILE MERGED

2004/08/16 12:26:24 bc 1.2.6.2: #i20313# several fileds added for database wizard
2004/08/16 10:50:07 bc 1.2.6.1: #i20313#Classes for Datasource wizard checked in

1 files changed, 19 insertions, 108 deletions

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 1aeacd0e4827..c74022de8871 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConnectionPage.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2004-08-02 15:40:40 $
+ *  last change: $Author: pjunck $ $Date: 2004-10-27 12:58:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -54,7 +54,7 @@
  *
  *  All Rights Reserved.
  *
- *  Contributor(s): Ocke Janssen
+ *  Contributor(s): Berend Cornelius
  *
  *
  ************************************************************************/
@@ -62,13 +62,16 @@
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
-
 #ifndef _DBU_DLG_HRC_
 #include "dbu_dlg.hrc"
 #endif
 #ifndef DBAUI_CONNECTIONPAGE_HRC
 #include "ConnectionPage.hrc"
 #endif
+#ifndef _DBAUI_AUTOCONTROLS_HRC_
+#include "AutoControls.hrc"
+#endif
+
 
 //.........................................................................
 TabPage PAGE_CONNECTION
@@ -86,87 +89,9 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "General";
     };
 
-    FixedText FT_CONNECTURL
-    {
-        Hide = TRUE;
-        HelpId = HID_DSADMIN_URL_GENERAL;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="D~atenquellen-URL" ;
-        Text[ en-US ] = "~Data source URL";
-    };
 
-    FixedText FT_DBASE_PATH_OR_FILE
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Pfad zu den dBASE Dateien" ;
-        Text[ en-US ] = "Path to the dBASE files";
-    };
+    AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL)
 
-    FixedText FT_FLAT_PATH_OR_FILE
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Pfad zu den Textdateien" ;
-        Text[ en-US ] = "Path to the text files";
-    };
-
-    FixedText FT_CALC_PATH_OR_FILE
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Pfad zum Tabellendokument" ;
-        Text[ en-US ] = "Path to the spreadsheet document";
-    };
-
-    FixedText FT_NAME_OF_ODBC_DATASOURCE
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Name der ODBC Datenquelle auf Ihrem System" ;
-        Text[ en-US ] = "Name of the ODBC data source on your system";
-    };
-
-    FixedText FT_MYSQL_DATABASE_NAME
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Name der MySQL Datenbank" ;
-        Text[ en-US ] = "Name of the MySQL database";
-    };
-
-    FixedText FT_ORACLE_DATABASE_NAME
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Name der Oracle Datenbank" ;
-        Text[ en-US ] = "Name of the Oracle database";
-    };
-
-    FixedText FT_ADABAS_DATABASE_NAME
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Name der Adabas D Datenbank" ;
-        Text[ en-US ] = "Name of the Adabas D database";
-    };
-
-    FixedText FT_MSACCESS_MDB_FILE
-    {
-        Hide = TRUE;
-        Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
-        Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Microsoft Access Datenbankdatei" ;
-        Text[ en-US ] = "Microsoft Access database file";
-    };
 
     FixedText FT_NO_ADDITIONAL_SETTINGS
     {
@@ -174,10 +99,9 @@ TabPage PAGE_CONNECTION
         WordBreak = TRUE;
         Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( PAGE_X - 12 , 3*FIXEDTEXT_HEIGHT ) ;
-        Text [ de ] ="Es werden keine weiteren Einstellungen ben�tigt. Um die Verbindung zu pr�fen, klicken Sie auf die Schaltfl�che '%test'." ;
-        Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button.";
     };
 
+
     FixedText FT_HOSTNAME
     {
         Hide = TRUE;
@@ -187,24 +111,6 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "~Host name";
     };
 
-    Edit ET_CONNECTURL
-    {
-        Pos = MAP_APPFONT ( 6 , 2*FIXEDTEXT_HEIGHT + 2*UNRELATED_CONTROLS + RELATED_CONTROLS -1) ;
-        Size = MAP_APPFONT ( 189 , EDIT_HEIGHT ) ;
-        TabStop = TRUE ;
-        Border = TRUE ;
-    };
-
-    PushButton PB_BROWSECONNECTION
-    {
-        TabStop = TRUE ;
-        Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 2*FIXEDTEXT_HEIGHT + 2*UNRELATED_CONTROLS + RELATED_CONTROLS -2 ) ;
-        Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-        HelpId = HID_DSADMIN_BROWSECONN;
-        Text [ de ] ="Suchen..." ;
-        Text[ en-US ] = "Browse...";
-    };
-
 
     FixedLine FL_SEPARATOR2
     {
@@ -280,12 +186,14 @@ TabPage PAGE_CONNECTION
         Text [ en-US ] = "Test Connection";
     };
 
-    String STR_NO_ADABASE_DATASOURCES
-    {
-        Text [ de ] ="Auf Ihrem System wurden keine Adabas D Datenquellen gefunden.";
-        Text [ en-US ] = "No Adabas D data sources were found on your system.";
-    };
 };
+
+String STR_NO_ADABASE_DATASOURCES
+{
+    Text [ de ] ="Auf Ihrem System wurden keine Adabas D Datenquellen gefunden.";
+    Text [ en-US ] = "No Adabas D data sources were found on your system.";
+};
+
 String STR_CONNECTION_TEST
 {
     Text [ de ] ="Verbindungstest" ;
@@ -321,8 +229,11 @@ String STR_JDBCDRIVER_NO_SUCCESS
     Text [ de ] ="Der JDBC-Treiber konnte nicht geladen werden." ;
     Text [ en-US ] = "The JDBC driver could not be loaded.";
 };
+
 String STR_MSACCESS_FILTERNAME
 {
     Text [ de ] ="MS Access Datei" ;
     Text [ en-US ] = "MS Access file";
 };
+
+