some basics for the query administration page - not enabled yet

5 files changed, 265 insertions, 199 deletions

diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 3b6d8357b312..7b58c00f01fc 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adminpages.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-25 12:14:03 $
+ *  last change: $Author: fs $ $Date: 2001-01-26 06:59:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,6 +119,12 @@
 #ifndef _CONNECTIVITY_DBTOOLS_HXX_
 #include <connectivity/dbtools.hxx>
 #endif
+#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
+#include "dbustrings.hrc"
+#endif
+#ifndef _CPPUHELPER_EXTRACT_HXX_
+#include <cppuhelper/extract.hxx>
+#endif
 
 #ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
 #include <com/sun/star/sdb/SQLContext.hpp>
@@ -129,6 +135,12 @@
 #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
 #endif
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
+#include <com/sun/star/container/XNameAccess.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDB_XQUERYDEFINITIONSSUPPLIER_HPP_
+#include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
+#endif
 
 #include <stdlib.h>
 #ifndef _OSL_FILE_HXX_
@@ -141,19 +153,20 @@
 #include "odbcconfig.hxx"
 #endif
 
+//.........................................................................
+namespace dbaui
+{
+//.........................................................................
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::container;
 using namespace ::dbtools;
 
-//.........................................................................
-namespace dbaui
-{
-//.........................................................................
-
 #define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag)    \
     if (editcontrol.GetText() != editcontrol.GetSavedValue())           \
     {                                                                   \
@@ -255,7 +268,7 @@ OGeneralPage::OGeneralPage(Window* pParent, const SfxItemSet& _rItems)
         {
             DATASOURCE_TYPE eType = aTypeLoop.getType();
             sal_Int32 nPos = m_aDatasourceType.InsertEntry(aTypeLoop.getDisplayName());
-            m_aDatasourceType.SetEntryData(nPos, reinterpret_cast<void*>(eType));
+            m_aDatasourceType.SetEntryData((sal_uInt16)nPos, reinterpret_cast<void*>(eType));
         }
     }
 
@@ -1506,7 +1519,7 @@ String OTextDetailsPage::GetSeparator( const ComboBox& rBox, const String& rList
     if( nPos == COMBOBOX_ENTRY_NOTFOUND )
         return rBox.GetText().Copy(0);
     else
-        return String(rList.GetToken((nPos*2)+1, nTok ).ToInt32());
+        return String(rList.GetToken(((nPos*2)+1), nTok ).ToInt32());
             // somewhat strange ... translates for instance an "32" into " "
 }
 
@@ -1519,7 +1532,7 @@ void OTextDetailsPage::SetSeparator( ComboBox& rBox, const String& rList, const
 
     for( i=0 ; i<nCnt ; i+=2 )
     {
-        String  sTVal(rList.GetToken( i+1, nTok ).ToInt32());
+        String  sTVal(rList.GetToken( (i+1), nTok ).ToInt32());
 
         if( sTVal == rVal )
         {
@@ -1903,6 +1916,110 @@ IMPL_LINK( OTableSubscriptionPage, OnRadioButtonClicked, Button*, pButton )
     return 0L;
 }
 
+//========================================================================
+//= OQueryAdministrationPage
+//========================================================================
+//------------------------------------------------------------------------
+OQueryAdministrationPage::OQueryAdministrationPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
+    :OGenericAdministrationPage( pParent, ModuleRes(PAGE_QUERYADMINISTRATION), _rCoreAttrs )
+    ,m_aFrame       (this, ResId(GB_QUERIES))
+    ,m_aQueries     (this, ResId(LB_QUERIES))
+    ,m_aNew         (this, ResId(PB_NEWQUERY))
+    ,m_aEdit        (this, ResId(PB_EDITQUERY))
+    ,m_aDelete      (this, ResId(PB_DELETEQUERY))
+{
+    FreeResource();
+}
+
+//------------------------------------------------------------------------
+OQueryAdministrationPage::~OQueryAdministrationPage()
+{
+}
+
+//------------------------------------------------------------------------
+SfxTabPage* OQueryAdministrationPage::Create( Window* _pParent, const SfxItemSet& _rAttrSet)
+{
+    return new OQueryAdministrationPage(_pParent, _rAttrSet);
+}
+
+//------------------------------------------------------------------------
+void OQueryAdministrationPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue)
+{
+    // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
+    sal_Bool bValid, bReadonly;
+    getFlags(_rSet, bValid, bReadonly);
+}
+
+//------------------------------------------------------------------------
+void OQueryAdministrationPage::ActivatePage(const SfxItemSet& _rSet)
+{
+    // get the name of the data source
+    SFX_ITEMSET_GET(_rSet, pNameItem, SfxStringItem, DSID_NAME, sal_True);
+    DBG_ASSERT(pNameItem, "OQueryAdministrationPage::ActivatePage: missing the name attribute!");
+
+    // clear the queries list box
+    m_aQueries.Clear();
+
+    // need a service factory
+    if (!m_xORB.is())
+    {
+        DBG_ERROR("OQueryAdministrationPage::ActivatePage: have no service facrory!");
+        OGenericAdministrationPage::ActivatePage(_rSet);
+        return;
+    }
+
+    // get the database context
+    Reference< XNameAccess > xQueries;
+    try
+    {
+        Reference< XNameAccess > xDatabaseContext(m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY);
+        Reference< XQueryDefinitionsSupplier > xSuppQueries;
+        ::cppu::extractInterface(xSuppQueries, xDatabaseContext->getByName(pNameItem->GetValue()));
+        if (xSuppQueries.is())
+            xQueries = xSuppQueries->getQueryDefinitions();
+    }
+    catch(Exception&)
+    {
+    }
+
+    if (!xQueries.is())
+    {
+        DBG_ERROR("OQueryAdministrationPage::ActivatePage: could not retrieve the queries for the data source!");
+    }
+    else
+    {
+        // the icon for single queries
+        Image aImage(ModuleRes(IMG_DATABASE));
+        // populate the list
+        try
+        {
+            Sequence< ::rtl::OUString > aQueries = xQueries->getElementNames();
+            const ::rtl::OUString* pQueries = aQueries.getConstArray();
+            const ::rtl::OUString* pEnd = pQueries + aQueries.getLength();
+            for (;pQueries != pEnd; ++pQueries)
+                m_aQueries.InsertEntry(*pQueries, aImage);
+
+            // due to a bug in Resize, the focus rect will have a wrong height without the following
+            Size aSizePixel = m_aQueries.GetSizePixel();
+            m_aQueries.SetSizePixel(Size(aSizePixel.Width(), aSizePixel.Height() - 1));
+            m_aQueries.SetSizePixel(aSizePixel);
+        }
+        catch(Exception& e)
+        {
+            DBG_ERROR(  ::rtl::OString("OQueryAdministrationPage::ActivatePage: something went wront while retrieving the query names (message: ")
+                    +=  ::rtl::OString(e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US)
+                    +=  ::rtl::OString(")!"));
+        }
+    }
+}
+
+//------------------------------------------------------------------------
+BOOL OQueryAdministrationPage::FillItemSet(SfxItemSet& _rCoreAttrs)
+{
+    // we haven't any items transported via this mechanism
+    return sal_False;
+}
+
 //.........................................................................
 }   // namespace dbaui
 //.........................................................................
@@ -1910,6 +2027,9 @@ IMPL_LINK( OTableSubscriptionPage, OnRadioButtonClicked, Button*, pButton )
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.26  2001/01/25 12:14:03  fs
+ *  #83192# initialization of m_sDsn corrected
+ *
  *  Revision 1.25  2001/01/04 11:21:45  fs
  *  #81485# +OAdoDetailsPage
  *
@@ -1928,64 +2048,6 @@ IMPL_LINK( OTableSubscriptionPage, OnRadioButtonClicked, Button*, pButton )
  *  Revision 1.20  2000/12/07 14:15:42  oj
  *  #81131# check installed adabas dbs
  *
- *  Revision 1.19  2000/12/01 08:06:01  kso
- *  #80644# - ::ucb::ContentCreationException -> ::com::sun::star::ucb::ContentCreationException
- *
- *  Revision 1.18  2000/11/30 08:32:30  fs
- *  #80003# changed some sal_uInt16 to sal_Int32 (need some -1's)
- *
- *  Revision 1.17  2000/11/29 22:29:40  fs
- *  #80003# implementation of the character set map changed
- *
- *  Revision 1.16  2000/11/28 13:48:15  fs
- *  #80152# m_bDisplayingDeleted -> m_bDisplayingInvalid
- *
- *  Revision 1.15  2000/11/28 11:41:42  oj
- *  #80827# check dbroot if dbconfig failed
- *
- *  Revision 1.14  2000/11/22 15:44:05  oj
- *  #80269# remove property long names
- *
- *  Revision 1.13  2000/11/10 17:35:29  fs
- *  no parameter in checkItems anymore - did not make sense in the context it is called / some small bug fixes
- *
- *  Revision 1.12  2000/11/02 15:20:04  fs
- *  #79983# +isBrowseable / #79830# +checkItems
- *
- *  Revision 1.11  2000/11/02 14:18:21  fs
- *  #79967# check the getenv return against NULL
- *
- *  Revision 1.10  2000/10/30 15:22:25  fs
- *  no password fields anymore - don't want to have them in and _data source aministration_ dialog
- *
- *  Revision 1.9  2000/10/30 13:48:29  fs
- *  some help ids
- *
- *  Revision 1.8  2000/10/24 12:11:15  fs
- *  functionality added: browsing for system data sources (ODBC/Adabas/dbase/text)
- *
- *  Revision 1.7  2000/10/20 09:53:17  fs
- *  handling for the SuppresVersionColumns property of a data source
- *
- *  Revision 1.6  2000/10/18 08:48:16  obo
- *  Syntax error with linux compiler #65293#
- *
- *  Revision 1.5  2000/10/13 16:04:22  fs
- *  Separator changed to string / getDetailIds
- *
- *  Revision 1.4  2000/10/12 16:20:42  fs
- *  new implementations ... still under construction
- *
- *  Revision 1.3  2000/10/11 11:31:02  fs
- *  new implementations - still under construction
- *
- *  Revision 1.2  2000/10/09 12:39:28  fs
- *  some (a lot of) new imlpementations - still under development
- *
- *  Revision 1.1  2000/10/05 10:04:12  fs
- *  initial checkin
- *
- *
  *  Revision 1.0 26.09.00 11:47:18  fs
  ************************************************************************/
 
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 97b5058b6240..8e6d73b2c05a 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: adminpages.hxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-04 11:21:45 $
+ *  last change: $Author: fs $ $Date: 2001-01-26 06:59:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -478,6 +478,41 @@ private:
     virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
 };
 
+//========================================================================
+//= OQueryAdministrationPage
+//========================================================================
+class OQueryAdministrationPage : public OGenericAdministrationPage
+{
+private:
+    GroupBox        m_aFrame;
+    ListBox         m_aQueries;
+    PushButton      m_aNew;
+    PushButton      m_aEdit;
+    PushButton      m_aDelete;
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+                    m_xORB;
+
+public:
+    static  SfxTabPage* Create( Window* _pParent, const SfxItemSet& _rAttrSet);
+
+    void setServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
+        { m_xORB = _rxORB; }
+
+protected:
+    OQueryAdministrationPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
+    ~OQueryAdministrationPage();
+
+    virtual void        implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+    virtual BOOL        FillItemSet(SfxItemSet& _rCoreAttrs);
+    virtual void        ActivatePage(const SfxItemSet& _rSet);
+
+protected:
+    DECL_LINK(OnNewQuery, PushButton*);
+    DECL_LINK(OnEditQuery, PushButton*);
+    DECL_LINK(OnDeleteQuery, PushButton*);
+};
+
 //.........................................................................
 }   // namespace dbaui
 //.........................................................................
