summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extensions/source/dbpilots/dbpresid.hrc8
-rw-r--r--extensions/source/dbpilots/listcombopages.src29
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx8
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx8
4 files changed, 38 insertions, 15 deletions
diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc
index 05a2015ba..5e9228dea 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: dbpresid.hrc,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: fs $ $Date: 2001-03-21 16:09:15 $
+ * last change: $Author: fs $ $Date: 2001-03-30 13:15:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -177,6 +177,7 @@
#define FT_EXPLANATION 18
#define FT_EXISTING_FIELDS 19
#define FT_SELECTED_FIELDS 20
+#define FT_FIELDLINK_DESC 21
//........................................................................
// ListBox
@@ -249,6 +250,9 @@
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.5 2001/03/21 16:09:15 fs
+ * #85215# use a resource id range which is unique within the whole module
+ *
* Revision 1.4 2001/03/05 14:53:13 fs
* finished the grid control wizard
*
diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src
index de6b3097f..5bfec3dfe 100644
--- a/extensions/source/dbpilots/listcombopages.src
+++ b/extensions/source/dbpilots/listcombopages.src
@@ -2,9 +2,9 @@
*
* $RCSfile: listcombopages.src,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: kz $ $Date: 2001-03-21 20:33:32 $
+ * last change: $Author: fs $ $Date: 2001-03-30 13:15:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -331,14 +331,22 @@ TabPage RID_PAGE_LCW_FIELDLINK
Text [ korean ] = "ÇÊµå ¿¬°á";
Text [ turkish ] = "Alan baðlantýsý";
+ FixedText FT_FIELDLINK_DESC
+ {
+ Pos = MAP_APPFONT ( 7 , 6 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 14 , 16 ) ;
+ Text = "Wählen Sie hier die Felder aus, deren Inhalt übereinstimmen muß, damit der Wert aus dem Anzeigefeld angezeigt wird.";
+ Text [ english ] = "Here, choose the fields which's contents must equal to show the value in the display field.";
+ Text [ english_us ] = "Here, choose the fields which's contents must equal to show the value in the display field.";
+ };
FixedLine FL_FRAME
{
- Pos = MAP_APPFONT ( 4 , 3 ) ;
+ Pos = MAP_APPFONT ( 4 , 25 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
};
FixedText FT_VALUELISTFIELD
{
- Pos = MAP_APPFONT ( 7 , 15 ) ;
+ Pos = MAP_APPFONT ( 7 , 37 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 8 ) ;
Group = TRUE;
Text = "Feld aus der ~Wertetabelle";
@@ -366,8 +374,8 @@ TabPage RID_PAGE_LCW_FIELDLINK
};
ComboBox CMB_VALUELISTFIELD
{
- Pos = MAP_APPFONT ( 7 , 26 ) ;
- Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 32 ) ;
+ Pos = MAP_APPFONT ( 7 , 48 ) ;
+ Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ;
SVLook = TRUE ;
Border = TRUE ;
DropDown = FALSE;
@@ -376,7 +384,7 @@ TabPage RID_PAGE_LCW_FIELDLINK
};
FixedText FT_TABLEFIELD
{
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 15 ) ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 37 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 8 ) ;
Group = TRUE;
Text = "Feld aus der ~Listentabelle";
@@ -404,8 +412,8 @@ TabPage RID_PAGE_LCW_FIELDLINK
};
ComboBox CMB_TABLEFIELD
{
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ;
- Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 32 ) ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 48 ) ;
+ Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 54 ) ;
SVLook = TRUE ;
Border = TRUE ;
DropDown = FALSE;
@@ -443,6 +451,9 @@ String RID_STR_COMBOWIZ_DBFIELD
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.6 2001/03/21 20:33:32 kz
+ * Merge SRC626: 21.03.01 - 21:33:27 (NoBranch)
+ *
* Revision 1.5 2001/03/19 11:49:09 kz
* Merge SRC625: 19.03.01 - 12:49:04 (NoBranch)
*
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 7c9d18927..f36b084e8 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: listcombowizard.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: fs $ $Date: 2001-03-21 16:28:28 $
+ * last change: $Author: fs $ $Date: 2001-03-30 13:15:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -502,6 +502,7 @@ namespace dbp
//---------------------------------------------------------------------
OLinkFieldsPage::OLinkFieldsPage( OListComboWizard* _pParent )
:OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_FIELDLINK))
+ ,m_aDescription (this, ResId(FT_FIELDLINK_DESC))
,m_aFrame (this, ResId(FL_FRAME))
,m_aValueListFieldLabel (this, ResId(FT_VALUELISTFIELD))
,m_aValueListField (this, ResId(CMB_VALUELISTFIELD))
@@ -611,6 +612,9 @@ namespace dbp
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.5 2001/03/21 16:28:28 fs
+ * #85234# by default, create a drop down control
+ *
* Revision 1.4 2001/03/20 15:45:51 fs
* #85200# added missing help ids
*
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index d78fea236..7194c8ca6 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: listcombowizard.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fs $ $Date: 2001-03-05 14:53:13 $
+ * last change: $Author: fs $ $Date: 2001-03-30 13:15:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -211,6 +211,7 @@ namespace dbp
class OLinkFieldsPage : public OLCPage
{
protected:
+ FixedText m_aDescription;
FixedLine m_aFrame;
FixedText m_aValueListFieldLabel;
ComboBox m_aValueListField;
@@ -266,6 +267,9 @@ namespace dbp
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
+ * Revision 1.3 2001/03/05 14:53:13 fs
+ * finished the grid control wizard
+ *
* Revision 1.2 2001/02/28 09:18:30 fs
* finalized the list/combo wizard
*
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 11:32:26 +0000