CWS-TOOLING: integrate CWS mysql1

2009-01-29 13:25:23 +0100 fs  r267126 : #i98559#
2009-01-29 10:29:23 +0100 fs  r267100 : #i98559#
2009-01-29 09:56:20 +0100 fs  r267098 : do not display empty schematas in the table list in the query designer
2009-01-29 09:40:28 +0100 fs  r267097 : corrected acceptsURL
2009-01-28 11:17:42 +0100 fs  r267042 : display empty catalogs/schemas, if indicated by the connection settings
2009-01-28 11:14:30 +0100 fs  r267040 : +displayEmptyTableFolders
2009-01-28 11:03:28 +0100 fs  r267036 : mysql:mysqlc, not mysql:mysql, for the native driver
2009-01-28 10:23:53 +0100 fs  r267031 : select the first catalog/schema, if the guess for the current one did not match
2009-01-28 10:22:23 +0100 fs  r267030 : select the first catalog/schema, if the guess for the current one did not match
2009-01-27 15:03:29 +0100 fs  r266996 : #i10000#
2009-01-27 14:56:13 +0100 fs  r266992 : #i20563# better (more dedicated) UI for the MySQL native driver's properties
2009-01-27 08:20:24 +0100 oj  r266953 : enable sdbcx mysql driver for mysqlc
2009-01-27 08:20:09 +0100 oj  r266952 : enable sdbcx mysql driver for mysqlc

1 files changed, 56 insertions, 12 deletions

diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 77dbbfb9b..dfb991f19 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -61,41 +61,42 @@
 
 //-------------------------------------------------------------------------
 
-#define AUTO_SPECIAL_JDBC(AUTO_Y)																		\
+#define AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y) \
     FixedLine FL_SEPARATOR1																				\
     {																									\
         Pos = MAP_APPFONT ( 4 , AUTO_Y ) ;																\
-        Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;													\
-        Text[ en-US ] = "Connection Settings";														\
+        Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;											\
+        Text[ en-US ] = "Connection Settings";														    \
     };																									\
-                                                                                                        \
+
+#define AUTO_HOST_AND_PORT(AUTO_Y)																		\
     FixedText FT_HOSTNAME																				\
     {																									\
-        Pos = MAP_APPFONT ( 6 , AUTO_Y + RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ;							\
+        Pos = MAP_APPFONT ( 6 , AUTO_Y ) ;						                                        \
         Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;											\
-        Text[ en-US ] = "~Host name";																\
+        Text[ en-US ] = "~Host name";																    \
     };																									\
     Edit ET_HOSTNAME																					\
     {																									\
         TabStop = TRUE ;																				\
         Border = TRUE ;																					\
         HelpId = HID_DSADMIN_HOSTNAME;																	\
-        Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + RELATED_CONTROLS + FIXEDTEXT_HEIGHT -1 ) ;				\
+        Pos = MAP_APPFONT ( EDIT_X , AUTO_Y - 1 ) ;				                                        \
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;														\
     };																									\
                                                                                                         \
     FixedText FT_PORTNUMBER																				\
     {																									\
-        Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT) ;	\
+        Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ;	                    \
         Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;											\
-        Text[ en-US ] = "~Port number";															\
+        Text[ en-US ] = "~Port number";															        \
     };																									\
     NumericField NF_PORTNUMBER																			\
     {																									\
         TabStop = TRUE ;																				\
         Border = TRUE ;																					\
         HelpId = HID_DSADMIN_PORTNUMBER;																\
-        Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; \
+        Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT -1 ) ;               \
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;														\
     };
 //-------------------------------------------------------------------------
@@ -532,7 +533,8 @@ TabPage PAGE_MYSQL_JDBC
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
     Hide = TRUE;
 
-    AUTO_SPECIAL_JDBC( UNRELATED_CONTROLS )
+    AUTO_FIXEDLINE_CONNSETTINGS( UNRELATED_CONTROLS )
+    AUTO_HOST_AND_PORT( UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT )
     AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT)
 
     FixedText FT_JDBCDRIVERCLASS
@@ -561,6 +563,47 @@ TabPage PAGE_MYSQL_JDBC
     AUTO_CHARSET( 5*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT+ EDIT_HEIGHT, PAGE_X )
 };
 
+TabPage PAGE_MYSQL_NATIVE
+{
+    SVLook = TRUE ;
+    Pos = MAP_APPFONT ( 0 , 0 ) ;
+    Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
+    Hide = TRUE;
+
+    AUTO_FIXEDLINE_CONNSETTINGS( UNRELATED_CONTROLS )
+    AUTO_NAMECONTROLGROUP( UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT, HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME )
+    AUTO_HOST_AND_PORT( UNRELATED_CONTROLS + 2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + EDIT_HEIGHT )
+    AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT )
+
+    FixedLine FL_SEPARATOR2
+    {
+        Pos = MAP_APPFONT ( 3 , 4*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + 2*EDIT_HEIGHT ) ;
+        Size = MAP_APPFONT ( PAGE_X - 6, FIXEDTEXT_HEIGHT ) ;
+        Text[ en-US ] = "User authentication";
+    };
+    FixedText FT_USERNAME
+    {
+        Pos = MAP_APPFONT ( 6 , 4*UNRELATED_CONTROLS + 3*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*EDIT_HEIGHT ) ;
+        Size = MAP_APPFONT ( EDIT_X - 6 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "~User name" ;
+    };
+    Edit ET_USERNAME
+    {
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 3*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*EDIT_HEIGHT - 1 ) ;
+        Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
+        TabStop = TRUE ;
+    };
+    CheckBox CB_PASSWORD_REQUIRED
+    {
+        Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 4*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 3*EDIT_HEIGHT ) ;
+        Size = MAP_APPFONT ( 105, CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "Password required";
+    };
+
+    AUTO_CHARSET( 5*UNRELATED_CONTROLS + 4*RELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 3*EDIT_HEIGHT, PAGE_X )
+};
+
 TabPage PAGE_ORACLE_JDBC
 {
     SVLook = TRUE ;
@@ -568,7 +611,8 @@ TabPage PAGE_ORACLE_JDBC
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
     Hide = TRUE;
 
-    AUTO_SPECIAL_JDBC( UNRELATED_CONTROLS )
+    AUTO_FIXEDLINE_CONNSETTINGS( UNRELATED_CONTROLS )
+    AUTO_HOST_AND_PORT( UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT )
 
     AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT)