From cce9037e89a25582059d6a0ce3c1ff19198ced5f Mon Sep 17 00:00:00 2001
From: Jeff Schiller <codedread@gmail.com>
Date: Sat, 5 Sep 2009 20:03:47 +0000
Subject: [PATCH] Add icons for group/ungroup and contextual buttons/panels. 
 No functionality yet.

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@600 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/images/shape_group.png   | Bin 0 -> 553 bytes
 editor/images/shape_ungroup.png | Bin 0 -> 666 bytes
 editor/svg-editor.css           |   4 ++++
 editor/svg-editor.html          |   8 +++++++-
 editor/svg-editor.js            |   7 +++++++
 5 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 editor/images/shape_group.png
 create mode 100644 editor/images/shape_ungroup.png

diff --git a/editor/images/shape_group.png b/editor/images/shape_group.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb2ff516d35dc9a92ed6ffdc79595d61513e65e3
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzyGcYrR5;6x
zlQD}^Q4odC3(>+TVU5_x7IrE&y4G<6LW)%R0m7z{{Dic2rZN9Q$X1&!1i?xJlHEd!
zMb<)AaLd@37v7sQ$Kt*h-|9m$FwES`%*UCz+-Nu)o=e)5bUGLe9$*XW_xtbCG~Fk8
zS^==z>2yHy9=5bNj`w@L9^yE@UnO}mnM@vCy?#47TC5}hP9TpCzy*-N^X9b(0M_gE
z+tFzB%*@_Lk^lfli<Ne26+od$9vY<(FMc`>o(4eCs(C^W#d$;S65tM)myfdn<b}#4
zyZ;4YIbk!x;fIxO-l#wVKAkUvDhVVYI?Mq#hZ$fbULD+xE-5epER1kx=SooF0$p&1
zND5znq$N9GK{l101$PG>ARS}?B&nAG1Y9f~bPvTYI2|OiyFW_ORR02sPxSI|DVlF2
z(;aRKd!WOt1W+_H!3vT$JIHb~{vVJggjsddXjHaLhZC0-bi3U}k|cX1kEhe=697of
zarXTeQU_=bBVa~2!_$6z^8&YCf03D;q1|q4Hk+y0Y)TTg@kXPe@p!CSt){5eY8@v@
r@|fhwd_LdX<~P>s_0MMZkmR@D2_>Rn5)Y(r00000NkvXXu0mjf$qDH!

literal 0
HcmV?d00001

diff --git a/editor/images/shape_ungroup.png b/editor/images/shape_ungroup.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a6f369a5048b92bb2f625afecd70f29b32e2233
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!EJ;K`R5;6}
zQ!#83VHAFcM_URsZ8eR#1R00}jKbv5Xc&o;g9Ju(aB#p#0!%I}B(jh&5F|`G86k0V
za8WU)WoT^C8m(Sytp>4!9)$b<|9tNU+CsbaPrm=%-T&Tq-}~;JVp$fPW~sF0aycD|
zJcw2*l?qHIrPJw`rfFUgLbUSveBc-XE>9#9fqK2}f3{*+f&-8)iUMP|+l5#x29-+1
zf1(1;d9zllU2@DV!Q!k<7FoCnWT6h{&Ru{~sRWF%*OLUw$b+Zv4C}1RCJV$7$a^H)
z-4}4{>a2320$QWQH_waE`LzS;j2kXry9@Ri*Wio`nHLU+SJ00jVztp|glr=M*)Jxx
z_jHIxqwxFZ4y<ptVeMN7*0$QP_h%m-JkhOQuNTZ@GUQ8eOaa4Uj<7rCp;#=!nJFhM
zxmB2U*nuOnz(b181r3tPB%p%kfd`31LdtT^pNHk^_u)OhRa=<Cmaq`}BJ~_MP9%uU
z?*<g^T$Fyu7D!G!9)}<LChT_DAX!*4GKT6HMGM%Fz%&nsPZD5X%|f9d<L$6ZF)5LX
zI28#AJ|Y>$v9D0AR)a@B&ERc^k`Fu>UNgpz&%tPgLLt51?|a;f8r-<|NEVV3@`Ixv
zk00KIFB@-Z_*$qqV4EBaeCWw$v*^bs__%Gr2mK$yfQ_$zp|xee=k*4Z%VnBM|8Rh;
zG5CDGRj=18G)-$vo)J`4eW54{$$mxm%4vV+{~xG}o%M|tZ2$lO07*qoM6N<$f@ZNP
Aj{pDw

literal 0
HcmV?d00001

diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index e3c41a28..9a8b99b9 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -121,6 +121,10 @@ div.color_block {
 	display: none;
 }
 
+#svg_editor #group_panel {
+	display: none;
+}
+
 #svg_editor #rect_panel {
 	display: none;
 }
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index 95600fa0..309558d8 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -87,6 +87,7 @@
 		<img class="tool_sep" src="images/sep.png" alt="|"/>
 		<img class="tool_button" id="tool_clone_multi" src="images/clone.png" title="Clone Elements [C]" alt="Clone"/>
 		<img class="tool_button" id="tool_delete_multi" src="images/delete.png" title="Delete Selected Elements [Delete/Backspace]" alt="Delete"/>
