Tag: cws_src680_dba24b
User: fs      
Date: 2007-08-27 10:50:41+0000
Modified:
   dba/dbaccess/source/ui/dlg/dbadmin.cxx
   dba/dbaccess/source/ui/dlg/dbadmin.hrc
   dba/dbaccess/source/ui/dlg/dbadmin.src

Log:
 prepare #i80930#: outsourced all the advanced settings into dedicated pages 
(they were never needed by more than one instance of the CommonBehaviourPage)

File Changes:

Directory: /dba/dbaccess/source/ui/dlg/
=======================================

File [changed]: dbadmin.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.103&r2=1.103.28.1
Delta lines:  +3 -6
-------------------
--- dbadmin.cxx 2007-07-06 08:13:45+0000        1.103
+++ dbadmin.cxx 2007-08-27 10:50:38+0000        1.103.28.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbadmin.cxx,v $
  *
- *  $Revision: 1.103 $
+ *  $Revision: 1.103.28.1 $
  *
- *  last change: $Author: rt $ $Date: 2007/07/06 08:13:45 $
+ *  last change: $Author: fs $ $Date: 2007/08/27 10:50:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -81,9 +81,6 @@
 #ifndef DBAUI_CONNECTIONPAGE_HXX
 #include "ConnectionPage.hxx"
 #endif
-#ifndef DBAUI_ADVANCEDPAGEDLG_HXX
-#include "AdvancedPageDlg.hxx"
-#endif
 #ifndef DBAUI_DRIVERSETTINGS_HXX
 #include "DriverSettings.hxx"
 #endif

File [changed]: dbadmin.hrc
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.hrc?r1=1.34&r2=1.34.88.1
Delta lines:  +70 -134
----------------------
--- dbadmin.hrc 2006-12-13 16:49:37+0000        1.34
+++ dbadmin.hrc 2007-08-27 10:50:38+0000        1.34.88.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbadmin.hrc,v $
  *
- *  $Revision: 1.34 $
+ *  $Revision: 1.34.88.1 $
  *
- *  last change: $Author: kz $ $Date: 2006/12/13 16:49:37 $
+ *  last change: $Author: fs $ $Date: 2007/08/27 10:50:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,120 +40,62 @@
 // control ids
 
 #define FT_DATATYPE                            1
-#define FT_CONNECTURL                  2
-#define FT_DATASOURCETYPE_PRE  3
-#define FT_USERNAME                            4
-#define FT_PASSWORD                            5
-#define FT_OPTIONS                             6
-#define FT_CHARSET                             7
-#define FT_JDBCDRIVERCLASS             8
-#define FT_TABLESUBSCRIPTION   14
-#define FT_SPECIAL_MESSAGE             15
-#define FT_LOGINTIMEOUT                        16
-#define FT_FILTER_EXPLANATION  17
-#define FT_HOSTNAME                            18
-#define FT_BASEDN                              19
-#define FT_PORTNUMBER                  20
-#define FT_LDAPROWCOUNT                        21
-#define FT_AUTOINCREMENTVALUE  22
-#define FT_RETRIEVE_AUTO               23
-#define FT_BOOLEANCOMPARISON   24
-#define FT_DATASOURCETYPE_POST 25
-#define FT_DATABASENAME                    26
-
-#define FT_GENERALHEADERTEXT    41
-#define FT_GENERALHELPTEXT      42
-#define FT_DATATYPEAPPENDIX     43
-#define FT_DATASOURCEHEADER     44
-#define FT_DOCLISTLABEL         45
+#define FT_DATASOURCETYPE_PRE   2
+#define FT_USERNAME             3
+#define FT_PASSWORD             4
+#define FT_OPTIONS              5
+#define FT_CHARSET              6
+#define FT_JDBCDRIVERCLASS      7
+#define FT_SPECIAL_MESSAGE      8
+#define FT_FILTER_EXPLANATION   9
+#define FT_HOSTNAME             10
+#define FT_BASEDN               11
+#define FT_PORTNUMBER           12
+#define FT_LDAPROWCOUNT         13
+#define FT_DATASOURCETYPE_POST  14
+#define FT_GENERALHEADERTEXT    15
+#define FT_GENERALHELPTEXT      16
+#define FT_DATATYPEAPPENDIX     17
+#define FT_DATASOURCEHEADER     18
+#define FT_DOCLISTLABEL         19
 
 #define LB_DATATYPE                            1
