From 237fd96b0ff2ca91342d74e40c4780e749b1c8e3 Mon Sep 17 00:00:00 2001
From: Alexis Deveria <adeveria@gmail.com>
Date: Tue, 10 Nov 2009 19:16:45 +0000
Subject: [PATCH] Changed order of circle&ellipse and square&rect as per issue
 179

git-svn-id: http://svg-edit.googlecode.com/svn/branches/transformlist@927 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/images/svg_edit_icons.svg | 4 ++--
 editor/svg-editor.html           | 4 ++--
 editor/svg-editor.js             | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/editor/images/svg_edit_icons.svg b/editor/images/svg_edit_icons.svg
index bf5042a5..82782e11 100644
--- a/editor/images/svg_edit_icons.svg
+++ b/editor/images/svg_edit_icons.svg
@@ -137,7 +137,7 @@
    <stop stop-opacity="1" stop-color="#3b7e9b" offset="1"/>
   </linearGradient>
  </defs>
-  <rect transform="matrix(1, 0, 0, 1, 0, 0)" stroke="#000000" fill="url(#svg_2)" id="svg_1" height="10" width="20" y="6.5" x="1.5"/>
+  <rect transform="matrix(1, 0, 0, 1, 0, 0)" stroke="#000000" fill="url(#svg_2)" id="svg_1" height="12" width="20" y="5.5" x="1.5"/>
  </svg>
 </g>
 
@@ -185,7 +185,7 @@
   </linearGradient>
  </defs>
  <g>
-  <ellipse stroke-opacity="1" fill-opacity="1" stroke-width="2" stroke="#000000" fill="url(#svg_4)" id="svg_1" rx="23" ry="12" cy="27" cx="27"/>
+  <ellipse stroke-opacity="1" fill-opacity="1" stroke-width="2" stroke="#000000" fill="url(#svg_4)" id="svg_1" rx="23" ry="15" cy="27" cx="27"/>
  </g>
 </svg>
 </g>
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index 8e8761f8..cee1907a 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -329,14 +329,14 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 <div id="color_picker"></div>
 
 <div id="tools_rect" class="tools_flyout">
-	<div id="tool_square" class="tool_flyout_button" title="Square"></div>
 	<div id="tool_rect" class="tool_flyout_button" title="Rectangle"></div>
+	<div id="tool_square" class="tool_flyout_button" title="Square"></div>
 	<div id="tool_fhrect" class="tool_flyout_button" title="Free-Hand Rectangle"></div>
 </div>
 
 <div id="tools_ellipse" class="tools_flyout">
-	<div id="tool_circle" class="tool_flyout_button" title="Circle"></div>
 	<div id="tool_ellipse" class="tool_flyout_button" title="Ellipse"></div>
+	<div id="tool_circle" class="tool_flyout_button" title="Circle"></div>
 	<div id="tool_fhellipse" class="tool_flyout_button" title="Free-Hand Ellipse"></div>
 </div>
 
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 5f4ddc36..b7904149 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -1914,11 +1914,11 @@ function setSVGIcons() {
 			'#tool_select':'select',
 			'#tool_fhpath':'pencil',
 			'#tool_line':'pen',
-			'#tool_square,#tools_rect_show':'square',
-			'#tool_rect':'rect',
+			'#tool_rect,#tools_rect_show':'rect',
+			'#tool_square':'square',
 			'#tool_fhrect':'fh_rect',
-			'#tool_circle,#tools_ellipse_show':'circle',
-			'#tool_ellipse':'ellipse',
+			'#tool_ellipse,#tools_ellipse_show':'ellipse',
+			'#tool_circle':'circle',
 			'#tool_fhellipse':'fh_ellipse',
 			'#tool_path':'path',
 			'#tool_text,#layer_rename':'text',