INTEGRATION: CWS dba12 (1.34.70); FILE MERGED

2004/05/14 07:58:12 fs 1.34.70.3: #i29153# 'auto pilot' renamed to 'wizard'
2004/04/27 07:37:17 fs 1.34.70.2: #i12378# also allow for queries to be the form's data source
2004/04/27 07:35:11 fs 1.34.70.1: #i12378# also allow for queries to be the form's data source

1 files changed, 30 insertions, 206 deletions

diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src
index ac1cef809a20..a87116c0d5e2 100644
--- a/extensions/source/dbpilots/commonpagesdbp.src
+++ b/extensions/source/dbpilots/commonpagesdbp.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: commonpagesdbp.src,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: hjs $ $Date: 2004-06-25 11:23:39 $
+ *  last change: $Author: hjs $ $Date: 2004-06-28 17:21:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,8 +110,8 @@ TabPage RID_PAGE_TABLESELECTION
         Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 46 ) ;
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 14 , 8) ;
         Group = TRUE;
-        Text [ de ] = "~Tabelle:";
-        Text [ en-US ] = "~Table:";
+        Text [ de ] = "~Tabelle / Abfrage:";
+        Text [ en-US ] = "~Table / Query:";
     };
     ListBox LB_TABLE
     {
@@ -119,8 +119,34 @@ TabPage RID_PAGE_TABLESELECTION
         Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y - 6 - 57 ) ;
         SVLook = TRUE ;
         Border = TRUE ;
+        Sort = TRUE;
         AutoHScroll = TRUE ;
     };
+
+    Image IMG_TABLE
+    {
+        ImageBitmap = Bitmap { File = "sx03188.bmp"; };
+        MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+    };
+
+    Image IMG_TABLE_HC
+    {
+        ImageBitmap = Bitmap { File = "sxh03188.bmp"; };
+        MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+    };
+
+    Image IMG_QUERY
+    {
+        ImageBitmap = Bitmap { File = "sx03202.bmp"; };
+        MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+    };
+
+    Image IMG_QUERY_HC
+    {
+        ImageBitmap = Bitmap { File = "sxh03202.bmp"; };
+        MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+    };
+
 };
 
 TabPage RID_PAGE_OPTION_DBFIELD