-#define LB_DATASOURCES                 2
-#define LB_CHARSET                             3
-#define LB_TIMEOUT_UNIT                        4
-#define LB_BOOLEANCOMPARISON   5
-#define LB_DOCUMENTLIST         6
-
-#define        ET_CONNECTURL                   1
-#define ET_DATASOURCENAME              2
-#define ET_USERNAME                            3
-#define ET_PASSWORD                            4
-#define ET_OPTIONS                             5
-#define ET_JDBCDRIVERCLASS             6
-#define ET_TIMEOUT_NUMBER              7
-#define ET_HOSTNAME                            8
-#define ET_BASEDN                              9
-#define ET_AUTOINCREMENTVALUE  10
-#define ET_RETRIEVE_AUTO          11
-#define ET_DBASELOCATION       12
-#define ET_BROWSEURL           13
-#define ET_PORTNUMBER          15
-#define ET_DATABASENAME                   16
-#define ET_GENERALPASSWORD        18
-
-
-#define PB_BROWSECONNECTION            1
-#define PB_INDICIES                            2
-#define PB_ADDALLTABLES                        3
-#define PB_NEW_DATASOURCE              4
-#define PB_CREATEDATABASE              5
-#define BTN_PASSWORD_OK                        6
-#define BTN_PASSWORD_CANCEL            7
-#define BTN_PASSWORD_HELP              8
-#define PB_TESTDRIVERCLASS             9
-#define PB_DBASELOCATION        10
-#define PB_BROWSEURL                   11
-#define PB_TESTADOCONNECTION   12
-#define PB_OPENDOCUMENT         13
-
-#define GB_CONNECTION                  1
-#define GB_DBASE_MAIN                  2
-#define GB_TABLESUBSCRIPTION   3
+#define LB_CHARSET              2
+#define LB_DOCUMENTLIST         3
+
+#define ET_USERNAME             1
+#define ET_PASSWORD             2
+#define ET_OPTIONS              3
+#define ET_JDBCDRIVERCLASS      4
+#define ET_HOSTNAME             5
+#define ET_BASEDN               6
+
+#define PB_INDICIES             1
+#define BTN_PASSWORD_OK         2
+#define BTN_PASSWORD_CANCEL     3
+#define BTN_PASSWORD_HELP       4
+#define PB_TESTDRIVERCLASS      5
+#define PB_OPENDOCUMENT         6
 
 #define CB_PASSWORD_REQUIRED   1
 #define CB_SHOWDELETEDROWS             2
-#define CB_HEADER                              4
-#define CB_SUPPRESVERSIONCL            5
-#define CB_USECATALOG                  6
-#define CB_SQL92CHECK                  7
-#define CB_RETRIEVE_AUTO               8
-#define CB_APPENDTABLEALIAS            9
-#define CB_IGNOREDRIVER_PRIV    10
-#define CB_PARAMETERNAMESUBST  11
-#define CB_ENABLEOUTERJOIN             12
-#define CB_SCHEMA                              13
-#define CB_CATALOG                             14
-#define CB_IGNOREINDEXAPPENDIX 15
-#define CB_USESSL                              16
-#define CB_DOSLINEENDS                 22
-#define CB_AS_BEFORE_CORR_NAME  23
-
+#define CB_USESSL               3
+#define CB_USECATALOG                  4
 
 #define FL_SEPARATOR1                  1
 #define FL_SEPARATOR2                  2