@@ -487,6 +522,9 @@ private:
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.17  2001/01/04 11:21:45  fs
+ *  #81485# +OAdoDetailsPage
+ *
  *  Revision 1.16  2000/12/07 14:15:42  oj
  *  #81131# check installed adabas dbs
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 15a396ddc06e..451e540cb822 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-17 09:17:27 $
+ *  last change: $Author: fs $ $Date: 2001-01-26 06:59:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -618,6 +618,7 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent, SfxItemSet* _pItems, const Refe
     // add the initial tab pages
     AddTabPage(PAGE_GENERAL, String(ResId(STR_PAGETITLE_GENERAL)), OGeneralPage::Create, NULL);
     AddTabPage(PAGE_TABLESUBSCRIPTION, String(ResId(STR_PAGETITLE_TABLESUBSCRIPTION)), OTableSubscriptionPage::Create, NULL);
+//  AddTabPage(PAGE_QUERYADMINISTRATION, String(ResId(STR_PAGETITLE_QUERIES)), OQueryAdministrationPage::Create, NULL);
 
     // no local resources needed anymore
     FreeResource();
@@ -819,6 +820,9 @@ void ODbAdminDialog::PageCreated(USHORT _nId, SfxTabPage& _rPage)
             static_cast<OTableSubscriptionPage&>(_rPage).setServiceFactory(m_xORB);
             static_cast<OTableSubscriptionPage&>(_rPage).SetAdminDialog(this);
             break;
