Commit: bd3ff09ea20c8c6343f80f82d404202887b13681 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: bd3ff09ea20c8c6343f80f82d404202887b13681 (tree)
• Time: 2006-03-29 04:25:55
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

pre7

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: config.h.win32
• modified: configure.in
• modified: doc/en/dia.xml
• modified: doc/eu/dia.xml
• modified: doc/pl/dia.xml
• modified: objects/network/basestation.c
• modified: objects/network/radiocell.c
• modified: shapes/network/disc.shape
• modified: shapes/network/mobile_phone.png
• modified: shapes/network/mobile_phone.shape
• modified: shapes/network/mobile_phone.xpm
• modified: shapes/network/telephone.shape

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* shapes/network/mobile_phone.{png,xpm,shape}:
+	* shapes/network/telephone.shape:
+	* shapes/network/disc.shape:
+	Updates from W. Borgert <[e-mail]> improving looks and
+	positioning.
+	
[phone]  Lars Clausen  <[e-mail]>
+
+	* objects/network/radiocell.c: Patch from W. Borgert
+	<[e-mail]> for extra midpoint, flicker, extraneous
+	properties.
+	
+	* objects/network/basestation.c: Patch for BB from W. Borgert
+	<[e-mail]>. 
+
 2006-03-23  Hans Breuer  <[e-mail]>
 
 	* lib/widgets.c : use original fontname and fallback 'sans' to

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+dia-0.95-pre7: 28-Mar-2006
+
+* Fix (somewhat) a crash bug in font handling for Win32.
+
+* Minor fixes from W. Borgert.
+
 dia-0.95-pre6: 21-Mar-2006
 
 * Transient (window-on-top) off till issues resolved.

--- a/config.h.win32
+++ b/config.h.win32
@@ -18,7 +18,7 @@
 #undef LOCALEDIR /* needs to be calculated at runtime */
 /* NOT: #define LOCALEDIR "../lib/locale" */
 
-#define VERSION "0.95-pre6"
+#define VERSION "0.95-pre7"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.95-pre6, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.95-pre7, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.95-pre6">
+    <!ENTITY VERSION "0.95-pre7">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/eu/dia.xml
+++ b/doc/eu/dia.xml
@@ -4,7 +4,7 @@
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd" [
 
-    <!ENTITY VERSION "0.95-pre6">
+    <!ENTITY VERSION "0.95-pre7">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/dia.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.95-pre6">
+<!ENTITY VERSION "0.95-pre7">
 <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.xml">

--- a/objects/network/basestation.c
+++ b/objects/network/basestation.c
@@ -198,13 +198,16 @@ basestation_move_handle(Basestation *basestation, Handle *handle,
                         Point *to, ConnectionPoint *cp,
                         HandleMoveReason reason, ModifierKeys modifiers)
 {
+  ObjectChange* oc;
+
   assert(basestation!=NULL);
   assert(handle!=NULL);
   assert(to!=NULL);
-
   assert(handle->id < 8);
 
-  return NULL;
+  oc = element_move_handle (&(basestation->element), handle->id, to, cp, reason, modifiers);
+
+  return oc;
 }
 
 static ObjectChange*
@@ -313,11 +316,16 @@ basestation_update_data(Basestation *basestation)
   Rectangle text_box;
   Point p;
 
-  text_calc_boundingbox(basestation->text, &text_box);
-
   elem->width = BASESTATION_WIDTH;
   elem->height = BASESTATION_HEIGHT+basestation->text->height;
 
+  p = elem->corner;
+  p.x += elem->width/2;
+  p.y += elem->height + basestation->text->ascent;
+  text_set_position(basestation->text, &p);
+
+  text_calc_boundingbox(basestation->text, &text_box);
+
   /* Update connections: */
   basestation->connections[0].pos.x = elem->corner.x;
   basestation->connections[0].pos.y = elem->corner.y;
@@ -349,11 +357,6 @@ basestation_update_data(Basestation *basestation)
 
   element_update_boundingbox(elem);
 
-  p = elem->corner;
-  p.x += elem->width/2;
-  p.y += elem->height + basestation->text->ascent;
-  text_set_position(basestation->text, &p);
-
   /* Add bounding box for text: */
   rectangle_union(&obj->bounding_box, &text_box);
 