-#define FL_COLLECTION                  3
-#define FL_SEPARATOR3                  4
-#define FL_SEPARATORAUTO               5
-#define FL_DATAHANDLING                        6
-#define FL_DATACONVERT                 7
-#define FL_ADDITIONALSETTINGS   8
+#define FL_DATACONVERT          3
 
 #define CTL_TABLESUBSCRIPTION  1
-#define        CTL_COLLECTION                  2
 
 #define TLB_ACTIONS                            1
 
 #define NF_PORTNUMBER                  1
 #define NF_LDAPROWCOUNT                        2
 
-#define RB_USEMYODBC                   1
-#define RB_USECONNECTORJ3              2
-#define RB_CREATEDBDATABASE     3
-#define RB_GETEXISTINGDATABASE  4
-#define RB_OPENEXISTINGDOC      5
-
-
-
+#define RB_CREATEDBDATABASE     1
+#define RB_GETEXISTINGDATABASE  2
+#define RB_OPENEXISTINGDOC      3
 
 //========================================================================
 // string ids (usually relative to other resources, that's why not necessarily 
unique)
@@ -161,19 +103,13 @@
 #define STR_PAGETITLE_GENERAL                          1
 #define STR_PAGETITLE_CONNECTION                       2
 #define STR_PAGETITLE_ADVANCED                         3
-#define STR_NO_WILDCARDS                               12
-#define STR_MYSQLENTRY                                 13
-
-#define STR_PARENTTITLE                                        14
-#define STR_COULDNOTLOAD_ODBCLIB                       15
-#define STR_UNSUPPORTED_DATASOURCE_TYPE                        22
-#define STR_MYSQL_CONFIG_NEXT_PAGE                     26
-#define STR_JDBC_DEFAULT_URL                           27
-
-
-
-
-
+#define STR_NO_WILDCARDS                    4
+#define STR_MYSQLENTRY                      5
+#define STR_PARENTTITLE                     6
+#define STR_COULDNOTLOAD_ODBCLIB            7
+#define STR_UNSUPPORTED_DATASOURCE_TYPE     8
+#define STR_MYSQL_CONFIG_NEXT_PAGE          9
+#define STR_JDBC_DEFAULT_URL                10
 
 //========================================================================
 // menu item ids

File [changed]: dbadmin.src
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.src?r1=1.156&r2=1.156.46.1
Delta lines:  +10 -375
----------------------
--- dbadmin.src 2007-04-24 16:09:26+0000        1.156
+++ dbadmin.src 2007-08-27 10:50:38+0000        1.156.46.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbadmin.src,v $
  *
- *  $Revision: 1.156 $
+ *  $Revision: 1.156.46.1 $
  *
- *  last change: $Author: rt $ $Date: 2007/04/24 16:09:26 $
+ *  last change: $Author: fs $ $Date: 2007/08/27 10:50:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,191 +52,13 @@
 #include "AdabasPage.hrc"
 #endif
 
-#define ADVANCED_PAGE_X                200
-
-#define ADVANCED_CHECKBOX_OPTIONS    11
-#define ADVANCED_LISTBOX_OPTIONS      1
-#define ADVANCED_PAGE_Y \
-    /* top space */     START_X + \
-    /* label */         FIXEDTEXT_HEIGHT + RELATED_CONTROLS + \
-    /* check boxes */   ( ADVANCED_CHECKBOX_OPTIONS * ( CHECKBOX_HEIGHT + 
RELATED_CONTROLS ) ) + \
-    /* list boxes */    ( ADVANCED_LISTBOX_OPTIONS * ( LISTBOX_HEIGHT + 
RELATED_CONTROLS ) ) + \
-    /* bottom space */  START_Y - RELATED_CONTROLS
-//#define ADVANCED_PAGE_Y              (105 + 5*CHECKBOX_HEIGHT + 
4*RELATED_CONTROLS)
-
-#define _LB_BOOLEANCOMPARISON                                   \
-               StringList [ en-US ] =                                  \
-               {                                                       \
-                       < "Default" ; Default ; > ;                         \
-                       < "SQL" ; Default ; > ;                             \
-                       < "Mixed" ; Default ; > ;                           \
-                       < "MS Access" ; Default ; > ;                       \
-               };                                                      
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_APPENDTABLEALIAS(AUTO_Y)                                          
                                                \
