[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6321 - trunk/gnue-packages/base/location
From: |
kilo |
Subject: |
r6321 - trunk/gnue-packages/base/location |
Date: |
Fri, 17 Sep 2004 04:16:18 -0500 (CDT) |
Author: kilo
Date: 2004-09-17 04:16:17 -0500 (Fri, 17 Sep 2004)
New Revision: 6321
Modified:
trunk/gnue-packages/base/location/LOC_Country.gfd
trunk/gnue-packages/base/location/loc.dia
trunk/gnue-packages/base/location/loc.gcd
trunk/gnue-packages/base/location/loc.png
Log:
Moved phone prefix back to Country class
to be able to use country data insertion gsd file again.
Modified: trunk/gnue-packages/base/location/LOC_Country.gfd
===================================================================
--- trunk/gnue-packages/base/location/LOC_Country.gfd 2004-09-17 08:53:46 UTC
(rev 6320)
+++ trunk/gnue-packages/base/location/LOC_Country.gfd 2004-09-17 09:16:17 UTC
(rev 6321)
@@ -30,6 +30,7 @@
<block name="blkLOC_Country" datasource="dtsloc_country">
<field name="fldLocCode" field="LOC_code" maxLength="3"/>
<field name="fldLocName" field="LOC_name" maxLength="70"/>
+ <field name="fldLocPhone" field="LOC_phone" maxLength="4"/>
</block>
</logic>
<layout xmlns:Char="GNUe:Layout:Char" Char:height="3" Char:width="46">
@@ -42,6 +43,10 @@
Char:y="2" text="Name:"/>
<entry name="entLocName" Char:height="1" Char:width="30" Char:x="9"
Char:y="2" block="blkLOC_Country" field="fldLocName"
focusorder="2" label=""/>
+ <label name="lblLoc Phone:" Char:height="1" Char:width="4" Char:x="1"
+ Char:y="3" text="Phone:"/>
+ <entry name="entLocPhone" Char:height="1" Char:width="4" Char:x="9"
+ Char:y="3" block="blkLOC_Country" field="fldLocPhone"
focusorder="3" label=""/>
</page>
</layout>
</form>
Modified: trunk/gnue-packages/base/location/loc.dia
===================================================================
--- trunk/gnue-packages/base/location/loc.dia 2004-09-17 08:53:46 UTC (rev
6320)
+++ trunk/gnue-packages/base/location/loc.dia 2004-09-17 09:16:17 UTC (rev
6321)
@@ -97,13 +97,13 @@
<dia:point val="1,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="0.95,1.95;7.95,11.25"/>
+ <dia:rectangle val="0.95,1.95;9,11.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="1,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.9"/>
+ <dia:real val="7.95"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="9.2"/>
@@ -401,16 +401,16 @@
<dia:point val="22,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.95,1.95;28.05,6.45"/>
+ <dia:rectangle val="21.95,1.95;28.95,7.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="22,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6"/>
+ <dia:real val="6.9"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="4.4"/>
+ <dia:real val="5.2"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Country#</dia:string>
@@ -533,6 +533,29 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
+ <dia:string>#phone#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(4)#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>#Country phone prefix#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
<dia:string>#formatted#</dia:string>
</dia:attribute>
<dia:attribute name="type">
@@ -564,13 +587,13 @@
</dia:object>
<dia:object type="UML - Association" version="0" id="O3">
<dia:attribute name="obj_pos">
- <dia:point val="7.9,3.9"/>
+ <dia:point val="8.95,3.9"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.85,2.65;22.05,5.5"/>
+ <dia:rectangle val="8.9,2.65;22.05,5.5"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="7.9,3.9"/>
+ <dia:point val="8.95,3.9"/>
<dia:point val="14,3.9"/>
<dia:point val="14,2.7"/>
<dia:point val="22,2.7"/>
@@ -630,13 +653,13 @@
<dia:point val="12,11"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="11.95,10.95;18.05,15.45"/>
+ <dia:rectangle val="11.95,10.95;18.95,15.45"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="12,11"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6"/>
+ <dia:real val="6.9"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="4.4"/>
@@ -793,13 +816,13 @@
</dia:object>
<dia:object type="UML - Association" version="0" id="O5">
<dia:attribute name="obj_pos">
- <dia:point val="7.9,5.5"/>
+ <dia:point val="8.95,5.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.85,5.45;12.05,13.3"/>
+ <dia:rectangle val="8.9,5.45;12.05,13.3"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="7.9,5.5"/>
+ <dia:point val="8.95,5.5"/>
<dia:point val="10,5.5"/>
<dia:point val="10,11.7"/>
<dia:point val="12,11.7"/>
@@ -859,13 +882,13 @@
<dia:point val="22,8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.95,7.95;28.95,13.25"/>
+ <dia:rectangle val="21.95,7.95;30,13.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="22,8"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.9"/>
+ <dia:real val="7.95"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="5.2"/>
@@ -1048,13 +1071,13 @@
<dia:point val="12,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="11.95,4.95;18.35,10.25"/>
+ <dia:rectangle val="11.95,4.95;19.3,10.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="12,5"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.3"/>
+ <dia:real val="7.25"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="5.2"/>
@@ -1234,13 +1257,13 @@
</dia:object>
<dia:object type="UML - Association" version="0" id="O8">
<dia:attribute name="obj_pos">
- <dia:point val="7.9,4.7"/>
+ <dia:point val="8.95,4.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.85,4.65;12.05,7.3"/>
+ <dia:rectangle val="8.9,4.65;12.05,7.3"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="7.9,4.7"/>
+ <dia:point val="8.95,4.7"/>
<dia:point val="11,4.7"/>
<dia:point val="11,5.7"/>
<dia:point val="12,5.7"/>
@@ -1297,15 +1320,15 @@
</dia:object>
<dia:object type="UML - Association" version="0" id="O9">
<dia:attribute name="obj_pos">
- <dia:point val="18.3,8.5"/>
+ <dia:point val="19.25,8.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="18.25,8.45;22.05,10.3"/>
+ <dia:rectangle val="19.2,8.45;22.05,10.3"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="18.3,8.5"/>
- <dia:point val="20.15,8.5"/>
- <dia:point val="20.15,8.7"/>
+ <dia:point val="19.25,8.5"/>
+ <dia:point val="20.625,8.5"/>
+ <dia:point val="20.625,8.7"/>
<dia:point val="22,8.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
@@ -1357,16 +1380,16 @@
</dia:object>
<dia:object type="UML - Association" version="0" id="O10">
<dia:attribute name="obj_pos">
- <dia:point val="28.9,11.5"/>
+ <dia:point val="29.95,11.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,2.65;31.1,13.1"/>
+ <dia:rectangle val="28.85,2.65;31.1,13.1"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="28.9,11.5"/>
+ <dia:point val="29.95,11.5"/>
<dia:point val="31,11.5"/>
<dia:point val="31,2.7"/>
- <dia:point val="28,2.7"/>
+ <dia:point val="28.9,2.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -1422,16 +1445,16 @@
<dia:layer name="License" visible="true">
<dia:object type="UML - Note" version="0" id="O11">
<dia:attribute name="obj_pos">
- <dia:point val="-20,1"/>
+ <dia:point val="-23,1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-20.05,0.95;-0.75,16.35"/>
+ <dia:rectangle val="-23.05,0.95;-0.7,16.35"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="-20,1"/>
+ <dia:point val="-23,1"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="19.2"/>
+ <dia:real val="22.25"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="15.3"/>
@@ -1471,7 +1494,7 @@
<dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="-19.65,2.15"/>
+ <dia:point val="-22.65,2.3"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
Modified: trunk/gnue-packages/base/location/loc.gcd
===================================================================
--- trunk/gnue-packages/base/location/loc.gcd 2004-09-17 08:53:46 UTC (rev
6320)
+++ trunk/gnue-packages/base/location/loc.gcd 2004-09-17 09:16:17 UTC (rev
6321)
@@ -28,6 +28,7 @@
<class name="Country" comment="">
<property name="code" type="string(3)" nullable="False"
comment="ISO 3166-1 country code" />
<property name="name" type="string(70)"
comment="ISO 3166-1 country name" />
+ <property name="phone" type="string(4)"
comment="Country phone prefix" />
<property name="formatted" type="string"
comment="Formatted per local requirements">
<![CDATA[
return self.name
Modified: trunk/gnue-packages/base/location/loc.png
===================================================================
(Binary files differ)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6321 - trunk/gnue-packages/base/location,
kilo <=