#97666##97667# insert new helpids and unique ids

4 files changed, 44 insertions, 15 deletions

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 17983f24e195..f34b6b67d67a 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbaccess_helpid.hrc,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 09:01:50 $
+ *  last change: $Author: oj $ $Date: 2002-02-27 10:20:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -303,6 +303,20 @@
 
 #define HID_QUERY_EDIT_JOINCONNECTION               (HID_DBACCESS_START + 211)
 
+#define HID_DLG_QRY_WINDOW_CONTROL                  (HID_DBACCESS_START + 212)
+#define HID_DLG_QRY_LEFT_TABLE                      (HID_DBACCESS_START + 213)
+#define HID_DLG_QRY_RIGHT_TABLE                     (HID_DBACCESS_START + 214)
+
+#define HID_DLG_REL_CASC_DEL                        (HID_DBACCESS_START + 215)
+#define HID_DLG_REL_NO_CASC_DEL                     (HID_DBACCESS_START + 216)
+#define HID_DLG_REL_CASC_DEL_NULL                   (HID_DBACCESS_START + 217)
+#define HID_DLG_REL_CASC_DEL_DEFAULT                (HID_DBACCESS_START + 218)
+
+#define HID_DLG_REL_CASC_UPD                        (HID_DBACCESS_START + 219)
+#define HID_DLG_REL_NO_CASC_UPD                     (HID_DBACCESS_START + 220)
+#define HID_DLG_REL_CASC_UPD_NULL                   (HID_DBACCESS_START + 221)
+#define HID_DLG_REL_CASC_UPD_DEFAULT                (HID_DBACCESS_START + 222)
+
 // don't forget to update the file util/hidother.src
 
 
@@ -312,6 +326,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.45  2002/02/06 09:01:50  oj
+ *  #90580# introduce new file for relation control
+ *
  *  Revision 1.44  2001/09/25 13:28:23  oj
  *  #91719# implementing the XRename handling
  *
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index 900fb909ae59..8cf1c50426cd 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -1,6 +1,6 @@
  //--------------------------------------------------------------------------
  //
- // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.22 2002-02-06 08:43:11 oj Exp $
+ // $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/dbaccess/source/ui/dlg/RelationDlg.src,v 1.23 2002-02-27 10:16:25 oj Exp $
  //
  // (c) Copyright 1997 by Star Division GmbH, Hamburg.
  //
@@ -8,7 +8,7 @@
  //  AWO
  //
  // Letzte Aenderung:
- //  $Author: oj $ $Date: 2002-02-06 08:43:11 $ $Revision: 1.22 $
+ //  $Author: oj $ $Date: 2002-02-27 10:16:25 $ $Revision: 1.23 $
  //
  //--------------------------------------------------------------------------
 #ifndef DBAUI_RELATIONDIALOG_HRC
@@ -17,6 +17,7 @@
 #ifndef _DBU_RESOURCE_HRC_
 #include "dbu_resource.hrc"
 #endif
+#include "dbaccess_helpid.hrc"
 
 
 ModalDialog DLG_REL_PROPERTIES
@@ -36,6 +37,7 @@ ModalDialog DLG_REL_PROPERTIES
         Pos = MAP_APPFONT( 0, 0 );
         Size = MAP_APPFONT( 186, 113 );
         DialogControl = TRUE;
+        HelpId        = HID_DLG_QRY_WINDOW_CONTROL ;
 
         FixedLine FL_INVOLVED_TABLES
         {
@@ -70,6 +72,7 @@ ModalDialog DLG_REL_PROPERTIES
             Border = TRUE;
             Pos = MAP_APPFONT( 12, 14 );
             Size = MAP_APPFONT( 78, 60 );
+            HelpId   = HID_DLG_QRY_LEFT_TABLE ;
             DropDown = TRUE;
             TabStop = TRUE;
         };
@@ -79,6 +82,7 @@ ModalDialog DLG_REL_PROPERTIES
             Border = TRUE;
             Pos = MAP_APPFONT( 96, 14 );
             Size = MAP_APPFONT( 78, 60 );
+            HelpId   = HID_DLG_QRY_RIGHT_TABLE ;
             DropDown = TRUE;
             TabStop = TRUE;
         };