-       CheckBox CB_APPENDTABLEALIAS                                            
                                                        \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12  , CHECKBOX_HEIGHT 
) ;                      \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_APPENDTABLEALIAS;                          
                                                \
-               Text[ en-US ] = "Append the table alias name on SELECT 
statements";             \
-       };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_AS_BEFORE_CORR_NAME(AUTO_Y)                                       
                                                \
-       CheckBox CB_AS_BEFORE_CORR_NAME                                         
                                                        \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12  , CHECKBOX_HEIGHT 
) ;                      \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_AS_BEFORE_CORRELATION_NAME;                
                                        \
-               Text[ en-US ] = "Use keyword AS before table alias names";      
            \
-       };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_IGNOREINDEXAPPENDIX(AUTO_Y)                                       
                                                \
-       CheckBox CB_IGNOREINDEXAPPENDIX                                         
                                                        \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12  , CHECKBOX_HEIGHT 
) ;                      \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_IGNOREINDEXAPPENDIX;                       
                                                \
-               Text[ en-US ] = "Create index with ASC or DESC statement";      
                \
-       };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SUPPRESVERSIONCOLUMN(AUTO_Y)                                      
                                                \
-       CheckBox CB_SUPPRESVERSIONCL                                            
                                                        \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               Group   = TRUE ;                                                
                                                                        \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_SUPPRESS_VERSIONCL;                        
                                                \
-               Text [ en-US ] = "Display version columns (when available)";    
                    \
-       };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_ENABLEOUTERJOIN(AUTO_Y)                                           
                                            \
-       CheckBox CB_ENABLEOUTERJOIN                                             
                                                                \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               Group   = TRUE ;                                                
                                                                        \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_ENABLEOUTERJOIN;                           
                                                \
-               Text [ en-US ] = "Use Outer Join syntax '{OJ }'";               
                                \
-       };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_DOSLINEENDS(AUTO_Y)                                               
                                        \
-       CheckBox CB_DOSLINEENDS                                                 
                                                                \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               Group   = TRUE ;                                                
                                                                        \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_DOSLINEENDS;                               
                                                        \
-               Text [ en-US ] = "End text lines with CR+LF";                   
                                \
-       };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SCHEMA(AUTO_Y)                                                    
                                \
-       CheckBox CB_SCHEMA                                                      
                                                        \
-       {                                                                       
                                                                                
        \
-        Pos            = MAP_APPFONT ( 6 , AUTO_Y ) ;                          
                                                \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               Group   = TRUE ;                                                
                                                                        \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_SCHEMA;                                    
                                                        \
-               Text [ en-US ] = "Use schema name in SELECT statements";        
                        \
-       };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_CATALOG(AUTO_Y)                                                   
                                \
-       CheckBox CB_CATALOG                                                     
                                                        \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               Group   = TRUE ;                                                
                                                                        \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_CATALOG;                                   
                                                        \
-               Text [ en-US ] = "Use catalog name in SELECT statements";       
                        \
-       };
-
-
-//-------------------------------------------------------------------------
-
-
-
-#define AUTO_BOOLEANCOMPARISON(AUTO_Y)                                         
        \
-       FixedText FT_BOOLEANCOMPARISON                                          
                \
-       {                                                                       
                                                \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y + ( LISTBOX_HEIGHT - 
CHECKBOX_HEIGHT ) / 2 ) ;   \
-               Size    = MAP_APPFONT ( 100 , CHECKBOX_HEIGHT );        \
-               Text [ en-US ] = "Comparison of Boolean values";                
\
-       };                                                                      
                                                \
