moved ActualSize, Information, ZoomIn and ZoomOut bitmaps from embedded XML to actual...

diff --git a/windows/GraphForm.resx b/windows/GraphForm.resx
index 4ac8e274d347847c2c6c5a9304edd1473a9d8654..4e82803734506aaced8cc9a8969625d3f945295f 100755 (executable)
--- a/windows/GraphForm.resx
+++ b/windows/GraphForm.resx
@@ -231,68 +231,6 @@
   <metadata name="mainToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>267, 17</value>\r
   </metadata>\r
-  <data name="attributesToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAnNJREFUOE9tkl1I\r
-        U3EYxv921UVdRBfedhUUQRBBREHQVReBUXeGQWGKFwWBFQmTunAXhWBSJNmHzYm2lik63WxozqWr0+YG\r
-        Oacbpttyc2dn7uzsfG1nPp1tuDntuTovz/m9/4f3favILoVoGf6IRHh5H9naIiSnyOTQ/iw5fuQgqT58\r
-        oGr3/4V6C8CMl4XeFoc9IGA5ImM1pmAlIuCbMwjdiBsDY/MQpAwqGuRU0uxMwDAXh6I22VaSV7DJZwsl\r
-        m5bQP+aEpnMULCeWG1BLSXSOBHdgQIQRcPbOHE43fAWd4EreW+MM2rrMEPMJeEnB69GAGm+zAs5kc2jT\r
-        LaCtxwNJLr5elIQGjQ42yg/y0xtDe++vCjBfrMcEuP00wnSq5GVkWf0WYZmicP/ZIMjQ1DJefKT2wF+m\r
-        /+BknQU1zVZsMMXYSlaBInHweZdQ3/IBZMKxhlefXHtgyhfFmVobLtwaR4hOFPxcToHIswivrqCxtRfE\r
-        7llHu55SjfyyynIHYjh/3YpLjSZEN9mCkVUUcGwcPt8ibj7qAfEHGWi7p5Ef0E551xicu2rB5XoTOFko\r
-        WCmOg5DagNlqx22NHiQPdRkcsNiXKuDZ3zFUnzLg6MU+hJji0Bh6AwIbRlPre7wxfi/uOqC+/vilBSwv\r
-        lhr0jftwrKYPJ67o8Nm6qE5LjS5G0T84gRsPe5BI8uVDcXjW8LTbjHA0qjbIICdzSMsJpNNxcEwUciqM\r
-        YdMkrt3tgmshWHmi+QTz3hBaOobQ2mHED6cHIvcXyfgqpmyzeKDV457WAJf3P+D2scfUnQ6YKDQ96Udt\r
-        8zvUqRE1z4cx6fBV3rQK/AOitphgAvJ5jAAAAABJRU5ErkJggg==\r
-</value>\r
-  </data>\r
-  <data name="zoomOutToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgRJREFUOE/Nk91L\r
-        02EUx3/+A10GEvQPRDfRRTdRaEEEYRejFzCDKBGkQXMVRYYLyl4QshUW6CBz2rKJbWrgwrnUDTbNt7WN\r
-        IVu63ObenNvP39omfPpdCm2ryw4cOPA853PO9znPqRJ2mbidI/hzQ1j5ERHiybQQjSeFfdV7hZNHjwj7\r
-        q/dU7b77RywnYTBNYrY6sbg8WNwBXpumuPVcz+WWDr463ZQFpNJZDGYbE/ZFYqJEWMoTyEh8i4mY3Ou0\r
-        6UY53XCX9Ui8NMTjX+X9iI1QPI1YKLKVLxLbLuBNbmMNbtHnCtP0UEf3wFhpQP+wlbHpeTkpT7awg1jc\r
-        ISUV8SclbIE0hvkErb2TnKq/UxpwQ9PFtD9EYCtHXCqQ+lUknM2zvCEysbKJ3hnhQf8sxxSq0oBO3Sf6\r
-        vswxGxXxpiT8mzmWZP0zaxnM3xP0TIVQvRylQfm4NGDo8wyaN8OMBzPYVrOyZ7DIrZt8Sd65IrQblznf\r
-        8oJLjddLA7Ly/OuVT3g2aOPDYoKhpRQDsm6dI8JTk48rmrfUnFOh114tP8oFTwBF0yOuaXq432uVqy7Q\r
-        8mqEize1HFco6WyrY9PXXhkSWItiHJ+j+Z6WExduUyt7c2s3H42D1Bw+iL3rwN8h5X6b3WGn7uyZ/whi\r
-        7jiEurG2/KNW2jyv14tarcIhy6q4of9y+BuDcJK7YU2IbwAAAABJRU5ErkJggg==\r
-</value>\r
-  </data>\r
-  <data name="actualSizeToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgRJREFUOE/Nk91L\r
-        02EUx3/+A10GEvQPRDfRRTdRaEEEYRejFzCDKBGkQXMVRYYLyl4QshUW6CBz2rKJbWrgwrnUDTbNt7WN\r
-        IVu63ObenNvP39omfPpdCm2ryw4cOPA853PO9znPqRJ2mbidI/hzQ1j5ERHiybQQjSeFfdV7hZNHjwj7\r
-        q/dU7b77RywnYTBNYrY6sbg8WNwBXpumuPVcz+WWDr463ZQFpNJZDGYbE/ZFYqJEWMoTyEh8i4mY3Ou0\r
-        6UY53XCX9Ui8NMTjX+X9iI1QPI1YKLKVLxLbLuBNbmMNbtHnCtP0UEf3wFhpQP+wlbHpeTkpT7awg1jc\r
-        ISUV8SclbIE0hvkErb2TnKq/UxpwQ9PFtD9EYCtHXCqQ+lUknM2zvCEysbKJ3hnhQf8sxxSq0oBO3Sf6\r
-        vswxGxXxpiT8mzmWZP0zaxnM3xP0TIVQvRylQfm4NGDo8wyaN8OMBzPYVrOyZ7DIrZt8Sd65IrQblznf\r
-        8oJLjddLA7Ly/OuVT3g2aOPDYoKhpRQDsm6dI8JTk48rmrfUnFOh114tP8oFTwBF0yOuaXq432uVqy7Q\r
-        8mqEize1HFco6WyrY9PXXhkSWItiHJ+j+Z6WExduUyt7c2s3H42D1Bw+iL3rwN8h5X6b3WGn7uyZ/whi\r
-        7jiEurG2/KNW2jyv14tarcIhy6q4of9y+BuDcJK7YU2IbwAAAABJRU5ErkJggg==\r
-</value>\r
-  </data>\r
-  <data name="zoomInToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgRJREFUOE/Nk91L\r
-        02EUx3/+A10GEvQPRDfRRTdRaEEEYRejFzCDKBGkQXMVRYYLyl4QshUW6CBz2rKJbWrgwrnUDTbNt7WN\r
-        IVu63ObenNvP39omfPpdCm2ryw4cOPA853PO9znPqRJ2mbidI/hzQ1j5ERHiybQQjSeFfdV7hZNHjwj7\r
-        q/dU7b77RywnYTBNYrY6sbg8WNwBXpumuPVcz+WWDr463ZQFpNJZDGYbE/ZFYqJEWMoTyEh8i4mY3Ou0\r
-        6UY53XCX9Ui8NMTjX+X9iI1QPI1YKLKVLxLbLuBNbmMNbtHnCtP0UEf3wFhpQP+wlbHpeTkpT7awg1jc\r
-        ISUV8SclbIE0hvkErb2TnKq/UxpwQ9PFtD9EYCtHXCqQ+lUknM2zvCEysbKJ3hnhQf8sxxSq0oBO3Sf6\r
-        vswxGxXxpiT8mzmWZP0zaxnM3xP0TIVQvRylQfm4NGDo8wyaN8OMBzPYVrOyZ7DIrZt8Sd65IrQblznf\r
-        8oJLjddLA7Ly/OuVT3g2aOPDYoKhpRQDsm6dI8JTk48rmrfUnFOh114tP8oFTwBF0yOuaXq432uVqy7Q\r
-        8mqEize1HFco6WyrY9PXXhkSWItiHJ+j+Z6WExduUyt7c2s3H42D1Bw+iL3rwN8h5X6b3WGn7uyZ/whi\r
-        7jiEurG2/KNW2jyv14tarcIhy6q4of9y+BuDcJK7YU2IbwAAAABJRU5ErkJggg==\r
-</value>\r
-  </data>\r
   <metadata name="exportFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>387, 17</value>\r
   </metadata>\r

