[Ocemp-CVS] ocempgui/doc/uml alignment.dia,1.1.2.1,1.1.2.2
Status: Beta
Brought to you by:
marcusva
Menu
▾
▴
[Ocemp-CVS] ocempgui/doc/uml alignment.dia,1.1.2.1,1.1.2.2
|
From: Marcus v. A. <mar...@us...> - 2008-01-12 10:48:16
|
Update of /cvsroot/ocemp/ocempgui/doc/uml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32327/doc/uml Modified Files: Tag: rel_0_2 alignment.dia Log Message: Merged from HEAD: Fixed a focusing bug in Alignment class. It should not be focusable by default. Added reversed widget focus switching using SHIFT+TAB. Index: alignment.dia =================================================================== RCS file: /cvsroot/ocemp/ocempgui/doc/uml/alignment.dia,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- alignment.dia 9 Jan 2008 23:03:46 -0000 1.1.2.1 +++ alignment.dia 12 Jan 2008 10:48:06 -0000 1.1.2.2 @@ -337,13 +337,13 @@ <dia:point val="-11.05,-23.4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-11.1,-23.45;-9.25,-21.95"/> + <dia:rectangle val="-11.1,-23.45;-9.1725,-21.95"/> </dia:attribute> <dia:attribute name="elem_corner"> <dia:point val="-11.05,-23.4"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="1.75"/> + <dia:real val="1.8275000000000001"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="1.3999999999999999"/> @@ -484,7 +484,7 @@ <dia:point val="-15.05,-13.75"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-15.1,-13.8;14.5,-7.45"/> + <dia:rectangle val="-15.1,-13.8;14.5,-6.1375"/> </dia:attribute> <dia:attribute name="elem_corner"> <dia:point val="-15.05,-13.75"/> @@ -493,7 +493,7 @@ <dia:real val="29.500000000000004"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="6.25"/> + <dia:real val="7.5624999999999964"/> </dia:attribute> <dia:attribute name="inner_color"> <dia:color val="#add8e6"/> @@ -504,16 +504,16 @@ </dia:object> <dia:object type="UML - Object" version="0" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="-14.415,-12.65"/> + <dia:point val="-14.365,-10.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-14.465,-12.7;-11.415,-10.8"/> + <dia:rectangle val="-14.415,-10.9;-11.52,-9"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-14.415,-12.65"/> + <dia:point val="-14.365,-10.85"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="2.9500000000000002"/> + <dia:real val="2.7949999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="1.8000000000000007"/> @@ -539,7 +539,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="-12.94,-11.6"/> + <dia:point val="-12.9675,-9.8075"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -589,14 +589,14 @@ </dia:object> <dia:object type="UML - Message" version="0" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="-11.465,-11.75"/> + <dia:point val="-11.57,-9.95"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-11.515,-12.55;-6.265,-11.35"/> + <dia:rectangle val="-11.62,-10.7425;-6.215,-9.55"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="-11.465,-11.75"/> - <dia:point val="-6.315,-11.75"/> + <dia:point val="-11.57,-9.95"/> + <dia:point val="-6.265,-9.95"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -611,7 +611,7 @@ <dia:enum val="0"/> </dia:attribute> <dia:attribute name="text_pos"> - <dia:point val="-9.265,-12"/> + <dia:point val="-9.2925,-10.2"/> </dia:attribute> <dia:connections> <dia:connection handle="0" to="O5" connection="4"/> @@ -620,16 +620,16 @@ </dia:object> <dia:object type="UML - Object" version="0" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="-6.315,-12.65"/> + <dia:point val="-6.265,-10.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-6.365,-12.7;-2.165,-10.8"/> + <dia:rectangle val="-6.315,-10.9;-2.23,-9"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-6.315,-12.65"/> + <dia:point val="-6.265,-10.85"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="4.0999999999999996"/> + <dia:real val="3.9850000000000003"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="1.8000000000000007"/> @@ -655,7 +655,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="-4.265,-11.6"/> + <dia:point val="-4.2725,-9.8075"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -705,14 +705,14 @@ </dia:object> <dia:object type="UML - Message" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="-2.215,-11.75"/> + <dia:point val="-2.28,-9.95"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-2.26547,-12.575;3.12378,-11.3995"/> + <dia:rectangle val="-2.33046,-10.7675;3.1737,-9.59955"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="-2.215,-11.75"/> - <dia:point val="3.07,-11.8"/> + <dia:point val="-2.28,-9.95"/> + <dia:point val="3.12,-10"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -727,7 +727,7 @@ <dia:enum val="0"/> </dia:attribute> <dia:attribute name="text_pos"> - <dia:point val="0.0525,-12.025"/> + <dia:point val="0.045,-10.225"/> </dia:attribute> <dia:connections> <dia:connection handle="0" to="O7" connection="4"/> @@ -736,16 +736,16 @@ </dia:object> <dia:object type="UML - Object" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="3.07,-12.7"/> + <dia:point val="3.12,-10.9"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="3.02,-12.75;7.22,-10.85"/> + <dia:rectangle val="3.07,-10.95;7.155,-9.05"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="3.07,-12.7"/> + <dia:point val="3.12,-10.9"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="4.0999999999999996"/> + <dia:real val="3.9850000000000003"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="1.8000000000000007"/> @@ -771,7 +771,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="5.12,-11.65"/> + <dia:point val="5.1125,-9.8575"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -821,19 +821,19 @@ </dia:object> <dia:object type="UML - Object" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="-14.375,-10.47"/> + <dia:point val="-14.325,-8.67"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-14.425,-10.52;-11.375,-8.62"/> + <dia:rectangle val="-14.375,-8.72;-11.48,-6.82"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-14.375,-10.47"/> + <dia:point val="-14.325,-8.67"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="2.9500000000000002"/> + <dia:real val="2.7949999999999999"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="1.8000000000000007"/> + <dia:real val="1.7999999999999998"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -856,7 +856,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="-12.9,-9.42"/> + <dia:point val="-12.9275,-7.6275"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -906,14 +906,14 @@ </dia:object> <dia:object type="UML - Message" version="0" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="-11.425,-9.57"/> + <dia:point val="-11.53,-7.77"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-11.4755,-10.345;-6.27108,-9.11953"/> + <dia:rectangle val="-11.5805,-8.5375;-6.2212,-7.31954"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="-11.425,-9.57"/> - <dia:point val="-6.325,-9.52"/> + <dia:point val="-11.53,-7.77"/> + <dia:point val="-6.275,-7.72"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -928,7 +928,7 @@ <dia:enum val="0"/> </dia:attribute> <dia:attribute name="text_pos"> - <dia:point val="-9.25,-9.795"/> + <dia:point val="-9.2775,-7.995"/> </dia:attribute> <dia:connections> <dia:connection handle="0" to="O10" connection="4"/> @@ -937,19 +937,19 @@ </dia:object> <dia:object type="UML - Object" version="0" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="-6.325,-10.42"/> + <dia:point val="-6.275,-8.62"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-6.375,-10.47;-2.175,-8.57"/> + <dia:rectangle val="-6.325,-8.67;-2.24,-6.77"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="-6.325,-10.42"/> + <dia:point val="-6.275,-8.62"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="4.0999999999999996"/> + <dia:real val="3.9850000000000003"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="1.8000000000000007"/> + <dia:real val="1.7999999999999998"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -972,7 +972,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="-4.275,-9.37"/> + <dia:point val="-4.2825,-7.5775"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -1022,14 +1022,14 @@ </dia:object> <dia:object type="UML - Message" version="0" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="-2.225,-9.52"/> + <dia:point val="-2.29,-7.72"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="-2.275,-10.325;5.175,-9.12"/> + <dia:rectangle val="-2.34,-8.5175;5.225,-7.32"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="-2.225,-9.52"/> - <dia:point val="5.125,-9.52"/> + <dia:point val="-2.29,-7.72"/> + <dia:point val="5.175,-7.72"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -1044,7 +1044,7 @@ <dia:enum val="0"/> </dia:attribute> <dia:attribute name="text_pos"> - <dia:point val="1.175,-9.775"/> + <dia:point val="1.1675,-7.975"/> </dia:attribute> <dia:connections> <dia:connection handle="0" to="O12" connection="4"/> @@ -1053,19 +1053,19 @@ </dia:object> <dia:object type="UML - Object" version="0" id="O14"> <dia:attribute name="obj_pos"> - <dia:point val="5.125,-10.42"/> + <dia:point val="5.175,-8.62"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="5.075,-10.47;13.725,-8.57"/> + <dia:rectangle val="5.125,-8.67;13.295,-6.77"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="5.125,-10.42"/> + <dia:point val="5.175,-8.62"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="8.5500000000000007"/> + <dia:real val="8.0700000000000003"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="1.8000000000000007"/> + <dia:real val="1.7999999999999998"/> </dia:attribute> <dia:attribute name="text_colour"> <dia:color val="#000000"/> @@ -1088,7 +1088,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="9.4,-9.37"/> + <dia:point val="9.21,-7.5775"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -1136,6 +1136,271 @@ <dia:boolean val="false"/> </dia:attribute> </dia:object> + <dia:object type="UML - Object" version="0" id="O15"> + <dia:attribute name="obj_pos"> + <dia:point val="-14.415,-13.1325"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="-14.465,-13.1825;-11.57,-11.2825"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="-14.415,-13.1325"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="2.7949999999999999"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="1.8000000000000007"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffff"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>#object#</dia:string> + </dia:attribute> + <dia:attribute name="font"> + <dia:font family="sans" style="0" name="Helvetica"/> + </dia:attribute> + <dia:attribute name="height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="-13.0175,-12.09"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="1"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="stereotype"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="exstate"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="attrib"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="font"> + <dia:font family="sans" style="0" name="Helvetica"/> + </dia:attribute> + <dia:attribute name="height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="0,0"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="0"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="is_active"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="show_attribs"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="multiple"> + <dia:boolean val="false"/> + </dia:attribute> + </dia:object> + <dia:object type="UML - Message" version="0" id="O16"> + <dia:attribute name="obj_pos"> + <dia:point val="-11.62,-12.2325"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="-11.67,-13.025;-6.265,-11.8325"/> + </dia:attribute> + <dia:attribute name="conn_endpoints"> + <dia:point val="-11.62,-12.2325"/> + <dia:point val="-6.315,-12.2325"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:string>#1: set_focus ()#</dia:string> + </dia:attribute> + <dia:attribute name="type"> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="text_pos"> + <dia:point val="-9.3425,-12.4825"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O15" connection="4"/> + <dia:connection handle="1" to="O17" connection="3"/> + </dia:connections> + </dia:object> + <dia:object type="UML - Object" version="0" id="O17"> + <dia:attribute name="obj_pos"> + <dia:point val="-6.315,-13.1325"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="-6.365,-13.1825;-2.28,-11.2825"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="-6.315,-13.1325"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="3.9850000000000003"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="1.8000000000000007"/> + </dia:attribute> + <dia:attribute name="text_colour"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffff"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>#Alignment#</dia:string> + </dia:attribute> + <dia:attribute name="font"> + <dia:font family="sans" style="0" name="Helvetica"/> + </dia:attribute> + <dia:attribute name="height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="-4.3225,-12.09"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="1"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="stereotype"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="exstate"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="attrib"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>##</dia:string> + </dia:attribute> + <dia:attribute name="font"> + <dia:font family="sans" style="0" name="Helvetica"/> + </dia:attribute> + <dia:attribute name="height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="0,0"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="0"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="is_active"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="show_attribs"> + <dia:boolean val="false"/> + </dia:attribute> + <dia:attribute name="multiple"> + <dia:boolean val="false"/> + </dia:attribute> + </dia:object> + <dia:object type="UML - Note" version="0" id="O18"> + <dia:attribute name="obj_pos"> + <dia:point val="0.5,-13.1375"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="0.45,-13.1875;8.45,-11.3875"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="0.5,-13.1375"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="7.8999999999999995"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="1.7000000000000002"/> + </dia:attribute> + <dia:attribute name="line_colour"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="fill_colour"> + <dia:color val="#ffffff"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>#Returns always false#</dia:string> + </dia:attribute> + <dia:attribute name="font"> + <dia:font family="monospace" style="0" name="Courier"/> + </dia:attribute> + <dia:attribute name="height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="0.85,-11.945"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="0"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Line" version="0" id="O19"> + <dia:attribute name="obj_pos"> + <dia:point val="-2.33,-12.2325"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="-2.38096,-12.3385;0.550962,-12.1815"/> + </dia:attribute> + <dia:attribute name="conn_endpoints"> + <dia:point val="-2.33,-12.2325"/> + <dia:point val="0.5,-12.2875"/> + </dia:attribute> + <dia:attribute name="numcp"> + <dia:int val="1"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O17" connection="4"/> + <dia:connection handle="1" to="O18" connection="3"/> + </dia:connections> + </dia:object> </dia:group> </dia:layer> </dia:diagram> |