-    ListBox LB_BOOLEANCOMPARISON                                \
-       {                                                           \
-               Pos             = MAP_APPFONT ( 107 , AUTO_Y ) ;                
\
-               Size    = MAP_APPFONT ( 60 , LISTBOX_HEIGHT ) ;         \
-               Group   = TRUE ;                                        \
-               TabStop = TRUE ;                                        \
-               SvLook = TRUE;                                          \
-               DropDown = TRUE;                                        \
-               Border = TRUE;                                          \
-               HelpId = HID_DSADMIN_BOOLEANCOMPARISON;                 \
-               _LB_BOOLEANCOMPARISON                                   \
-       };                                                          \
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_IGNOREDRIVER_PRIV(AUTO_Y)                                         
                                                \
-       CheckBox CB_IGNOREDRIVER_PRIV                                           
                                                        \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y ) ;                  
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                                                       \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_IGNOREDRIVER_PRIV;                         
                                                \
-               Text[ en-US ] = "Ignore the privileges from the database 
driver";               \
-       };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SQL92CHECK(AUTO_Y)                                                
                                                                \
-       CheckBox CB_SQL92CHECK                                                  
                                                                \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y) ;                   
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                                                       \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_SQL92CHECK;                                
                                                        \
-               Text[ en-US ] = "Use SQL92 naming constraints";                 
                        \
-       };
-
 //-------------------------------------------------------------------------
 
 #define AUTO_USECATALOG(AUTO_Y)                                                
                                                                \
        CheckBox CB_USECATALOG                                                  
                                                                                
                                                                                
                                                \
        {                                                                       
                                                                                
                                                                                
                                                                        \
                Pos             = MAP_APPFONT ( 6 ,AUTO_Y) ;                    
                                                                                
                                                                                
                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                                                                               
                                                                                
                                        \
+               Size    = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ;   \
                TabStop = TRUE ;                                                
                                                                                
                                                                                
                                                        \
                HelpId = HID_DSADMIN_USECATALOG;                                
                                                                                
                                                                                
                                        \
                Text[ en-US ] = "Use catalog for file-based databases";         
                                                                                
                                                                                
\
@@ -244,68 +66,6 @@
 
 //-------------------------------------------------------------------------
 
-#define AUTO_PARAMETERNAMESUBST(AUTO_Y)                                        
                                                        \
-       CheckBox CB_PARAMETERNAMESUBST                                          
                                                        \
-       {                                                                       
                                                                                
        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y) ;                   
                                                        \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) 
;                       \
-               TabStop = TRUE ;                                                
                                                                        \
-               HelpId = HID_DSADMIN_PARAMETERNAMESUBST;                        
                                                \
-               Text[ en-US ] = "Replace named parameters with '?'";            
                        \
-       };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_INCREMENT_CONTROLS(AUTO_Y)                                        
                                        \
-       FixedLine FL_SEPARATORAUTO                                              
                                                \
-       {                                                                       
                                                                        \
-               Pos = MAP_APPFONT ( 4 , AUTO_Y ) ;                              
                                        \
-               Size = MAP_APPFONT ( ADVANCED_PAGE_X - 2*RELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;                                                \
-               Text [ en-US ] = "Settings";                                    
                                \
-       };                                                                      
                                                                        \
-       CheckBox CB_RETRIEVE_AUTO                                               
                                                \
-       {                                                                       
                                                                        \
-               Pos             = MAP_APPFONT ( 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 
RELATED_CONTROLS) ;     \
-               Size    = MAP_APPFONT ( ADVANCED_PAGE_X - 2*UNRELATED_CONTROLS 
, CHECKBOX_HEIGHT ) ;                                    \
-               TabStop = TRUE ;                                                
                                                        \
-               HelpId = HID_DSADMIN_AUTORETRIEVEENABLED;                       
                                \
-               Text [ en-US ] = "Re~trieve generated values";\
-       };                                                                      
                                                                        \
-                                                                               
                                                                        \
-       FixedText FT_AUTOINCREMENTVALUE                                         
                                        \
-       {                                                                       
                                                                        \
-               Pos             = MAP_APPFONT ( 15 , AUTO_Y + FIXEDTEXT_HEIGHT 
+ 2*RELATED_CONTROLS + CHECKBOX_HEIGHT ) ;               \
-               Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 6 , 
FIXEDTEXT_HEIGHT ) ;                    \
-               Text[ en-US ] = "~Auto-increment statement";\
-       };                                                                      
                                                                         \