+        case PAGE_QUERYADMINISTRATION:
+            static_cast<OQueryAdministrationPage&>(_rPage).setServiceFactory(m_xORB);
+            break;
     }
 
     SfxTabDialog::PageCreated(_nId, _rPage);
@@ -1160,6 +1164,7 @@ void ODbAdminDialog::resetPages(const Reference< XPropertySet >& _rxDatasource,
     }
     // remove the table/query tab pages
     RemoveTabPage(PAGE_TABLESUBSCRIPTION);
+//  RemoveTabPage(PAGE_QUERYADMINISTRATION);
 
     // extract all relevant data from the property set of the data source
     translateProperties(_rxDatasource, *GetInputSetImpl());
@@ -1183,6 +1188,7 @@ void ODbAdminDialog::resetPages(const Reference< XPropertySet >& _rxDatasource,
     {
         OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
         AddTabPage(PAGE_TABLESUBSCRIPTION, String(ResId(STR_PAGETITLE_TABLESUBSCRIPTION)), OTableSubscriptionPage::Create, NULL);
+//      AddTabPage(PAGE_QUERYADMINISTRATION, String(ResId(STR_PAGETITLE_QUERIES)), OQueryAdministrationPage::Create, NULL);
     }
 
     m_bResetting = sal_True;
@@ -2223,6 +2229,9 @@ IMPL_LINK(ODatasourceSelector, OnButtonPressed, Button*, EMPTYARG)
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.29  2001/01/17 09:17:27  fs
+ *  #82627# implApplyChanges: do an ShowPage after applying the changes
+ *
  *  Revision 1.28  2001/01/04 11:23:01  fs
  *  #81485# +ADO page
  *
@@ -2247,67 +2256,6 @@ IMPL_LINK(ODatasourceSelector, OnButtonPressed, Button*, EMPTYARG)
  *  Revision 1.21  2000/11/28 11:41:42  oj
  *  #80827# check dbroot if dbconfig failed
  *
- *  Revision 1.20  2000/11/23 09:03:58  oj
- *  #80558# don't show delete when no datasource exist
- *
- *  Revision 1.19  2000/11/21 15:00:54  oj
- *  #80549# wrong dsn for text
- *
- *  Revision 1.18  2000/11/10 17:36:53  fs
- *  small bug fixes
- *
- *  Revision 1.17  2000/11/10 16:28:02  fs
- *  #80185# implApplyChanges: reset some meta-data-items
- *
- *  Revision 1.16  2000/11/03 09:15:07  fs
- *  #79998# SetSavePasswordText
- *
- *  Revision 1.15  2000/10/31 08:03:35  fs
- *  +selectDataSource - supporting an initial selecting when creating as service
- *
- *  Revision 1.14  2000/10/30 15:24:02  fs
- *  getCurrent...: add user property value if not empty only
- *
- *  Revision 1.13  2000/10/30 13:00:37  fs
- *  #79823# ODatasourceSelector: +(WB_TABSTOP | WB_DIALOGCONTROL)
- *
- *  Revision 1.12  2000/10/30 11:04:13  fs
- *  #79868# disable the Reset button when selecting deleted data sources
- *
- *  Revision 1.11  2000/10/30 08:01:04  fs
- *  getCurrentSettings: no password dialog if the current data source type does not need authentication
- *
- *  Revision 1.10  2000/10/26 15:02:16  oj
- *  localstrings for dll
- *
- *  Revision 1.9  2000/10/26 07:31:30  fs
- *  introduced fillDatasourceInfo, with this now getCurrentSettings collects _all_ relevant properties
- *
- *  Revision 1.8  2000/10/24 12:12:26  fs
- *  ODatasourceMap::update takes a non-constant set (to reset the ORIGINALNAME item)
- *
- *  Revision 1.7  2000/10/23 12:56:50  fs
- *  added apply functionality
- *
- *  Revision 1.6  2000/10/20 09:53:17  fs
- *  handling for the SuppresVersionColumns property of a data source
- *
- *  Revision 1.5  2000/10/13 16:06:20  fs
- *  implemented the usage if the 'Info' property of the data sources / allow key usage in the data source list
- *
- *  Revision 1.4  2000/10/12 16:20:42  fs
- *  new implementations ... still under construction
- *
- *  Revision 1.3  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.2  2000/10/09 12:39:29  fs
- *  some (a lot of) new imlpementations - still under development
- *
- *  Revision 1.1  2000/10/05 10:04:31  fs
- *  initial checkin
- *
- *
  *  Revision 1.0 20.09.00 10:55:58  fs
  ************************************************************************/
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index 7d10e95e7ced..4baa5843d179 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.hrc,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-04 11:22:06 $
+ *  last change: $Author: fs $ $Date: 2001-01-26 06:59:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,7 @@
 #define LB_DATASOURCES          2
 #define LB_CHARSET              3
 #define LB_TIMEOUT_UNIT         4
+#define LB_QUERIES              5
 
 #define ET_CONNECTURL           1
 #define ET_DATASOURCENAME       2
@@ -99,10 +100,14 @@
 #define PB_INDICIES             2
 #define PB_ADDALLTABLES         3
 #define PB_NEW_DATASOURCE       4
+#define PB_NEWQUERY             5
+#define PB_EDITQUERY            6
+#define PB_DELETEQUERY          7
 
 #define GB_CONNECTION           1
 #define GB_DBASE_MAIN           2
 #define GB_TABLESUBSCRIPTION    3
+#define GB_QUERIES              4
 
 #define CB_PASSWORD_REQUIRED    1
 #define CB_SHOWDELETEDROWS      2
@@ -147,6 +152,7 @@
 #define STR_COULDNOTLOAD_ODBCLIB            15
 #define STR_NO_ADABASE_DATASOURCES          16
 #define STR_PAGETITLE_ADO                   17
+#define STR_PAGETITLE_QUERIES               18
 
 //========================================================================
 // menu item ids
@@ -159,6 +165,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.9  2001/01/04 11:22:06  fs
+ *  #81485# +STR_PAGETITLE_ADO
+ *
  *  Revision 1.8  2000/11/22 15:44:05  oj
  *  #80269# remove property long names
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 033b8300671f..adaf5595ee82 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: fs $ $Date: 2001-01-04 11:22:36 $
+ *  last change: $Author: fs $ $Date: 2001-01-26 06:59:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -323,6 +323,12 @@ TabDialog DLG_DATABASE_ADMINISTRATION
         Text[ turkish ] = "Tablolar";
         Text[ arabic ] = "�����";
     };