@@ -148,6 +152,7 @@ ModalDialog DLG_REL_PROPERTIES
         Pos = MAP_APPFONT ( 12 , 125 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
         TabStop = TRUE ;
+        HelpId  = HID_DLG_REL_NO_CASC_UPD;
         Text = "~Keine Aktion" ;
         Text [ English ] = "No action" ;
         Text [ portuguese ] = "~Nenhuma acção" ;
@@ -176,6 +181,7 @@ ModalDialog DLG_REL_PROPERTIES
     {
         Pos = MAP_APPFONT ( 12 , 139 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
+        HelpId  = HID_DLG_REL_CASC_UPD ;
         Text = "K~ask. Update" ;
         Text [ English ] = "Cascading update" ;
         Text [ portuguese ] = "Actualizar ~cascata" ;
@@ -204,6 +210,7 @@ ModalDialog DLG_REL_PROPERTIES
     {
         Pos = MAP_APPFONT ( 12 , 153 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
+        HelpId  = HID_DLG_REL_CASC_UPD_NULL ;
         Text = "~Null setzen" ;
         Text [ English ] = "Set null" ;
         Text [ portuguese ] = "Definir ~Null" ;
@@ -232,6 +239,7 @@ ModalDialog DLG_REL_PROPERTIES
     {
         Pos = MAP_APPFONT ( 12 , 167 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
+        HelpId  = HID_DLG_REL_CASC_UPD_DEFAULT ;
         Text = "~Default setzen" ;
         Text [ English ] = "Set default" ;
         Text [ portuguese ] = "Definir ~padrão" ;
@@ -290,6 +298,7 @@ ModalDialog DLG_REL_PROPERTIES
         Pos = MAP_APPFONT ( 102 , 125 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
         TabStop = TRUE ;
+        HelpId  = HID_DLG_REL_NO_CASC_DEL ;
         Text = "K~eine Aktion" ;
         Text [ English ] = "No action" ;
         Text [ portuguese ] = "N~enhuma acção" ;
@@ -318,6 +327,7 @@ ModalDialog DLG_REL_PROPERTIES
     {
         Pos = MAP_APPFONT ( 102 , 139 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
+        HelpId  = HID_DLG_REL_CASC_DEL ;
         Text = "Ka~sk. Löschen" ;
         Text [ English ] = "Cascading delete" ;
         Text [ portuguese ] = "Eli~minar cascata" ;
@@ -346,6 +356,7 @@ ModalDialog DLG_REL_PROPERTIES
     {
         Pos = MAP_APPFONT ( 102 , 153 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
+        HelpId  = HID_DLG_REL_CASC_DEL_NULL ;
         Text = "Nu~ll setzen" ;
         Text [ English ] = "Set null" ;
         Text [ portuguese ] = "Definir ~Null" ;
@@ -374,6 +385,7 @@ ModalDialog DLG_REL_PROPERTIES
     {
         Pos = MAP_APPFONT ( 102 , 167 ) ;
         Size = MAP_APPFONT ( 72 , 10 ) ;
+        HelpId  = HID_DLG_REL_CASC_DEL_DEFAULT ;
         Text = "De~fault setzen" ;
         Text [ English ] = "Set default" ;
         Text [ portuguese ] = "Definir ~padrão" ;
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index d24bd43eaa3e..f8e5159fbe92 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querydlg.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 07:45:42 $
+ *  last change: $Author: oj $ $Date: 2002-02-27 10:15:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,6 @@
 #include <vcl/lstbox.hxx>
 #endif
 
-#ifndef _SVEDIT_HXX //autogen
-#include <svtools/svmedit.hxx>
-#endif
 #ifndef DBAUI_ENUMTYPES_HXX
 #include "QEnumTypes.hxx"
 #endif
@@ -101,7 +98,7 @@ namespace dbaui
         FixedLine               aFL_Join;
         FixedText               aFT_Title;
         ListBox                 aLB_JoinType;
-        MultiLineEdit           aML_HelpText;
+        FixedText               aML_HelpText;
         OKButton                aPB_OK;
         CancelButton            aPB_CANCEL;
         HelpButton              aPB_HELP;
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 54d325c70159..307efe9a7357 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querydlg.src,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 07:45:42 $
+ *  last change: $Author: oj $ $Date: 2002-02-27 10:15:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,7 @@ ModalDialog DLG_QRY_JOIN
         Pos = MAP_APPFONT( 0, 0 );
         Size = MAP_APPFONT( 203, 113 );
         DialogControl = TRUE;
+        HelpId        = HID_DLG_QRY_WINDOW_CONTROL ;
 
         FixedLine FL_INVOLVED_TABLES
         {
@@ -117,6 +118,7 @@ ModalDialog DLG_QRY_JOIN
             Border = TRUE;
             Pos = MAP_APPFONT( 12, 14 );
             Size = MAP_APPFONT( 87, 60 );
+            HelpId        = HID_DLG_QRY_LEFT_TABLE ;
             DropDown = TRUE;
             TabStop = TRUE;
         };
@@ -126,6 +128,7 @@ ModalDialog DLG_QRY_JOIN
             Border = TRUE;
             Pos = MAP_APPFONT( 104, 14 );
             Size = MAP_APPFONT( 87, 60 );
+            HelpId        = HID_DLG_QRY_RIGHT_TABLE ;
             DropDown = TRUE;
             TabStop = TRUE;
         };
@@ -223,13 +226,13 @@ ModalDialog DLG_QRY_JOIN
         DDExtraWidth    = TRUE;
     };
 
-    MultiLineEdit ML_HELPTEXT
+    FixedText ML_HELPTEXT
     {
         Pos             = MAP_APPFONT ( 12 , 145 ) ;
         Size            = MAP_APPFONT ( 179 , 49 ) ;
-        HelpId          = HID_DLG_QRY_HELPTEXT ;
-        ReadOnly        = TRUE;
+        UniqueId        = HID_DLG_QRY_HELPTEXT ;
         SVLook          = TRUE;
+        WordBreak       = TRUE;
     };
 
     OKButton PB_OK