-                                                                               
                                                                         \
-       Edit ET_AUTOINCREMENTVALUE                                              
                                                 \
-       {                                                                       
                                                                         \
-               Border = TRUE ;                                                 
                                                         \
-               Pos             = MAP_APPFONT ( 15 , AUTO_Y + 
2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + 3*RELATED_CONTROLS ) ;              \
-               Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 
2*UNRELATED_CONTROLS , EDIT_HEIGHT ) ;                                          
                             \
-               TabStop = TRUE ;                                                
                                                         \
-               HelpId = HID_DSADMIN_AUTOINCREMENTVALUE;                        
                                 \
-       };                                                                      
                                                                         \
-                                                                               
                                                                         \
-       FixedText FT_RETRIEVE_AUTO                                              
                                                 \
-       {                                                                       
                                                                         \
-               Pos             = MAP_APPFONT ( 15 , AUTO_Y + 
2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + 4*RELATED_CONTROLS + EDIT_HEIGHT) ;      
           \
-               Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 6 , 10 ) ;          
                                 \
-               Text [ en-US ] = "~Query of generated values";\
-       };                                                                      
                                                                        \
-                                                                               
                                                                        \
-       Edit ET_RETRIEVE_AUTO                                                   
                                                \
-       {                                                                       
                                                                        \
-               Border = TRUE ;                                                 
                                                        \
-               Pos             = MAP_APPFONT ( 15 , AUTO_Y + 
3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + 5*RELATED_CONTROLS + EDIT_HEIGHT ) ;     
          \
-               Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 
2*UNRELATED_CONTROLS, EDIT_HEIGHT ) ;                                           
                            \
-               TabStop = TRUE ;                                                
                                                        \
-               HelpId = HID_DSADMIN_RETRIEVE_AUTO;                             
                                        \