+		<img class="tool_button" id="tool_group" src="images/shape_group.png" title="Group Elements [G]" alt="Group"/>
 		<img class="tool_sep" src="images/sep.png" alt="|"/>
 		<img class="tool_button" id="tool_alignleft" src="images/align-left.png" title="Align Left" alt="Left"/>
 		<img class="tool_button" id="tool_aligncenter" src="images/align-center.png" title="Align Center" alt="Center"/>
@@ -103,6 +104,11 @@
 		</select>
 	</div>
 
+	<div id="group_panel">
+		<img class="tool_sep" src="images/sep.png" alt="|"/>
+		<img class="tool_button" id="tool_ungroup" src="images/shape_ungroup.png" title="Ungroup Elements [G]" alt="Ungroup"/>
+	</div>
+
 	<div id="rect_panel">
 		<img class="tool_sep" src="images/sep.png" alt="|"/>
 		<label class="rect_tool">x:</label>
@@ -257,7 +263,7 @@
 
 	<div id="tools_bottom_3">
 		<div id="palette_holder"><div id="palette" title="Click to change fill color, shift-click to change stroke color"></div></div>
-		<div id="copyright">Powered by <a href="http://svg-edit.googlecode.com/" target="_blank">SVG-edit v2.4-preAlpha</a></div>
+		<div id="copyright">Powered by <a href="http://svg-edit.googlecode.com/" target="_blank">SVG-edit v2.4-unstable</a></div>
 	</div>
 </div>
 
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index e2b358ed..1ae89f5a 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -556,6 +556,10 @@ function svg_edit_setup() {
 			svgCanvas.redo();
 	};
 	
+	var clickGroup = function(){
+		console.log("Group not implemented yet");
+	};
+	
 	var clickClone = function(){
 		svgCanvas.cloneSelectedElements();
 	};
@@ -657,6 +661,8 @@ function svg_edit_setup() {
 	$('#tool_redo').click(clickRedo);
 	$('#tool_clone').click(clickClone);
 	$('#tool_clone_multi').click(clickClone);
+	$('#tool_group').click(clickGroup);
+	$('#tool_ungroup').click(clickGroup);
 	$('#tool_alignleft').click(clickAlignLeft);
 	$('#tool_aligncenter').click(clickAlignCenter);
 	$('#tool_alignright').click(clickAlignRight);
@@ -741,6 +747,7 @@ function svg_edit_setup() {
 			[modKey+'y', function(evt){clickRedo();evt.preventDefault();}],
 			[modKey+'u', function(evt){showSourceEditor();evt.preventDefault();}],
 			[modKey+'c', function(evt){clickClone();evt.preventDefault();}],
+			[modKey+'g', function(evt){clickGroup();evt.preventDefault();}],
 			['esc', cancelSourceEditor, false]
 		];