+    String STR_PAGETITLE_QUERIES
+    {
+        Text = "Abfragen" ;
+        Text [ ENGLISH ] = "Queries" ;
+        Text [ english_us ] = "Queries" ;
+    };
     Text[ portuguese ] = "Gerir fontes de dados";
     Text[ russian ] = "���������� ���������� ������";
     Text[ greek ] = "���������� ���������� ���������";
@@ -1758,11 +1764,72 @@ TabPage PAGE_TABLESUBSCRIPTION
     };
 };
 
+//.........................................................................
+TabPage PAGE_QUERYADMINISTRATION
+{
+    SVLook = TRUE ;
+    Hide = TRUE;
+    Pos = MAP_APPFONT ( 0 , 0 ) ;
+    Size = MAP_APPFONT ( 260 , 135 ) ;
+    HelpId = HID_DSADMIN_QUERYADMINISTRATION;
+
+    GroupBox GB_QUERIES
+    {
+        Pos = MAP_APPFONT ( 6 , 3 ) ;
+        Size = MAP_APPFONT ( 192 , 126 ) ;
+        Text = "Abfragen";
+        Text [ english ] = "Queries";
+        Text [ english_us ] = "Queries";
+    };
+    ListBox LB_QUERIES
+    {
+        Pos = MAP_APPFONT ( 12 , 14 ) ;
+        Size = MAP_APPFONT ( 180 , 109 ) ;
+        Border = TRUE;
+        SVLook = TRUE;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_QUERIES;
+    };
+    PushButton PB_NEWQUERY
+    {
+        Pos = MAP_APPFONT ( 204, 6 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+        SVLook = TRUE;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_QUERIES_NEW;
+        Text = "~Neu";
+        Text[ english ] = "~New";
+        Text[ english_us ] = "~New";
+    };
+    PushButton PB_EDITQUERY
+    {
+        Pos = MAP_APPFONT ( 204, 23 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+        SVLook = TRUE;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_QUERIES_EDIT;
+        Text = "~Bearbeiten";
+        Text[ english ] = "~Edit";
+        Text[ english_us ] = "~Edit";
+    };
+    PushButton PB_DELETEQUERY
+    {
+        Pos = MAP_APPFONT ( 204, 40 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+        SVLook = TRUE;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_QUERIES_DELETE;
+        Text = "~L�schen";
+        Text[ english ] = "~Delete";
+        Text[ english_us ] = "~Delete";
+    };
+};
+
 
 WarningBox ERR_NOREGISTEREDDATASOURCES
 {
     Message = "Es sind augenblicklich keine Datenquellen registriert.";
-    Message [ english ] = "Currently, there are no registered data sources.";
+    Message [ english ] = "There are no registered data sources, at present.";
     Message [ english_us ] = "There are no registered data sources, at present.";
     Message[ portuguese ] = "De momento, n�o h� fontes de dados registadas.";
     Message[ russian ] = "� ������ ������ �������� ������ �� ���������������.";
@@ -1961,73 +2028,15 @@ Menu MENU_DATASOURCELIST_POPUP
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.23  2001/01/04 11:22:36  fs
+ *  #81485# +ADO page
+ *
  *  Revision 1.22  2000/12/14 08:52:10  fs
  *  #81845# +HID_DSADMIN_SPECIAL_MESSAGE
  *
  *  Revision 1.21  2000/12/11 16:32:49  fs
  *  broaded the data source list
  *
- *  Revision 1.20  2000/12/06 15:13:35  rt
- *  Merge SRC614: 06.12.00 - 16:13:06
- *
- *  Revision 1.19  2000/12/05 15:58:43  fs
- *  #79820# HID_DSADMIN_DIALOG
- *
- *  Revision 1.18  2000/12/05 12:48:48  fs
- *  #80539# removed two obsolete ids
- *
- *  Revision 1.17  2000/12/03 10:30:16  fs
- *  #79820# some new help ids
- *
- *  Revision 1.16  2000/12/01 08:08:42  kz
- *  Merge SRC614: 01.12.00 - 09:07:46
- *
- *  Revision 1.15  2000/11/22 15:44:40  oj
- *  #80269# remove property long names
- *
- *  Revision 1.14  2000/11/15 21:09:13  kz
- *  Merge SRC613: 11/15/00 - 22:08:39 (NoBranch)
- *
- *  Revision 1.13  2000/11/10 17:42:46  fs
- *  +STR_NO_ADABASE_DATASOURCES
- *
- *  Revision 1.12  2000/11/09 12:29:24  kz
- *  Merge SRC612: 09.11.00 - 13:28:47 (NoBranch)
- *
- *  Revision 1.11  2000/11/02 15:20:15  fs
- *  #79380# +STR_ERR_EMPTY_DSN_NAME
- *
- *  Revision 1.10  2000/10/30 15:24:19  fs
- *  no password fields anymore - don't want to have them in and _data source aministration_ dialog
- *
- *  Revision 1.9  2000/10/30 13:48:17  fs
- *  #79820# some help ids
- *
- *  Revision 1.8  2000/10/30 13:01:23  fs
- *  #79823# minor changes
- *
- *  Revision 1.7  2000/10/26 18:19:35  fs
- *  BMP_DATABASE* -> IMG_DATABASE*
- *
- *  Revision 1.6  2000/10/24 12:11:15  fs
- *  functionality added: browsing for system data sources (ODBC/Adabas/dbase/text)
- *
- *  Revision 1.5  2000/10/20 09:53:17  fs
- *  handling for the SuppresVersionColumns property of a data source
- *
- *  Revision 1.4  2000/10/12 16:20:42  fs
- *  new implementations ... still under construction
- *
- *  Revision 1.3  2000/10/11 11:31:03  fs
- *  new implementations - still under construction
- *
- *  Revision 1.2  2000/10/09 12:39:29  fs
- *  some (a lot of) new imlpementations - still under development
- *
- *  Revision 1.1  2000/10/05 10:05:05  fs
- *  initial checkin
- *
- *
  *  Revision 1.0 20.09.00 10:58:47  fs
  ************************************************************************/