-       };
-
-//-------------------------------------------------------------------------
-
 #define AUTO_CHARSET(AUTO_Y)                                                   
                                        \
        FixedLine FL_DATACONVERT                                                
                                                        \
        {                                                                       
                                                                        \
@@ -332,16 +92,6 @@
 
 //-------------------------------------------------------------------------
 
-#define AUTO_DATAHANDLING(AUTO_Y)                                              
                                        \
-       FixedLine FL_DATAHANDLING                                               
                                                \
-       {                                                                       
                                                                        \
-               Pos = MAP_APPFONT ( RELATED_CONTROLS , AUTO_Y ) ;               
                        \
-               Size = MAP_APPFONT ( ADVANCED_PAGE_X - 2*RELATED_CONTROLS , 
FIXEDTEXT_HEIGHT ) ;                \
-               Text [ en-US ] = "Options";                                     
                        \
-       };
-
-//-------------------------------------------------------------------------
-
 #define AUTO_SPECIAL_JDBC(AUTO_Y)                                              
                                                                                
                \
        FixedLine FL_SEPARATOR1                                                 
                                                                                
                        \
        {                                                                       
                                                                                
                                                \
@@ -643,121 +393,6 @@
 
 //.........................................................................
 
-TabPage PAGE_GENERATED_VALUES
-{
-       SVLook = TRUE ;
-       Pos = MAP_APPFONT ( 0 , 0 ) ;
-       Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-       Hide = TRUE;
-       AUTO_INCREMENT_CONTROLS ( UNRELATED_CONTROLS)
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_ADABAS_SETTINGS
-{
-       SVLook = TRUE ;
-       Pos = MAP_APPFONT ( 0 , 0 ) ;
-       Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-       Hide = TRUE;
-       AUTO_DATAHANDLING(                        RELATED_CONTROLS )
-       AUTO_SQL92CHECK(                          RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-       AUTO_APPENDTABLEALIAS(          2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
  CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_SUPPRESVERSIONCOLUMN(      3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_DOSLINEENDS(                       4*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-       AUTO_BOOLEANCOMPARISON(         5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_ADO_SETTINGS
-{
-       SVLook = TRUE ;
-       Pos = MAP_APPFONT ( 0 , 0 ) ;
-       Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-       Hide = TRUE;
-       AUTO_DATAHANDLING(                        RELATED_CONTROLS )
-       AUTO_SQL92CHECK(                        1*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-       AUTO_APPENDTABLEALIAS(          2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
1*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_AS_BEFORE_CORR_NAME(   3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_ENABLEOUTERJOIN(           4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
3*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_SUPPRESVERSIONCOLUMN(      5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
4*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_DOSLINEENDS(                       6*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-       AUTO_BOOLEANCOMPARISON(         7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
6*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_PROPERTIES_FILE
-{
-       SVLook = TRUE ;
-       Pos = MAP_APPFONT ( 0 , 0 ) ;
-       Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-       Hide = TRUE;
-       AUTO_DATAHANDLING(                        RELATED_CONTROLS )
-       AUTO_SQL92CHECK(                          RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-       AUTO_DOSLINEENDS(                       2*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_PROPERTIES_ACCESS
-{
-       SVLook = TRUE ;
-       Pos = MAP_APPFONT ( 0 , 0 ) ;
-       Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-       Hide = TRUE;
-       AUTO_DATAHANDLING(                        RELATED_CONTROLS )
-       AUTO_SQL92CHECK(                          RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-       AUTO_APPENDTABLEALIAS(          2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
  CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_ENABLEOUTERJOIN(           3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_DOSLINEENDS(                       4*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-       AUTO_BOOLEANCOMPARISON(         5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_MYSQL_SETTINGS
-{
-       SVLook = TRUE ;
-       Pos = MAP_APPFONT ( 0 , 0 ) ;
-       Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-       Hide = TRUE;
-       AUTO_DATAHANDLING(                        RELATED_CONTROLS )
-       AUTO_ENABLEOUTERJOIN(             RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
  RELATED_CONTROLS )
-       AUTO_IGNOREDRIVER_PRIV(         2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
  CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_APPENDTABLEALIAS(          3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_PARAMETERNAMESUBST(        4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
3*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_SUPPRESVERSIONCOLUMN(      5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
4*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_DOSLINEENDS(                       6*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-       AUTO_BOOLEANCOMPARISON(         7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
6*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_FULL_ADVANCED_SETTINGS
-{
-       SVLook = TRUE ;
-       Pos = MAP_APPFONT ( 0 , 0 ) ;
-       Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-       Hide = TRUE;
-       AUTO_DATAHANDLING(                        RELATED_CONTROLS )
-       AUTO_SQL92CHECK(                        1*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-       AUTO_APPENDTABLEALIAS(          2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
1*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_AS_BEFORE_CORR_NAME(   3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_ENABLEOUTERJOIN(           4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
3*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_IGNOREDRIVER_PRIV(         5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
4*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_PARAMETERNAMESUBST(        6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
5*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_SUPPRESVERSIONCOLUMN(      7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
6*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_CATALOG(                           8*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 7*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_SCHEMA(                            9*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 8*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_IGNOREINDEXAPPENDIX(  10*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
9*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_DOSLINEENDS(                  11*RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-       AUTO_BOOLEANCOMPARISON(    12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 
11*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 
2 )
-};
-
-//.........................................................................
-
 TabPage PAGE_ODBC
 {
        SVLook = TRUE ;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to