@@ -245,205 +271,3 @@ String RID_STR_TYPE_COMMAND
     Text [ en-US ] = "SQL command";
 };
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.33.34.4  2004/04/28 18:23:44  hjs
- *  #i8252# fix unmerge probs
- *
- *  Revision 1.33.34.3  2004/04/20 18:42:13  hjs
- *  RESYNC: (1.33-1.34); FILE MERGED
- *
- *  Revision 1.34  2003/12/17 18:17:32  vg
- *  INTEGRATION: CWS geordi2q11 (1.33.90); FILE MERGED
- *  2003/12/16 11:43:23 hr 1.33.90.1: #111934#: join CWS ooo111fix1
- *
- *  Revision 1.33.90.1  2003/12/16 11:43:23  hr
- *  #111934#: join CWS ooo111fix1
- *
- *  Revision 1.33.44.1  2003/11/24 13:32:08  ihi
- *  OOo 1.1.1 merge
- *
- *  Revision 1.33  2003/07/17 12:35:22  hr
- *  INTEGRATION: CWS mergerc3 (1.32.6); FILE MERGED
- *  2003/07/16 17:08:00 ihi 1.32.6.1: rc-3 merge all languages
- *
- *  Revision 1.32.6.1  2003/07/16 17:08:00  ihi
- *  rc-3 merge all languages
- *
- *  Revision 1.32  2003/07/03 17:27:50  hr
- *  INTEGRATION: CWS rc2merge (1.31.8); FILE MERGED
- *  2003/07/03 14:40:42 ihi 1.31.8.1: rc-2 merge all languages
- *
- *  Revision 1.31.8.1  2003/07/03 14:40:42  ihi
- *  rc-2 merge all languages
- *
- *  Revision 1.31  2003/06/13 12:47:12  hr
- *  INTEGRATION: CWS rcmerge (1.30.26); FILE MERGED
- *  2003/06/12 11:09:52 gh 1.30.26.1: final Merge RC
- *
- *  Revision 1.30.26.1  2003/06/12 11:09:52  gh
- *  final Merge RC
- *
- *  Revision 1.30  2003/04/29 17:44:22  hr
- *  INTEGRATION: CWS mergem8 (1.20.2.8.4.4.2.1.26); FILE MERGED
- *  2003/04/29 08:35:39 gh 1.20.2.8.4.4.2.1.26.3: final merge for Beta2
- *  2003/04/16 18:57:44 gh 1.20.2.8.4.4.2.1.26.2: RESYNC: (1.20.2.8.4.4.2.1-1.29); FILE MERGED
- *  2003/04/14 14:46:26 gh 1.20.2.8.4.4.2.1.26.1: merging all languages
- *
- *  Revision 1.20.2.8.4.4.2.1.26.3  2003/04/29 08:35:39  gh
- *  final merge for Beta2
- *
- *  Revision 1.20.2.8.4.4.2.1.26.2  2003/04/16 18:57:44  gh
- *  RESYNC: (1.20.2.8.4.4.2.1-1.29); FILE MERGED
- *
- *  Revision 1.20.2.8.4.4.2.1.26.1  2003/04/14 14:46:26  gh
- *  merging all languages
- *
- *  Revision 1.29  2003/03/25 16:03:26  hr
- *  MWS_SRX644: migrate branch mws_srx644 -> HEAD
- *
- *  Revision 1.20.2.8.4.4.2.1  2003/02/22 16:36:12  hr
- *  INTEGRATION: CWS mergep (1.20.2.8.4.4.20); FILE MERGED
- *  2003/02/22 10:35:02 nf 1.20.2.8.4.4.20.2: #107113# localization of StarOffice 6.1 Beta/OpenOffice.org 1.1 Beta. Represents content of translation database of 02/21/2003. Translation up to date for SUN big rules languages
- *  2003/01/31 12:52:34 hjs 1.20.2.8.4.4.20.1: #107113# merge on SRX644p
- *
- *  Revision 1.20.2.8.4.4.20.2  2003/02/22 10:35:02  nf
- *  #107113# localization of StarOffice 6.1 Beta/OpenOffice.org 1.1 Beta. Represents content of translation database of 02/21/2003. Translation up to date for SUN big rules languages
- *
- *  Revision 1.20.2.8.4.4.20.1  2003/01/31 12:52:34  hjs
- *  #107113# merge on SRX644p
- *
- *  Revision 1.20.2.8.4.4  2002/11/27 16:58:54  kz
- *  Merge SRX644: 27.11.02 - 17:54:59
- *
- *  Revision 1.20.2.8.4.3  2002/08/02 20:26:03  kz
- *  Merge SRX643: 02.08.02 - 22:22:55
- *
- *  Revision 1.20.2.8.4.2  2002/05/16 14:36:44  kz
- *  Merge SRX642: 16.05.02 - 16:36:29
- *
- *  Revision 1.20.2.8.4.1  2002/04/29 20:25:05  rt
- *  Merge SRX642: 29.04.02 - 22:24:32
- *
- *  Revision 1.20.2.8  2001/11/22 23:35:36  rt
- *  Merge SRC641: 22.11.01 - 23:34:24
- *
- *  Revision 1.20.2.7  2001/11/13 23:02:02  kz
- *  Merge SRC641: 11/13/01 - 23:02:50
- *
- *  Revision 1.20.2.6  2001/10/31 21:52:44  kz
- *  Merge SRC641: 31.10.01 - 22:52:51
- *
- *  Revision 1.20.2.5  2001/10/19 21:49:28  vg
- *  Merge SRC641: 19.10.01 - 23:49:46
- *
- *  Revision 1.20.2.4  2001/10/17 21:16:23  kz
- *  Merge SRC641: 17.10.01 - 23:16:00
- *
- *  Revision 1.20.2.3  2001/10/11 21:00:54  rt
- *  Merge SRC641: 11.10.01 - 23:00:05
- *
- *  Revision 1.20.2.2  2001/09/27 20:34:30  kz
- *  Merge SRC641: 27.09.01 - 22:33:38
- *
- *  Revision 1.20.2.1  2001/09/24 20:33:01  kz
- *  Merge SRC641: 09/24/01 - 22:32:35
- *
- *  Revision 1.20  2001/08/07 15:05:41  kz
- *  Merge SRC638: 07.08.01 - 17:05:12
- *
- *  Revision 1.19  2001/07/24 20:33:12  kz
- *  Merge SRC638: 24.07.01 - 22:32:44
- *
- *  Revision 1.18  2001/07/13 21:02:10  kz
- *  Merge SRC638: 13.07.01 - 23:01:19
- *
- *  Revision 1.17  2001/07/04 14:27:07  kz
- *  Merge SRC633: 04.07.01 - 16:27:03
- *
- *  Revision 1.16  2001/07/03 22:22:29  kz
- *  Merge SRC633: 04.07.01 - 00:21:22
- *
- *  Revision 1.15  2001/06/13 22:42:37  kz
- *  Merge SRC633: 06/14/01 - 00:41:56
- *
- *  Revision 1.14  2001/06/08 22:23:23  vg
- *  Merge SRC633: 09.06.01 - 00:22:50
- *
- *  Revision 1.13  2001/05/30 16:50:26  fs
- *  #86714# new controls for displaying the form data source
- *
- *  Revision 1.12  2001/05/17 07:42:30  kz
- *  Merge SRC632: 17.05.01 - 09:42:46 (NoBranch)
- *
- *  Revision 1.11  2001/05/12 06:49:53  rt
- *  Merge SRC631: 12.05.01 - 08:50:12 (NoBranch)
- *
- *  Revision 1.10  2001/05/10 06:03:16  kz
- *  Merge SRC631: 05/10/01 - 08:03:24 (NoBranch)
- *
- *  Revision 1.9  2001/05/04 20:10:15  kz
- *  Merge SRC630: 05/04/01 - 22:10:11 (NoBranch)
- *
- *  Revision 1.8  2001/04/26 19:50:58  kz
- *  Merge SRC630: 26.04.01 - 21:50:26 (NoBranch)
- *
- *  Revision 1.7  2001/03/29 13:51:52  fs
- *  #85477# layout changes
- *
- *  Revision 1.6  2001/03/21 20:29:12  kz
- *  Merge SRC626: 21.03.01 - 21:29:27 (NoBranch)
- *
- *  Revision 1.5  2001/03/19 11:40:39  kz
- *  Merge SRC625: 19.03.01 - 12:40:34 (NoBranch)
- *
- *  Revision 1.4  2001/03/09 20:46:34  kz
- *  Merge SRC624: 09.03.01 - 21:46:40 (NoBranch)
- *
- *  Revision 1.3  2001/02/28 09:18:30  fs
- *  finalized the list/combo wizard
- *
- *  Revision 1.2  2001/02/23 15:19:08  fs
- *  some changes / centralizations - added the list-/combobox wizard
- *
- *  Revision 1.1  2001/02/21 09:21:55  fs
- *  initial checkin - form control auto pilots
- *
- *
- *  Revision 1.0 14.02.01 11:05:25  fs
- ************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-