# HG changeset patch
# User edouard
# Date 1250156935 -7200
# Node ID 46d7d2ce84d2a54fdb763be19db5f9bf2b21ba10
# Parent 71c441104cac214097d83abe7c88b9cac06fbb4b# Parent 35cc4c6a29363d0a89f3e1096832cf14bb79f3de
Merge with 35cc4c6a29363d0a89f3e1096832cf14bb79f3de
diff -r 71c441104cac -r 46d7d2ce84d2 images/ShowMaster.png
Binary file images/ShowMaster.png has changed
diff -r 71c441104cac -r 46d7d2ce84d2 images/icons.svg
--- a/images/icons.svg Thu Aug 13 11:37:38 2009 +0200
+++ b/images/icons.svg Thu Aug 13 11:48:55 2009 +0200
@@ -41,12 +41,12 @@
pagecolor="#ffffff"
id="base"
showgrid="false"
- inkscape:zoom="1.4142135"
- inkscape:cx="383.36314"
- inkscape:cy="108.76819"
- inkscape:window-x="25"
+ inkscape:zoom="1.9999999"
+ inkscape:cx="408.78078"
+ inkscape:cy="837.40927"
+ inkscape:window-x="15"
inkscape:window-y="25"
- inkscape:current-layer="g18993"
+ inkscape:current-layer="g16611"
showguides="true"
inkscape:guide-bbox="true">
+
+
+
+
+
+
+
+
+
+
+
+
%% Build Clean editPLC HMIEditor ImportDEF ImportSVG NetworkEdit Run ShowIECcode Stop Unknown %%
+ sodipodi:role="line">%% Build Clean editPLC HMIEditor ImportDEF ImportSVG NetworkEdit ShowMaster Run ShowIECcode Stop Unknown %%
@@ -83618,7 +83738,7 @@
+ transform="translate(1660.9892,-430.1329)">
ST
@@ -86571,4 +86691,162 @@
id="path16572"
sodipodi:nodetypes="ccccc" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Master
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 71c441104cac -r 46d7d2ce84d2 plugins/canfestival/canfestival.py
--- a/plugins/canfestival/canfestival.py Thu Aug 13 11:37:38 2009 +0200
+++ b/plugins/canfestival/canfestival.py Thu Aug 13 11:48:55 2009 +0200
@@ -199,7 +199,8 @@
"name" : _("Edit network"),
"tooltip" : _("Edit CanOpen Network with NetworkEdit"),
"method" : "_OpenView"},
- {"name" : _("Show Master"),
+ {"bitmap" : os.path.join("images", "ShowMaster"),
+ "name" : _("Show Master"),
"tooltip" : _("Show Master generated by config_utils"),
"method" : "_ShowMasterGenerated"}
]