--- a/objects/network/radiocell.c
+++ b/objects/network/radiocell.c
@@ -39,22 +39,12 @@
 
 #include "pixmaps/radiocell.xpm"
 
-/* TODO? no visual effect ATM, but useful anyway */
-typedef enum {
-  MACRO_CELL,
-  MICRO_CELL,
-  PICO_CELL,
-} CellType;
-
-/* TODO: add different cell technologies, like GSM, UMTS, ... */
-
 typedef struct _RadioCell RadioCell;
 
 struct _RadioCell {
   PolyShape poly;		/* always 1st! */
-  CellType celltype;
   real radius;			/* pseudo-radius */
-  ConnectionPoint cp;		/* connection point in the center */
+  Point center;			/* point in the center */
   Color line_colour;
   LineStyle line_style;
   real dashlength;
@@ -63,8 +53,6 @@ struct _RadioCell {
   Color fill_colour;
   Text *text;
   TextAttributes attrs;
-  int subscribers;		/* number of subscribers in this cell,
-				   always >= 0, but check is missing */
 };
 
 #define RADIOCELL_LINEWIDTH  0.1
@@ -126,18 +114,9 @@ static ObjectOps radiocell_ops = {
   (SetPropsFunc)        radiocell_set_props
 };
 
-static PropEnumData prop_cell_type_data[] = {
-  { N_("Macro Cell"), MACRO_CELL },
-  { N_("Micro Cell"), MICRO_CELL },
-  { N_("Pico Cell"),  PICO_CELL },
-  { NULL, 0}
-};
-
 static PropDescription radiocell_props[] = {
   POLYSHAPE_COMMON_PROPERTIES,
   { "radius", PROP_TYPE_REAL, 0, N_("Radius"), NULL, NULL },
-  { "celltype", PROP_TYPE_ENUM, PROP_FLAG_VISIBLE,
-    N_("Cell Type:"), NULL, prop_cell_type_data },
   PROP_STD_LINE_WIDTH,
   PROP_STD_LINE_COLOUR,
   PROP_STD_LINE_STYLE,
@@ -148,8 +127,6 @@ static PropDescription radiocell_props[] = {
   PROP_STD_TEXT_HEIGHT,
   PROP_STD_TEXT_COLOUR,
   PROP_STD_TEXT_ALIGNMENT,
-  { "subscribers", PROP_TYPE_INT, PROP_FLAG_VISIBLE,
-    N_("Subscribers"), NULL, NULL },
   PROP_DESC_END
 };
 
@@ -165,7 +142,6 @@ radiocell_describe_props(RadioCell *radiocell)
 static PropOffset radiocell_offsets[] = {
   POLYSHAPE_COMMON_PROPERTIES_OFFSETS,
   { "radius", PROP_TYPE_REAL, offsetof(RadioCell, radius) },
-  { "celltype", PROP_TYPE_ENUM, offsetof(RadioCell, celltype) },
   { "line_width", PROP_TYPE_REAL, offsetof(RadioCell, line_width) },
   { "line_colour", PROP_TYPE_COLOUR, offsetof(RadioCell, line_colour) },
   { "line_style", PROP_TYPE_LINESTYLE,
@@ -179,7 +155,6 @@ static PropOffset radiocell_offsets[] = {
   { "text_colour", PROP_TYPE_COLOUR, offsetof(RadioCell, attrs.color) },
   { "text_alignment", PROP_TYPE_ENUM,
     offsetof(RadioCell, attrs.alignment) },
-  { "subscribers", PROP_TYPE_INT, offsetof(RadioCell, subscribers) },
   { NULL, 0, 0 },
 };
 
@@ -222,11 +197,30 @@ radiocell_move_handle(RadioCell *radiocell, Handle *handle,
 		      Point *to, ConnectionPoint *cp,
 		      HandleMoveReason reason, ModifierKeys modifiers)
 {
-  real distance = distance_point_point(&handle->pos, to);
-  gboolean larger = distance_point_point(&handle->pos, &radiocell->cp.pos) <
-    distance_point_point(to, &radiocell->cp.pos);
+  real distance;
+  gboolean larger;
+
+  /* prevent flicker for "negative" resizing */
+  if ((handle->id == HANDLE_CUSTOM1 && to->x < radiocell->center.x) ||
+      (handle->id == HANDLE_CUSTOM4 && to->x > radiocell->center.x) ||
+      ((handle->id == HANDLE_CUSTOM2 || handle->id == HANDLE_CUSTOM3) &&
+       to->y < radiocell->center.y) ||
+      ((handle->id == HANDLE_CUSTOM5 || handle->id == HANDLE_CUSTOM6) &&
+       to->y > radiocell->center.y)) {
+    return NULL;
+  }
 
-  /* TODO: this flickers terribly */
+  /* prevent flicker for "diagonal" resizing */
+  if (handle->id == HANDLE_CUSTOM1 || handle->id == HANDLE_CUSTOM4) {
+    to->y = handle->pos.y;
+  }
+  else {
+    to->x = handle->pos.x;
+  }
+
+  distance = distance_point_point(&handle->pos, to);
+  larger = distance_point_point(&handle->pos, &radiocell->center) <
+    distance_point_point(to, &radiocell->center);
   radiocell->radius += distance * (larger? 1: -1);
   if (radiocell->radius < 1.)
     radiocell->radius = 1.;
@@ -239,8 +233,8 @@ static ObjectChange*
 radiocell_move(RadioCell *radiocell, Point *to)
 {
   polyshape_move(&radiocell->poly, to);
-  radiocell->cp.pos = *to;
-  radiocell->cp.pos.x -= radiocell->radius;
+  radiocell->center = *to;
+  radiocell->center.x -= radiocell->radius;
   radiocell_update_data(radiocell);
 
   return NULL;
@@ -288,12 +282,11 @@ radiocell_update_data(RadioCell *radiocell)
   Point points[] = { {  1., 0. }, {  .5,  .75 }, { -.5,  .75 },
 		     { -1., 0. }, { -.5, -.75 }, {  .5, -.75 } };
 
-  /* TODO: the CP is invisible and does not yet work */
-  radiocell->cp.pos.x = (poly->points[0].x + poly->points[3].x) / 2.;
-  radiocell->cp.pos.y = poly->points[0].y;
+  radiocell->center.x = (poly->points[0].x + poly->points[3].x) / 2.;
+  radiocell->center.y = poly->points[0].y;
 
   for (i = 0; i < 6; i++) {
-    poly->points[i] = radiocell->cp.pos;
+    poly->points[i] = radiocell->center;
     poly->points[i].x += radiocell->radius * points[i].x;
     poly->points[i].y += radiocell->radius * points[i].y;
   }
@@ -323,6 +316,7 @@ radiocell_create(Point *startpoint,
   PolyShape *poly;
   DiaObject *obj;
   DiaFont *font;
+  int i = 0;
 
   radiocell = g_new0(RadioCell, 1);
   poly = &radiocell->poly;
@@ -331,9 +325,7 @@ radiocell_create(Point *startpoint,
   obj->ops = &radiocell_ops;
   obj->can_parent = TRUE;
 
-  radiocell->celltype = MACRO_CELL;
   radiocell->radius = 4.;
-  radiocell->subscribers = 1000;
 
   /* do not use default_properties.show_background here */
   radiocell->show_background = FALSE;
@@ -351,17 +343,17 @@ radiocell_create(Point *startpoint,
 
   polyshape_init(poly, 6);
 
-  object_add_connectionpoint(&poly->object, &radiocell->cp);
-  obj->connections[0] = &radiocell->cp;
-  radiocell->cp.object = obj;
-  radiocell->cp.connected = NULL;
-  radiocell->cp.directions = DIR_ALL;
-  radiocell->cp.pos = *startpoint;
-  radiocell->cp.pos.x -= radiocell->radius;
+  radiocell->center = *startpoint;
+  radiocell->center.x -= radiocell->radius;
 
   radiocell_update_data(radiocell);
   *handle1 = poly->object.handles[0];
   *handle2 = poly->object.handles[2];
+
+  for (i=0;i<6;i++) {
+    poly->object.handles[i]->id = HANDLE_CUSTOM1 + i;
+  }
+
   return &radiocell->poly.object;
 }
 

--- a/shapes/network/disc.shape
+++ b/shapes/network/disc.shape
@@ -8,7 +8,7 @@
      <point x="0.85" y="2.0"/>
      <point x="1" y="1" main="yes"/>
   </connections>
-  <textbox x1="-1" y1="2" x2="3" y2="5" align="center" resize="no"/>
+  <textbox x1="0" y1="2" x2="1.7" y2="5" align="center" resize="no"/>
   <svg:svg width="2cm" height="2cm">
     <svg:rect style="stroke:none; fill:background" x="0" y="0.25" width="1.7" height="1.5"/>
     <svg:ellipse style="stroke: none; fill:background" cx="0.85" cy="1.75" rx="0.85" ry="0.25"/>

Binary files a/shapes/network/mobile_phone.png and b/shapes/network/mobile_phone.png differ

--- a/shapes/network/mobile_phone.shape
+++ b/shapes/network/mobile_phone.shape
@@ -1,62 +1,47 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
   <name>Network - A Mobile Phone</name>
   <icon>mobile_phone.png</icon>
   <connections>
-   <point x="0" y="1.5"/>
-   <point x="0" y="25"/>
-   <point x="10" y="1.5"/>
-   <point x="10" y="25"/>
-   <point x="0" y="12.5"/>
-   <point x="10" y="12.5"/>
-   <point x="5" y="1.5"/>
-   <point x="5" y="25"/>
-   <point x="8" y="0"/>
-   <point x="5.5" y="13" main="yes"/>
+    <point x="0" y="0"/>
+    <point x="5" y="0"/>
+    <point x="10" y="0"/>
+    <point x="10" y="11.5"/>
+    <point x="10" y="23"/>
+    <point x="5" y="23"/>
+    <point x="0" y="23"/>
+    <point x="0" y="11.5"/>
+    <point x="5" y="11.5" main="yes"/>
   </connections>
   <aspectratio type="fixed"/>
-  <svg:svg width="11cm" height="26cm" viewBox="-1 -1 11 26">
-    <svg:rect style="fill: #3344b0" x="0" y="1.5" width="10" height="23.5"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="0" y="1.5" width="10" height="23.5"/>
-    <svg:rect style="fill: #d0f4e5" x="1.5" y="15.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="1.5" y="15.5" width="2" height="2"/>
-    <svg:rect style="fill: #193474" x="7.5" y="0" width="1" height="1.5"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="7.5" y="0" width="1" height="1.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="3" y1="3" x2="3" y2="4"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="3.5" y1="3" x2="3.5" y2="4"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="4" y1="2.5" x2="4" y2="4.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="4.5" y1="2.5" x2="4.5" y2="4.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="5" y1="2.5" x2="5" y2="4.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="5.5" y1="2.5" x2="5.5" y2="4.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6" y1="2.5" x2="6" y2="4.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6.5" y1="3" x2="6.5" y2="4"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="7" y1="3" x2="7" y2="4"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="4" y1="23.5" x2="4" y2="24"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="4.5" y1="23.5" x2="4.5" y2="24.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="5" y1="23.5" x2="5" y2="24.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="5.5" y1="23.5" x2="5.5" y2="24.5"/>
-    <svg:line style="stroke-width: 0.1; stroke: #000000" x1="6" y1="23.5" x2="6" y2="24"/>
-    <svg:rect style="fill: #d0f4e5" x="1.5" y="18" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="1.5" y="18" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="1.5" y="20.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="1.5" y="20.5" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="4" y="15.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4" y="15.5" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="4" y="18" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4" y="18" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="4" y="20.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4" y="20.5" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="6.5" y="15.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="6.5" y="15.5" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="6.5" y="18" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="6.5" y="18" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="6.5" y="20.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="6.5" y="20.5" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="1.5" y="5.5" width="7" height="5"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="1.5" y="5.5" width="7" height="5"/>
-    <svg:rect style="fill: #d0f4e5" x="2.5" y="11.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="2.5" y="11.5" width="2" height="2"/>
-    <svg:rect style="fill: #d0f4e5" x="5.5" y="11.5" width="2" height="2"/>
-    <svg:rect style="stroke-width: 0.1; stroke: #000000" x="5.5" y="11.5" width="2" height="2"/>
+  <svg:svg width="5cm" height="11.5cm">
+    <svg:path style="fill: #000077 stroke-width: 0.1 stroke: #000000" d="M 0.3,0 A 0.3,0.3 0 0 0 0,0.3 L 0,22.7 A 0.3,0.3 0 0 0 0.3,23 L 9.7,23 A 0.3,0.3 0 0 0 10,22.7 L 10,0.3 A 0.3,0.3 0 0 0 9.7,0 L 0.3,0 z"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="3" y1="1.2" x2="3" y2="2.8"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4" y1="1" x2="4" y2="3"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="5" y1="1" x2="5" y2="3"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="6" y1="1" x2="6" y2="3"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="7" y1="1.2" x2="7" y2="2.8"/>
+    <svg:path style="fill: #90ee90 stroke-width: 0.1 stroke: #000000" d="M 1.3,4 A 0.3,0.3 0 0 0 1,4.3 L 1,7.7 A 0.3,0.3 0 0 0 1.3,8 L 8.7,8 A 0.3,0.3 0 0 0 9,7.7 L 9,4.3 A 0.3,0.3 0 0 0 8.7,4 L 1.3,4 z"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="1" y="9" width="3" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="6" y="9" width="3" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="1" y="11" width="3" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="6" y="11" width="3" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="1" y="13" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="4" y="13" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="7" y="13" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="1" y="15" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="4" y="15" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="7" y="15" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="1" y="17" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="4" y="17" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="7" y="17" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="1" y="19" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="4" y="19" width="2" height="1"/>
+    <svg:rect style="fill: #bfbfbf stroke-width: 0.1; stroke: #000000" x="7" y="19" width="2" height="1"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="3" y1="21.2" x2="3" y2="21.8"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4" y1="21" x2="4" y2="22"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="5" y1="21" x2="5" y2="22"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="6" y1="21" x2="6" y2="22"/>
+    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="7" y1="21.2" x2="7" y2="21.8"/>
   </svg:svg>
 </shape>

--- a/shapes/network/mobile_phone.xpm
+++ b/shapes/network/mobile_phone.xpm
@@ -1,11 +1,11 @@
 /* XPM */
 static char * mobile_phone_xpm[] = {
-"22 22 4 1",
+"22 22 5 1",
 " 	c None",
 ".	c #000000",
-"+	c #444484",
-"@	c #B7C691",
-"             ..       ",
+"+	c #000077",
+"@	c #90EE90",
+"#	c #BFBFBF",
 "      ..........      ",
 "     ..++++++++..     ",
 "     .++++++++++.     ",
@@ -15,15 +15,16 @@ static char * mobile_phone_xpm[] = {
 "     .++@@@@@@++.     ",
 "     .++@@@@@@++.     ",
 "     .++++++++++.     ",
+"     .+###++###+.     ",
 "     .++++++++++.     ",
-"     .+..+..+..+.     ",
-"     .+..+..+..+.     ",
+"     .+##+##+##+.     ",
 "     .++++++++++.     ",
-"     .+..+..+..+.     ",
-"     .+..+..+..+.     ",
+"     .+##+##+##+.     ",
+"     .++++++++++.     ",
+"     .+##+##+##+.     ",
+"     .++++++++++.     ",
+"     .+##+##+##+.     ",
 "     .++++++++++.     ",
-"     .+..+..+..+.     ",
-"     .+..+..+..+.     ",
 "     .++++++++++.     ",
 "     ..++++++++..     ",
 "      ..........      "};

--- a/shapes/network/telephone.shape
+++ b/shapes/network/telephone.shape
@@ -1,42 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
-<name>Network - A Telephone</name>
-<icon>telephone.png</icon>
-  <connections>
-   <point x="19" y="6" />
-   <point x="19" y="13" />
-   <point x="19" y="9.5" main="yes"/>
-  </connections>
-<aspectratio type="fixed"/>
-<svg:svg>
-<svg:path style="fill: background" d="M 15 6 C 16,6 22,6 23,6 C 24,6 25.1,7 25,9 C 24,9 24,9 23,9 C 23.05,7.1 20,8 19,8 C 18,8 15,7.05 15,9 C 14,9 14,9 13,9 C 12.8,7 14,6 15,6z"/>
-<svg:path style="stroke-width: 0.1; stroke: #000000" d="M 15 6 C 16,6 22,6 23,6 C 24,6 25.1,7 25,9 C 24,9 24,9 23,9 C 23.05,7.1 20,8 19,8 C 18,8 15,7.05 15,9 C 14,9 14,9 13,9 C 12.8,7 14,6 15,6"/>
-<svg:path style="fill: background" d="M 19 7 C 23,7 23,13 22,13 C 21,13 17,13 16,13 C 15,13 15,7 19,7z"/>
-<svg:path style="stroke-width: 0.1; stroke: #000000" d="M 19 7 C 23,7 23,13 22,13 C 21,13 17,13 16,13 C 15,13 15,7 19,7"/>
-<svg:ellipse style="fill: #ffffff" cx="19" cy="10" rx="2" ry="2"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="19" cy="10" rx="2" ry="2"/>
-<svg:ellipse style="fill: #ffffff" cx="17.8" cy="10.875" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="17.8" cy="10.875" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="17.395" cy="9.925" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="17.395" cy="9.925" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="17.695" cy="9.025" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="17.695" cy="9.025" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="18.595" cy="8.575" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="18.595" cy="8.575" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="19.495" cy="8.625" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="19.495" cy="8.625" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="20.195" cy="9.225" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="20.195" cy="9.225" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="20.495" cy="9.925" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="20.495" cy="9.925" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="20.245" cy="10.775" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="20.245" cy="10.775" rx="0.25" ry="0.275"/>
-<svg:ellipse style="fill: #ffffff" cx="19.545" cy="11.325" rx="0.25" ry="0.275"/>
-<svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="19.545" cy="11.325" rx="0.25" ry="0.275"/>
-</svg:svg>
-</shape>
-
-
-
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" xmlns:svg="http://www.w3.org/2000/svg">
+  <name>Network - A Telephone</name>
+  <icon>telephone.png</icon>
+  <connections>
+    <point x="7" y="0"/>
+    <point x="0.3" y="3"/>
+    <point x="13.7" y="3"/>
+    <point x="7" y="10.5"/>
+    <point x="7" y="4.6" main="yes"/>
+  </connections>
+  <aspectratio type="fixed"/>
+  <svg:svg width="20cm" height="14cm">
+    <svg:path style="fill: #222222; stroke-width: 0.1; stroke: #000000" d="M 7 0 C 8,0 12,0.5 13,1.5 C 14,2.5 14,4 13,4.5 C 12,5 10,3.5 10,3 C 10,2.5 11,2.5 10.5,2 C 10,1.5 10,2 9.5,2 C 9,2 9.5,2 9.5,2.5 C 9.5,3 9.5,4 10,4 C 10.5,4 10.5,4 10.5,4.5 C 10.5,5 11.5,7.5 11.5,8.5 C 11.5,9.5 12,10.5 11,10.5 C 10,10.5 4,10.5 3,10.5 C 2,10.5 2.5,9.5 2.5,8.5 C 2.5,7.5 3.5,5 3.5,4.5 C 3.5,4 3.5,4 4,4 C 4.5,4 4.5,3 4.5,2.5 C 4.5,2 5,2 4.5,2 C 4,2 4,1.5 3.5,2 C 3,2.5 4,2.5 4,3 C 4,3.5 2,5 1,4.5 C 0,4 0,2.5 1,1.5 C 2,0.5 6,0 7,0 z"/>
+    <svg:ellipse style="fill: #777777; stroke-width: 0.1; stroke: #000000" cx="7" cy="4.6" rx="2.1" ry="2.1"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="8.1" cy="3.5" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="7.4" cy="3.1" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="6.6" cy="3.1" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="5.9" cy="3.5" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="5.5" cy="4.2" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="5.5" cy="5" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="5.9" cy="5.7" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="6.6" cy="6.1" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="7.4" cy="6.1" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #cccccc; stroke-width: 0.1; stroke: #000000" cx="8.1" cy="5.7" rx="0.3" ry="0.3"/>
+    <svg:ellipse style="fill: #aaaaaa; stroke-width: 0.1; stroke: #000000" cx="7" cy="4.6" rx="1" ry="1"/>
+    <svg:path style="fill: #aaaaaa; stroke-width: 0.1; stroke: #000000" d="M 8.5 5.1 C 8.7,5.2 8.8,5.1 9.1,5.1 C 9.4,5.1 9.3,5 9.3,5.2 C 9.2,5.4 9.3,5.4 9,5.4 C 8.7,5.4 8.7,5.5 8.3,5.2 C 7.9,5 8.2,4.9 8.5,5.1 z"/>
+  </svg:svg>
+</shape>