Author: reinhard Date: 2011-02-19 05:55:15 -0600 (Sat, 19 Feb 2011) New Revision: 293
Modified: address/forms/address.gfd Log: Updated. Modified: address/forms/address.gfd =================================================================== --- address/forms/address.gfd 2011-02-04 09:30:19 UTC (rev 292) +++ address/forms/address.gfd 2011-02-19 11:55:15 UTC (rev 293) @@ -87,7 +87,7 @@ <field name="eBWSupplier" field="bwsupplier" datatype="text" length="16"/> <field name="eShipment" field="shipment" datatype="text" length="64"/> <field name="eCategory" field="category" datatype="text" length="32" fk_key="id" fk_description="text" fk_source="dts_category"/> - <field name="eMemoAvailable" datatype="boolean" editable="N"/> + <field name="eMemoAvailable" datatype="text" length="15" editable="N"/> <field name="eMemo" field="memo" datatype="text"/> <field name="eQuicksearch" field="quicksearch" datatype="boolean"/> <field name="eFilter1" field="filter1" datatype="boolean"/> @@ -96,7 +96,10 @@ <field name="contact_count" datatype="number" length="4" editable="N"/> <trigger type="ON-RECORDLOADED"> - blk_company.eMemoAvailable.value = (blk_company.eMemo.value is not None and len(blk_company.eMemo.value.strip()) > 0) + if blk_company.eMemo.value is not None and len(blk_company.eMemo.value.strip()) > 0: + blk_company.eMemoAvailable.value = u"verfügbar" + else: + blk_company.eMemoAvailable.value = u"nicht verfügbar" </trigger> <trigger type="POST-FOCUSIN"> @@ -142,7 +145,7 @@ <field name="eFax" field="fax" datatype="text" length="40"/> <field name="eMail" field="email" datatype="text" length="64"/> <field name="eMemo" field="memo" datatype="text"/> - <field name="eMemoAvailable" datatype="boolean" editable="N"/> + <field name="eMemoAvailable" datatype="text" length="15" editable="N"/> <field name="eFilter1" field="filter1" datatype="boolean"/> <field name="eFilter2" field="filter2" datatype="boolean"/> <field name="eFilter3" field="filter3" datatype="boolean"/> @@ -162,7 +165,10 @@ <field name="eReserve" field="reserve" datatype="boolean" /> <trigger type="ON-RECORDLOADED"> - blk_contact.eMemoAvailable.value = (blk_contact.eMemo.value is not None and len(blk_contact.eMemo.value.strip()) > 0) + if blk_contact.eMemo.value is not None and len(blk_contact.eMemo.value.strip()) > 0: + blk_contact.eMemoAvailable.value = u"verfügbar" + else: + blk_contact.eMemoAvailable.value = u"nicht verfügbar" </trigger> <trigger type="POST-FOCUSIN"> @@ -240,7 +246,7 @@ <button action="to_clipboard" label="In Zwischenablage kopieren"/> <entry field="eQuicksearch" label="Schnellaufruf"/> <hbox label="Memo:"> - <entry field="eMemoAvailable" label="verfügbar"/> + <entry field="eMemoAvailable" style="label"/> <button action="act_memo_company" label="Bearbeiten"/> </hbox> </vbox> @@ -274,7 +280,7 @@ <entry field="eDepartment" label="Abteilung:"/> <entry field="eDuty" label="Funktion:"/> <hbox label="Memo:"> - <entry field="eMemoAvailable" label="verfügbar"/> + <entry field="eMemoAvailable" style="label"/> <button action="act_memo_contact" label="Bearbeiten"/> </hbox> </vbox> @@ -392,7 +398,10 @@ if params.get('prm_mres'): value = params['prm_memo'] blk_company.eMemo.value = value - blk_company.eMemoAvailable.value = bool(value) + if bool(value): + blk_company.eMemoAvailable.value = "verfügbar" + else: + blk_company.eMemoAvailable.value = "nicht verfügbar" </action> <action name="act_memo_contact"> @@ -401,7 +410,10 @@ if params.get('prm_mres'): value = params['prm_memo'] blk_contact.eMemo.value = value - blk_contact.eMemoAvailable.value = bool(value) + if bool(value): + blk_contact.eMemoAvailable.value = "verfügbar" + else: + blk_contact.eMemoAvailable.value = "nicht verfügbar" </action> <action name="act_export"> @@ -590,18 +602,19 @@ <vbox> <entry block="blk" field="search" label="Suchbegriff:"/> - <grid block="blk_company" rows="20"> + <grid name="grd_company" block="blk_company" rows="30"> <gridline> - <button label="Auswählen" action="act_select"> - <trigger type="POST-FOCUSIN">act_button_focus.run()</trigger> - </button> - <entry field="matchcode" label="Match" navigable="N"/> - <entry field="name1" label="Firma-1" navigable="N"/> - <entry field="name2" label="Firma-2" navigable="N"/> - <entry field="street" label="Straße" navigable="N"/> - <entry field="city" label="Ort" navigable="N"/> + <entry field="matchcode" label="Match" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="name1" label="Firma-1"><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="name2" label="Firma-2"><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="street" label="Straße" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="city" label="Ort" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> </gridline> </grid> + + <button label="Auswählen" action="act_select" grid_link="grd_company"> + <trigger type="POST-FOCUSIN">act_button_focus.run()</trigger> + </button> </vbox> </page> </layout> @@ -691,18 +704,19 @@ <vbox> <entry block="blk" field="search" label="Suchbegriff:"/> - <grid block="blk_contact" rows="20"> + <grid name="grd_contact" block="blk_contact" rows="30"> <gridline> - <button label="Auswählen" action="act_select"> - <trigger type="POST-FOCUSIN">act_button_focus.run()</trigger> - </button> - <entry field="surname" label="Nachname" navigable="N"/> - <entry field="firstname" label="Vorname" navigable="N"/> - <entry field="name1" label="Firma-1" navigable="N"/> - <entry field="name2" label="Firma-2" navigable="N"/> - <entry field="city" label="Ort" navigable="N"/> + <entry field="surname" label="Nachname"><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="firstname" label="Vorname" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="name1" label="Firma-1" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="name2" label="Firma-2" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="city" label="Ort" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> </gridline> </grid> + + <button label="Auswählen" action="act_select" grid_link="grd_contact"> + <trigger type="POST-FOCUSIN">act_button_focus.run()</trigger> + </button> </vbox> </page> </layout> @@ -722,7 +736,7 @@ if old != val: if val is not None: val = u"%%" + val + u"%%" - blk_company.set_filter(['or', + blk_contact.set_filter(['or', ['like', ['upper', ['field', 'surname']], ['const', val]], ['like', ['upper', ['field', 'firstname']], ['const', val]]]) else: @@ -792,19 +806,20 @@ <vbox> <entry block="blk" field="search" label="Suchbegriff:"/> - <grid block="blk_contact" rows="20"> + <grid name="grd_contact" block="blk_contact" rows="30"> <gridline> - <button label="Auswählen" action="act_select"> - <trigger type="POST-FOCUSIN">act_button_focus.run()</trigger> - </button> - <entry field="surname" label="Nachname" navigable="N"/> - <entry field="firstname" label="Vorname" navigable="N"/> - <entry field="phone1" label="Telefon 1" navigable="N"/> - <entry field="phone2" label="Telefon 2" navigable="N"/> - <entry field="name1" label="Firma-1" navigable="N"/> - <entry field="phone" label="Telefon" navigable="N"/> + <entry field="surname" label="Nachname" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="firstname" label="Vorname" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="phone1" label="Telefon 1"><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="phone2" label="Telefon 2"><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="name1" label="Firma-1" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> + <entry field="phone" label="Telefon" ><trigger type="ON-CLICK">act_select.run()</trigger></entry> </gridline> </grid> + + <button label="Auswählen" action="act_select" grid_link="grd_contact"> + <trigger type="POST-FOCUSIN">act_button_focus.run()</trigger> + </button> </vbox> </page> </layout> @@ -850,3 +865,5 @@ </action> </dialog> </form> + +<!-- vim: set textwidth=0: --> _______________________________________________ commit-gnue mailing list commit-gnue@gnu.org http://lists.gnu.org/mailman/listinfo/commit-gnue