Update of /cvsroot/xinity/XinityBASE/material/forms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12597/material/forms
Modified Files:
AdressEditDetail_Company.xml AdressReadDetail_Company.xml
AdressEditDetail.xml
Log Message:
cumulated changes. To use new Job-Architecture it might be necassary to add the following plugins to your enviroment:
org.eclipse.core.resources;
org.eclipse.platform;
org.eclipse.ui.forms;
org.eclipse.ui.ide;
org.eclipse.ui.views;
org.eclipse.ui.workbench.compatibility;
org.eclipse.update.core;
org.eclipse.update.ui;
Index: AdressEditDetail_Company.xml
===================================================================
RCS file: /cvsroot/xinity/XinityBASE/material/forms/AdressEditDetail_Company.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AdressEditDetail_Company.xml 13 Oct 2004 19:16:20 -0000 1.6
--- AdressEditDetail_Company.xml 21 Dec 2004 18:36:59 -0000 1.7
***************
*** 3,7 ****
<group cols="2" span="2"><nolabel/>
! <group_radio cols="2" span="2"><label>Adresstyp</label>
<radio_button name="Person">
<command __command__="Person.showForm"
--- 3,7 ----
<group cols="2" span="2"><nolabel/>
! <group_radio cols="2" span="1"><label>Adresstyp</label>
<radio_button name="Person">
<command __command__="Person.showForm"
***************
*** 14,47 ****
<radio_button name="Firma/Verein" checked="true"/>
</group_radio>
! <toolbar ref="AMS.Actions" span="2"/>
<group cols="2"><label>Firmen- / Vereinsdaten</label>
! <label>Name</label><input ref="Name"/>
! <label>Inhaber</label><input ref="FirstName"/>
! <label>Namenszusatz</label><input ref="MiddleName"/>
! <label>Rechtsform</label><input ref="Title"/>
! <label>Anrede</label><input ref="Addressing"/>
! <label>Gr�ndungsdatum</label><input ref="Birthday" type="Date" />
! <label>Anzeigename</label><input ref="Label"/>
! <label>Typ</label>
! <group_radio ref="Sex" cols="4">
! <label/>
<radio_button id="11" name="Firma"/>
<radio_button id="12" name="Verein"/>
<radio_button id="13" name="Einrichtung"/>
! <radio_button id="14" name="Beh�rde"/>
! </group_radio>
! <label>Bemerkung</label><input lines="3" ref="Memo"/>
! </group>
! <group><nolabel/>
! <!-- selects the ARPs for the address -->
! <group><label>Zugriffsrechte</label>
! <label>Leserecht</label><select1 ref="ARPReadSelect"/>
! <label>Schreibrecht</label><select1 ref="ARPDeleteSelect"/>
</group>
</group>
</group>
! <group cols="1" span="2">
! <group cols="4">
! <label>Kontakte</label>
<!-- COLUMN 1, Addresses, People -->
--- 14,101 ----
<radio_button name="Firma/Verein" checked="true"/>
</group_radio>
! <!-- selects the ARPs for the address -->
! <group><label>Zugriffsrechte</label>
! <label>Leserecht</label><select1 ref="ARPReadSelect"/>
! <label>Schreibrecht</label><select1 ref="ARPDeleteSelect"/>
! </group>
!
! <toolbar ref="AMS.Actions" span="2"/>
!
<group cols="2"><label>Firmen- / Vereinsdaten</label>
! <group cols="2"><nolabel/>
! <label>Name</label><input ref="Name"/>
! <label>Inhaber</label><input ref="FirstName"/>
! <label>Namenszusatz</label><input ref="MiddleName"/>
! <label>Rechtsform</label><input ref="Title"/>
! <label>Anrede</label><input ref="Addressing"/>
! <label>Gründungsdatum</label><input ref="Birthday" type="Date" />
! <label>Anzeigename</label><input ref="Label"/>
! <label>Typ</label>
! <group_radio ref="Sex" cols="2">
! <label/>
<radio_button id="11" name="Firma"/>
<radio_button id="12" name="Verein"/>
<radio_button id="13" name="Einrichtung"/>
! <radio_button id="14" name="Behörde"/>
! </group_radio>
! </group>
! <group cols="1"><nolabel/>
! <label>Bilddatei</label>
! <fileselect
! id="upload"
! key-input="true"
! bin-ref="Image"
! filename-ref="ImageFileName"
! filter="*,*.jpg,*.gif,*.png,*.bmp"
! />
! <img ref="Image"/>
!
! </group>
!
! <label span="2">Bemerkung</label><input span="2" lines="5" ref="Memo"/>
! </group>
! <group cols="1"><label>Kontakte</label>
! <group cols="5" span="1">
! <label></label>
! <label>E-Mail</label><input ref="EMail"/><label>Bez.</label><input ref="EMail_Label"/><label/>
! <label>Telefon</label><input ref="Tel"/> <label>Bez.</label><input ref="Tel_Label"/><label/>
! <label>Fax</label><input ref="Fax"/> <label>Bez.</label><input ref="Fax_Label"/><label/>
! <label>Handy</label><input ref="Mobile"/><label>Bez.</label><input ref="Mobile_Label"/><label/>
! <label span="5"/>
! ${Contact_LineSize}
! <label span="5"/>
! <group cols="2" span="5">
! <label>neuer Kontakttyp</label>
! <select1 ref="ContactTypeList"/>
! <button name="neuen Kontakt erstellen">
! <command __command__="Person.executeForm"
! form.action="addContact"
! carry_form.data="true"
! confirm="false"
! id="$form{__uid__}"/>
! </button>
! </group>
! </group>
! <group>
! <label>Adresse</label>
! <group tab="1" span="1">
! <group cols="1" span="1">
! <label>Postadresse</label>
! <group cols="3"><nolabel/>
! <label>Bezeichnung</label><label/><input ref="Postal_Label"/>
! </group>
! <input ref="Postal" lines="2"/>
! <group cols="5"><nolabel/>
! <label>PLZ</label><input ref="Postal_ZIP"/><label/><label>Ort</label><input ref="Postal_City"/>
! </group>
! </group>
! ${Contact_TabSize}
! ${emptyTabBegin}
! ${emptyTabEnd}
! </group>
</group>
</group>
</group>
! <group cols="4" span="2">
<!-- COLUMN 1, Addresses, People -->
***************
*** 49,72 ****
<nolabel/>
<group>
! <label>Adresse</label>
! <group tab="1" span="1">
! <group cols="1" span="1">
! <label>Postadresse</label>
! <group cols="3"><nolabel/>
! <label>Bezeichnung</label><label/><input ref="Postal_Label"/>
! </group>
! <input ref="Postal" lines="2"/>
! <group cols="5"><nolabel/>
! <label>PLZ</label><input ref="Postal_ZIP"/><label/><label>Ort</label><input ref="Postal_City"/>
! </group>
! </group>
! ${Contact_TabSize}
! ${emptyTabBegin}
! ${emptyTabEnd}
! </group>
! </group>
!
! <group>
! <label>verkn�pfte Adressen</label>
<group tab="1" span="1">
${tabPagePerson}
--- 103,107 ----
<nolabel/>
<group>
! <label>verknüpfte Adressen</label>
<group tab="1" span="1">
${tabPagePerson}
***************
*** 83,87 ****
<button name="neue untergeordnete Addresse">
<command __command__="Person.showEmptyForm"
! parent="$form{__uid__}"
carry_form.data="false"
confirm="false"/>
--- 118,122 ----
<button name="neue untergeordnete Addresse">
<command __command__="Person.showEmptyForm"
! parent="$form{__uid__}"
carry_form.data="false"
confirm="false"/>
***************
*** 93,129 ****
<!-- COLUMN 2, Contacts except addresses -->
! <group span="2" cols="1">
! <nolabel/>
! <group cols="5" span="1">
! <label></label>
! <label>E-Mail</label><input ref="EMail"/><label>Bez.</label><input ref="EMail_Label"/><label/>
! <label>Telefon</label><input ref="Tel"/> <label>Bez.</label><input ref="Tel_Label"/><label/>
! <label>Fax</label><input ref="Fax"/> <label>Bez.</label><input ref="Fax_Label"/><label/>
! <label>Handy</label><input ref="Mobile"/><label>Bez.</label><input ref="Mobile_Label"/><label/>
! <label span="5"/>
! ${Contact_LineSize}
! <label span="5"/>
! <group cols="2" span="5">
! <label>neuer Kontakttyp</label>
! <select1 ref="ContactTypeList"/>
! <button name="neuen Kontakt erstellen">
! <command __command__="Person.executeForm"
! form.action="addContact"
! carry_form.data="true"
! confirm="false"
! id="$form{__uid__}"/>
! </button>
! </group>
! </group>
<shiftbox ref="groupSelection"
! leftgroup.label="zugeordnete Gruppen"
! rightgroup.label="verf�gbare Gruppen"
! toleftbutton.label="<<"
! torightbutton.label=">>"
! width="130"
! height="220" />
</group>
</group>
- </group>
<actions id="AMS.Actions" name="Addressbuch" menu="true" toolbar="true">
<action name="bearbeiten abbrechen">
--- 128,141 ----
<!-- COLUMN 2, Contacts except addresses -->
! <group span="2" cols="2"><label>Gruppenzugehörigkeit</label>
<shiftbox ref="groupSelection"
! leftgroup.label="zugeordnete Gruppen"
! rightgroup.label="verfügbare Gruppen"
! toleftbutton.label="<<"
! torightbutton.label=">>"
! width="130"
! height="150" />
</group>
</group>
<actions id="AMS.Actions" name="Addressbuch" menu="true" toolbar="true">
<action name="bearbeiten abbrechen">
***************
*** 135,139 ****
</action>
! <action name="�nderungen speichern">
<icon>17</icon>
<accelerator key="S" mod="262144"/>>
--- 147,151 ----
</action>
! <action name="Änderungen speichern">
<icon>17</icon>
<accelerator key="S" mod="262144"/>>
***************
*** 144,153 ****
</action>
! <action name="Addresse l�schen">
<icon>102</icon>
<command __command__="Person.delete"
carry_form.data="true"
confirm="true"
! confirm.message="Soll diese Adresse wirklich gel�scht werden?"
id="$form{__uid__}"/>
</action>
--- 156,165 ----
</action>
! <action name="Addresse löschen">
<icon>102</icon>
<command __command__="Person.delete"
carry_form.data="true"
confirm="true"
! confirm.message="Soll diese Adresse wirklich gelöscht werden?"
id="$form{__uid__}"/>
</action>
Index: AdressEditDetail.xml
===================================================================
RCS file: /cvsroot/xinity/XinityBASE/material/forms/AdressEditDetail.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AdressEditDetail.xml 16 Nov 2004 10:51:40 -0000 1.10
--- AdressEditDetail.xml 21 Dec 2004 18:37:00 -0000 1.11
***************
*** 19,23 ****
--- 19,25 ----
<label>Schreibrecht</label><select1 ref="ARPDeleteSelect"/>
</group>
+
<toolbar ref="AMS.Actions" span="2"/>
+
<group cols="2"><label>Personendaten</label>
<group cols="2"><nolabel/>
Index: AdressReadDetail_Company.xml
===================================================================
RCS file: /cvsroot/xinity/XinityBASE/material/forms/AdressReadDetail_Company.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AdressReadDetail_Company.xml 13 Oct 2004 19:16:21 -0000 1.4
--- AdressReadDetail_Company.xml 21 Dec 2004 18:37:00 -0000 1.5
***************
*** 1,25 ****
<xml ns="/Adress/">
<title>Adresse</title>
! <toolbar ref="AMS.Actions"/>
! <group cols="2" span="2">
! <group cols="2">
! <label>Firmen- / Vereinsdaten</label>
! <label>Name</label><input readonly="true" ref="Name"/>
! <label>Inhaber</label><input readonly="true" ref="FirstName"/>
! <label>Namenszusatz</label><input readonly="true" ref="MiddleName"/>
! <label>Rechtsform</label><input readonly="true" ref="Title"/>
! <label>Anrede</label><input readonly="true" ref="Addressing"/>
! <label>Gründungsdatum</label><input readonly="true" ref="Birthday" type="Date" />
! <label>Anzeigename</label><input readonly="true" ref="Label"/>
! <!-- <label>Geschlecht</label><input readonly="true" ref="Sex" type="Integer"/> -->
! <label>Typ</label><group_radio ref="Sex" cols="2" enabled="false">
! <label/>
! <radio_button id="11" name="Firma"/>
! <radio_button id="12" name="Verein"/>
! <radio_button id="13" name="Einrichtung"/>
! <radio_button id="14" name="Behörde"/>
! </group_radio>
! <label>Bemerkung</label><input readonly="true" lines="3" ref="Memo"/>
! </group>
<group span="2" cols="4">
<label/>
--- 1,5 ----
<xml ns="/Adress/">
<title>Adresse</title>
! <group cols="2" span="2"><nolabel/>
<group span="2" cols="4">
<label/>
***************
*** 30,41 ****
<label>Verwalter:</label><input readonly="true" ref="managedByUser"/><label span="2"/>
</group>
! </group>
! <group cols="1" span="2">
! <group cols="4">
! <label>Kontakte</label>
!
! <!-- COLUMN 1, Addresses, People -->
! <group span="2" cols="1">
! <nolabel/>
<group>
<label>Adresse</label>
--- 10,51 ----
<label>Verwalter:</label><input readonly="true" ref="managedByUser"/><label span="2"/>
</group>
! <toolbar span="2" ref="AMS.Actions"/>
! <group cols="2"><label>Personendaten</label>
! <group cols="2"><nolabel/>
! <label>Firmen- / Vereinsdaten</label>
! <label>Name</label><input readonly="true" ref="Name"/>
! <label>Inhaber</label><input readonly="true" ref="FirstName"/>
! <label>Namenszusatz</label><input readonly="true" ref="MiddleName"/>
! <label>Rechtsform</label><input readonly="true" ref="Title"/>
! <label>Anrede</label><input readonly="true" ref="Addressing"/>
! <label>Gründungsdatum</label><input readonly="true" ref="Birthday" type="Date" />
! <label>Anzeigename</label><input readonly="true" ref="Label"/>
! <label>Typ</label>
! <group_radio ref="Sex" cols="2" enabled="false">
! <label/>
! <radio_button id="11" name="Firma"/>
! <radio_button id="12" name="Verein"/>
! <radio_button id="13" name="Einrichtung"/>
! <radio_button id="14" name="Behörde"/>
! </group_radio>
! </group>
! <img ref="Image"/>
! <label span="2">Bemerkung</label><input span="2" lines="3" ref="Memo" readonly="true"/>
! </group>
! <group cols="1"><label>Kontakte</label>
!
! <group cols="5" span="1">
! <label></label>
! <label>E-Mail</label>
! <input readonly="true" ref="EMail" width="20" />
! <label>Bez.</label><input readonly="true" ref="EMail_Label" width="1550"/>
! <label/>
! <label>Telefon</label><input readonly="true" ref="Tel" width="20"/> <label>Bez.</label><input readonly="true" ref="Tel_Label" width="15"/><label/>
! <label>Fax</label><input readonly="true" ref="Fax" width="20"/> <label>Bez.</label><input readonly="true" ref="Fax_Label" width="15"/><label/>
! <label>Handy</label><input readonly="true" ref="Mobile" width="20"/><label>Bez.</label><input readonly="true" ref="Mobile_Label" width="15"/><label/>
! <label span="5"/>
! ${Contact_LineSize}
! </group>
!
<group>
<label>Adresse</label>
***************
*** 58,61 ****
--- 68,81 ----
</group>
</group>
+
+ </group>
+
+ </group>
+ <group cols="4" span="2">
+
+ <!-- COLUMN 1, Addresses, People -->
+ <group span="2" cols="1">
+ <nolabel/>
+
<group>
***************
*** 72,109 ****
<label span="2"> </label>
<label/>
! </group>
${emptyTabPersonEnd}
</group>
</group>
</group>
<!-- COLUMN 2, Contacts except addresses -->
! <group span="2" cols="1">
! <nolabel/>
! <group cols="5" span="1">
! <label></label>
! <label>E-Mail</label><input readonly="true" ref="EMail"/><label>Bez.</label><input readonly="true" ref="EMail_Label"/><label/>
! <label>Telefon</label><input readonly="true" ref="Tel"/> <label>Bez.</label><input readonly="true" ref="Tel_Label"/><label/>
! <label>Fax</label><input readonly="true" ref="Fax"/> <label>Bez.</label><input readonly="true" ref="Fax_Label"/><label/>
! <label>Handy</label><input readonly="true" ref="Mobile"/><label>Bez.</label><input readonly="true" ref="Mobile_Label"/><label/>
! <label span="5"/>
! ${Contact_LineSize}
! </group>
! <group cols="2">
! <label>Gruppenzugehörigkeit</label>
!
<shiftbox ref="groupSelection"
! leftgroup.label="Mitglied von"
! rightgroup.label="nicht Mitglied von"
! toleftbutton.label="<<"
! torightbutton.label=">>"
! width="130"
! height="220"
! readonly="true" />
!
! </group>
</group>
</group>
- </group>
--- 92,114 ----
<label span="2"> </label>
<label/>
! </group>
${emptyTabPersonEnd}
</group>
</group>
+
</group>
<!-- COLUMN 2, Contacts except addresses -->
! <group span="2" cols="2"><label>Gruppenzugehörigkeit</label>
<shiftbox ref="groupSelection"
! leftgroup.label="Mitglied von"
! rightgroup.label="nicht Mitglied von"
! toleftbutton.label="<<"
! torightbutton.label=">>"
! width="130"
! height="150"
! readonly="true" />
</group>
</group>
|