diff --git a/windows/Properties/Resources.Designer.cs b/windows/Properties/Resources.Designer.cs
index c16e76fe8bf02a590f1e8ca4e5de57c5292e4a4b..1127bc3eee7518a09e8b538bca14ddc024e551da 100755 (executable)
--- a/windows/Properties/Resources.Designer.cs
+++ b/windows/Properties/Resources.Designer.cs
@@ -60,6 +60,13 @@ namespace Graphviz.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap ActualSize {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ActualSize", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap EdgeAttributes {\r
             get {\r
                 object obj = ResourceManager.GetObject("EdgeAttributes", resourceCulture);\r
@@ -74,11 +81,32 @@ namespace Graphviz.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Information {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Information", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap NodeAttributes {\r
             get {\r
                 object obj = ResourceManager.GetObject("NodeAttributes", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
+        \r
+        internal static System.Drawing.Bitmap ZoomIn {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ZoomIn", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        internal static System.Drawing.Bitmap ZoomOut {\r
+            get {\r
+                object obj = ResourceManager.GetObject("ZoomOut", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/windows/Properties/Resources.resx b/windows/Properties/Resources.resx
index 27bf90d00fe909e16ee74c2b5a08e7b9e73d3b34..13fad64f9cca6e6f0b92772e46db667a4941e6ae 100755 (executable)
--- a/windows/Properties/Resources.resx
+++ b/windows/Properties/Resources.resx
@@ -118,13 +118,25 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="ZoomOut" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\ZoomOut.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="NodeAttributes" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\NodeAttributes.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
   <data name="EdgeAttributes" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\EdgeAttributes.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="ZoomIn" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\ZoomIn.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
   <data name="GraphAttributes" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\GraphAttributes.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="NodeAttributes" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\NodeAttributes.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="ActualSize" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\ActualSize.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Information" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Information.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
 </root>

diff --git a/windows/Resources/ActualSize.bmp b/windows/Resources/ActualSize.bmp
new file mode 100755 (executable)
index 0000000..0b53b38
Binary files /dev/null and b/windows/Resources/ActualSize.bmp differ

diff --git a/windows/Resources/Information.bmp b/windows/Resources/Information.bmp
new file mode 100755 (executable)
index 0000000..a971dad
Binary files /dev/null and b/windows/Resources/Information.bmp differ

diff --git a/windows/Resources/ZoomIn.bmp b/windows/Resources/ZoomIn.bmp
new file mode 100755 (executable)
index 0000000..bda526c
Binary files /dev/null and b/windows/Resources/ZoomIn.bmp differ

diff --git a/windows/Resources/ZoomOut.bmp b/windows/Resources/ZoomOut.bmp
new file mode 100755 (executable)
index 0000000..46234bd
Binary files /dev/null and b/windows/Resources/ZoomOut.bmp differ

diff --git a/windows/graphviz.csproj b/windows/graphviz.csproj
index 028439d8b0c2325946c1e02ec74221f00132bc49..e4849b40d101013030ba488f6f5fca5b294301fa 100755 (executable)
--- a/windows/graphviz.csproj
+++ b/windows/graphviz.csproj
@@ -105,6 +105,18 @@
     <None Include="Graphviz.res" />\r
     <None Include="Resources\GraphAttributes.png" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ZoomOut.bmp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ActualSize.bmp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\ZoomIn.bmp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="Resources\Information.bmp" />\r
+  </ItemGroup>\r
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r