From 2cd43ed552f8a848a50e8bb2180801a854b9202c Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sat, 5 Dec 2009 14:41:53 +0000
Subject: [PATCH] Bump map icons

---
 images/buildings_icon.png       | Bin 346 -> 646 bytes
 images/delete_icon.png          | Bin 272 -> 498 bytes
 images/level_icon.png           | Bin 272 -> 573 bytes
 images/lower_icon.png           | Bin 364 -> 599 bytes
 images/raise_icon.png           | Bin 287 -> 492 bytes
 images/rotate_icon.png          | Bin 0 -> 450 bytes
 images/start_icon2.png          | Bin 0 -> 660 bytes
 images/station_icon.png         | Bin 306 -> 401 bytes
 images/track_icon.png           | Bin 261 -> 383 bytes
 include/gui/ContainerWidget.hpp |   3 +-
 include/gui/ILayout.hpp         |   2 +-
 include/gui/ToggleBar.hpp       |   1 +
 include/gui/ToggleButton.hpp    |   6 +++-
 include/gui/Widget.hpp          |   2 +-
 layouts/editor.xml              |   6 ++--
 src/Editor.cpp                  |  53 ++++++++++++++++++++++++--------
 src/gui/ContainerWidget.cpp     |  18 +++++++++--
 src/gui/Layout.cpp              |   6 ++--
 src/gui/ToggleBar.cpp           |  17 +++++++++-
 src/gui/ToggleButton.cpp        |  13 ++++++--
 src/gui/Widget.cpp              |   3 +-
 21 files changed, 101 insertions(+), 29 deletions(-)
 create mode 100644 images/rotate_icon.png
 create mode 100644 images/start_icon2.png

diff --git a/images/buildings_icon.png b/images/buildings_icon.png
index a2489149ea88c1052ac1fb9ba527dd63e9f60dfc..bfc8bdd78852f2955a48255a8805c0f8ffa9b748 100644
GIT binary patch
delta 539
zcmV+$0_6SL0)_>UHwpg${{a7>y{D6rKpzPV1r8u3-_<9Zk!UA>0pUqRK~z}7?Um1p
z(?A@@KQj%kD{VGJ*svvMp{%gD3R3U|R&RX=4|^@*8!UM4p<czS;K4qD_Fz@ap{)<l
zLPM<!26mg)*v@#Udup=%L(5+Bfn2`B@co3zF9RtlDL0H*b;AqO)Dx{^*ZyeD>&r{A
zHG!9=sUHc!MS{S81o%9i@@6;`8yC1L547fQf`I=2d{=5|39+g2btS|m%h!<*n=W5f
zLTsaa6^YoeoXhD4Qu13Vq7BTs2AWFoHb!DDc%IGbJt?^>B@?X^M{Zdzl%hYKqJUdM
z@GcCOo4i+NXL=LV>vjF`_&D(`jHHEM=jXHID3|d(k0_dd9Y(2CqF5{vh9N-^pp?RO
zT`bGO_x-u7TCLJ*w^>=>3eWTS`1KPan*re4hc?Y;U+{gO_doX7*)`ech|_$ZAPDBN
zMJyDEq6m@AU_8kIAZ>#}p+K|QWM|hTfA2B&fxvMblu~oqBIHfqhQ_)ZUDsuwBkTjg
z?JO9E5u0s#O~A4&PV;>n$H6cRhQncOwlx7MCFAj!PN#EiwzfbRhSX}c*+*z*5O-!%
zpeLF}qd}!oS*oDd>s@={B(6O@Ink|Fi@{)kZQI;GJe-M*M*JKM=ytnH|B7WM!)P=T
dq@<+8@DFewMZbgh%$fiI002ovPDHLkV1kU@2K@j4

delta 237
zcmV<J022R(1=<3THwgd$0002_L%V;GKpzPP4hcIngsnx^k!UA>0JTX(K~z}7V_+Bs
zqhJ&aFkmEALoyG~e|++DzkDIdOcqitH)dkOuZV}|KPir2q^jjmaQ5FnqC<j_+Ln{*
z2u501PKqNKX=ORFj$ovv<-|CGk=B+Ias(r(`J7UK?g-pbkeK+tq^yi8miBaYG0dGm
zAFEwV3<C^^Dhc&WtF2M^7h8`qFfcGMEWV)u7mL-nfl~}081N7nbpQ(`nz6+(G4Vbc
n1w<D_R4oB<6hxz76pR7@TIo(JZZl_~00000NkvXXu0mjflu=wm

diff --git a/images/delete_icon.png b/images/delete_icon.png
index de54d04eea1cbdeeb1a63458642d472a377529c4..020d8a1bb5a162b593a3cd2ae3d93b7b238b4a49 100644
GIT binary patch
delta 472
zcmV;}0Vn>D0`dcpB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru*$f2^88;&6+i3s*0dh%1K~z}7?Uy}D1VIpmztTm)
z&<lu&W`b;P>J>bJ2QV}+^9WwROdZg`BM1h93!=E}#wun8tAF5#%rj|a+284!#uc%k
zU|^=|eO<xp8k58%V~PpKF9a|HvuVuIshG`$zNIH{2?#SK5Et;;fU7208G!k(hZkVK
z3Ph-V0#4!VVvwGs{sakBfX+b!zbTWU$02BINS~p_El?+9%L5S(aRk~NQ9rVY8=|E6
zSO6D9gm@`{D1V4Z@zMaLAROXR03#us;?V%T5b8>gxC@{gq6p~~mxQ^mW3%tdTVPeP
zpSulv?0FGrJ1skY0zv3FoO}aV3$Gr5mDow7u-7WKoy^<45J|n=13_wUkA+Ao?tw@y
z9t$ycBic={5p_TZL;4Kbit7LckO9q#JLv<^0ouS$=uzDrwLV{fyK88iK)nfMPKymD
zW0_fg5AA1oUx1sj06F9zus#DtCcRbN%D1K2J+s;}*isTJ{{J`pYXF~YA+YfRwL&id
O0000<MNUMnLSTXyrNcM?

delta 244
zcmV<Q01N-}1CRocB!AaQL_t(oh3%J14#O}AM4{^auS}P%Vhqec<SfcE3d{>OpQxG1
zNqZete*(aJd7}C~6EhuA31Y?>_;s8RcPu}G4n)Cs1(-^^XHINC1J@UsEL?pyAGSY&
z4n$Er24Eoo@f-k!0L5znRR}`74v;~R;vymn52NfJfMtx&f^A5E=po!N@`T6+#sO3=
z;cWm&8IA*Zx4qf6>i|)yH6UsLl{zOO@O=O&Luwyj#Yu=gK%>1P5I#Uh9E4Z_CKl11
uIkEA50I~KyFtMN}G4OFbY{!4i{s142r+zoi$0y7H0000<MNUMnLSTYc@nOyY

diff --git a/images/level_icon.png b/images/level_icon.png
index 82ea2953e901b07ae743d1d265141e418e89aae0..bb971957384201c42d67ce4c406fb9923736ec82 100644
GIT binary patch
delta 492
zcmV<I0Tcd^0=)!~Bpd;AQb$4nuFf3k00006VoOIv0RI600RN!9r<0K(7!U_^Nliru
z*$f2^8X{yEY(bGWCw~E$Nkl<ZSi|j>O-lk%6o%g!lmWqye^3anU8u`w*(Px3#{VI>
z@NYzaphZy;(oXP$FcWgo!f_Quk<KuqBTO)Jn~&2X1VgAC8z;ecdoR4tz4txm9*&3*
zq<93Z4F<@&q#V4`S>}WS0Z_~lM16poTHj_M7=TzP3INE(Gk+@qa7*=pyi1BXLM#-8
zZoi?gi(oE8JRCzZl0-voqR=aHz5zV!-;>N_2)wYc*3r7S)jFt3*PL%pkZxtUsWk<2
z*@F3<)?M1%Qw9pX;unaS`IS`V{LjFg%Bd2m?_<bJ_H^=<0scy%h4K<(M3O&HcH4$g
zF}QC5NFq3oj(<M@EgPu(a07PR{@mz;XiOWBf#1qGG-zT?Ff>O<x3ZqAz}sJtcS*A}
zi249Bld;N7z<V)QO$mKn1ON!UfJ8Xq8G>K-+ULz@nn9FPCGs@`7o$tm)H-tU40a<s
z5O@I{t&3;l1r}LQn6kc3*xkD!(_uIrp5y50c+DXMkTHxT0RR?R+nF$!M$}N7sHt^N
i!TVROc$<O10X_hfCEH=Z<ISr80000<MNUMnLSTa9hT81_

delta 193
zcmV;y06zb{1dsxdB#}cEk!vJ>0G&xhK~z|UWBmXBKf^!*rUA8mFgSpPT#bjU_rl}O
z?x-^(x#kRb2#h*lz#YIyN;!a>@NfZA6Xbx007(uY<U4Y*Bgr9v%Mx<S0<xk2-7-oF
zB9amzEdWMQ%sq#jrY`!L@)aethE^`11sHs3fLJh~)iHXJOiU3?H3#4{vW#3ukmLYD
vmXPC!p_>av+k~SIpcWYLqIkeVVAKHs!_hu3^uU;r00000NkvXXu0mjfRP<4k

diff --git a/images/lower_icon.png b/images/lower_icon.png
index c476dac2db5da7308b7089b6a51ed831f39da0ba..a4bd9e490f646a1844219f68f438e3c3d113073c 100644
GIT binary patch
delta 479
zcmV<50U-YD0@nnPUkMBa4i`7PYxd`nXeWOGvPnciR9M69S3OI^P!zo{q)iQ^?IaNd
zYwHgXrHhM;C@#(-I66zEg8#+U#o0kbQ7hD%AJ96vXfcUxNg-Mjed%)&8WWrM(pHQ1
zjF<av&b^%b5r7f?J5bn%g@rR;`{MNyQyl)QLEIMuAH5uzq-Lou+eQ5n<d}?t-nW0Y
zTHOiIpk}F1F>hVA)A~7VPHr&A;(l8Ld{Bveu}oj$p|8N-Bk)~&Qfq)FXq=ZkKH0>)
zuYb^72pmLY&2ja7oR`4F&rmiiE<d|%Ln0D~w3znHhHfPIFg@=FffK-TY?m+1YzWlA
zqosn~wwbk1G8E8ly>}7LUS(19y~%$>qGTv=V<?c%<WSEV_{8Dd0ZB%ZAaDZJ$9FQ@
zh-NV{ZNt5pT{1nEf|NMrAyP6FxPN_ss#T@RoSJ}NUu%};szztltSdUyHk4yBI(|AK
z^|uB90O+<3`Aja<ZNZ0~c&p<ps2`IPg_(pb2+{)Ak03vG6S7nybQefvi4aST3?y4z
z#K28(sPky?h>&OmoI7VQ1PU0U>(TCAfQuM#0S|-#X%HAX_==F`-=G(CYG8DfegO10
Vvuwf0;7$Ml002ovPDHLkV1f$v-oXF>

delta 242
zcmV<O01f}w1ndHkUkL>l4Gadc#eRE{XeWOF$4Nv%R9M69S33@XAPl93i6gnVcok3O
z;6+?qJQ8c&Of&+oRs2M{SweYzzLsK4vA-K>H%|3<=x^p$6vyrzu6NkZ!SIpW^)8x}
z@BHSwdiobU4#1`;3R;a({CWny2_RI0sWo*U2n1y$W~wh(5GV_hVo8!kgd`9iOM_lF
zb4!;2kb*!CSKWpP2=s6WK%}l2jTbA$>O%dfW(#|lh;wv8RE+2QfOO2tMxlfW6f_0q
sIyM>2cb>{!@a~5R{5H^Qpv(iSEyTw)7>@8U`~Uy|07*qoM6N<$g2|_8Qvd(}

diff --git a/images/raise_icon.png b/images/raise_icon.png
index 3f9ecaa7b2b33d6114097c6d2ee6a01f28fff5a7..96d81a916f715e7236071a278b5bc2604752974d 100644
GIT binary patch
delta 371
zcmV-(0gV2i0_+2jUkMBa4i+<_9Rt6SXeWOGM@d9MR9M69md#4TKoH0OSz5OiYJ2cd
z@SyY+#7ho};7#x*_%yzc;9bO^=1|24XgzsRsKKVOC8Alg>3A|2KN2@2e!%{2J3GVt
zXP8+Q&}e=cBTtard?YXQ004vF785x!*3LG5MgVO^<OU9UejflJrUK(|jCQS^ON4)+
zQnjQIzI=$2zapjr&FUO#Y*x7&nF4In!s`5bqUx{6(+xwl<yokTU|DTfNe%#<akQ!}
z9NZm}ZCaWBm9$GQ^w9S&l?RJ64)=NVE#FiDC+;bZ+~fGX(p<(;eG#1Tgx~r71+JfN
z5K<W1hGJO!8rr4>&SofxM8du|*vDVa!gj7TWU2w3dgp`fZRMp4C>kw53#h0Dynh>1
zc3$&8zGRJFgUF#$lF6<_up1buLr4xGx{AsXV9V?+kX`wyV-e7Z^vr4g9xvwrrpFt4
RT|oc<002ovPDHLkV1kL=t%Cpn

delta 165
zcmV;W09ya-1D^trUkL>f4j>oBY1E>TXeWOFdPzh<R9M4fU>F6XV1NN5Ihqby?O|YG
zVEB)0j{Pwg`ZxfK<rF!BkqQ=5<Pb(8Ehg4-k{!WBq=ElQ4B7uk4kteZNC<YaLxO3b
zvmw)vDhCKe30c{2Gzvx?FzSE-cfcqZd`&X0*<Al=Y2mljZ;Ye4U=)mkK?MNNMIRB>
Tzbh$>00000NkvXXu0mjfW#&IZ

diff --git a/images/rotate_icon.png b/images/rotate_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..16fd13f5ebb2f4261341a7395bce4f24b42df4e1
GIT binary patch
literal 450
zcmV;z0X_bSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXh-
z4j~km5EkG700BZtL_t(o!|hiwYQsPfoITRTFL0N}UBE9%o5$oC_9No>8TmrMSdGC&
zK41r2WzyWi`LsIi=}bg|7Pb(G+1a_%?np>t%y1Yv{s93IYT1bJ*A!rqZvbAb{Hrga
zNDJWuz#}R33Is_D;{ibZ5qN+zfOQYp)_48opYH+8jU-&II6c_02P8=TIe>)A6%XAV
zG60QF09XtmLGn5Qe*4@2d<NKhrziISPZ7=u;JyQ=Rh*T@b0k&@p3}bRaIUY$Pe}{y
zIJCQT*9CC7!GKzjqRokE8BGKx0)K<R)7S)-hBa)mYduS?MIauX%UYk9jP|WE+Fi05
zWtOPWl&TOFj#v85><LA9_6h_=W&=!W?38vL-RpjU#0ubhvQA6Wy3Vt%xDnwzQo|Ca
su1jqBT7<^}0taK^+x-_zqqs7D03Ic8*hk#*;{X5v07*qoM6N<$f->>A6951J

literal 0
HcmV?d00001

diff --git a/images/start_icon2.png b/images/start_icon2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec163d103ae8665e8f7d67fa803aacf8d3abb5ea
GIT binary patch
literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXh-
z4j=*J*278w000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0005+Nkl<Z
zSi|ksKWG$D5XbS)?nUxP(O{tx6Z{7jR$`ObT384cf_9>ft%6{$h=r9FHkKh>)Iw2A
zA&R9I3KkNKO%NNgG4aHBad&L?&Lbw5Tyl4cWR``u?BmV%{buI9Vcq^oi)FrBXh{Qz
zVGJRWxGNgYZi@;NqIh1r)Cn~f0^AcqS#DDJZd|xf`=56TAQvh^R^WUwEgWu@n{-99
zN;UB}D%pi+W`u{*wT2{ZB3%=KKG5TvKxSS^rgycWNt>>fq;Rrb;-FCRQ)=3box;}I
ziqUEX76TfP=o3EMX5L4PDm!6H*V;?AJ_(n4v$}Cbt|ELD-WaW|Gt(HQt0l)+P}_4R
zl$@36mnut~24#s&&7|x~6j)4=tWYD0@szh7yV=?tSWb~rQ85*~cffT+?Fm7nOYDPi
zMdGPBv*y~9gbSt5gm-e!h2sJ*YwL|QTNf(@s5+jOyCWPCc6*}N18`%t1=$S1C%JRN
zpci^vvq$&ZFRbMNsyn|dj0oK(ZLy<u*Y;8X_3^$amkOythYYl~U#JK8UEg6|xGFay
z3U_IHnw38Ra$~|#KWq@#+ujbT3Xln}gj>RX8P0U3J*xuTmm3!Pjoa*eXWB8CHQ~0f
uPw+RI(np3JbJCDgoprpJ#JP3*f9)5FRb;=P-_?)+0000<MNUMnLSTZqITtek

literal 0
HcmV?d00001

diff --git a/images/station_icon.png b/images/station_icon.png
index 20071c6ec76f13183ba54376c686b90cb4f958f4..ed485ebffe43330bc8f671f65e4ce0a7c5369f12 100644
GIT binary patch
delta 279
zcmV+y0qFj+0+9odUkMBa4k8;Yf>^SVXefW|Nkl<ZSi|j<F$#k)6o&tlf?0KS>FnkW
zyh0D;luLLC>Eacfyn!wSadAj_xCjpE+7=@=O=zL{z(FK@A5VRN$K&yQ8TRgh+xet@
z7GADy1GeO*5zMCCB!bzNfATth^CJ{Od?d*8+&n-Cfh0*35gEzHam2DLY%79o$<u!{
zRns(~>pG)=d7dGqL>$N32<A$@H{!5%$d()cIOm9>2*WU_T@$FP%9?y_5=Buk?F7oQ
zR78ZfZK0I1dIdp%Fbt7p+0!JBk2gewzVDs=^PF=?DWMH$ng(@UJ6$}l0nEknF<nX?
dkLN$R1J2X189Y&qTL1t607*qoM6LruV1kMLeqjIr

delta 183
zcmV;o07(Cl1F`~;UkL^W3JM1GY2r7LXefV;Nkl<ZSi|j<%?*Gc425|kxPdD<P){Am
zmE6D)@Z!nHkI<qq?@Kt5=6e)M2!s&wGI(0BFLQElS~uSSIeBXcSjt;Mz*^pO9p8L}
zs@f$Gk@n(K9(z{l0LaNjBwBPpRgvlhJmobZQXMdpU)}<00+`ElA#MYVoIH4rV9g^a
l!dqSnfe~_(Pl*unTMh^bND#s#)j|LO002ovPDHLkV1k{yN+|#U

diff --git a/images/track_icon.png b/images/track_icon.png
index 2ee84db1eaf49df73ee248e0fa8865cb802587f1..e2ef50745a994ed627a54df1abe8dee426f58e04 100644
GIT binary patch
delta 279
zcmV+y0qFjP0{;S#F%Je}OGiWi{{a60|De66laVeT2@C}e7#Zg!=jV}DD1X{XL_t(o
z!|jtXZo)tiMc>-kMy9cZXt_X28YB(?loZgW;EtSvG8dpkq(ZjW_98D85)_1WvJKJv
zcAr*XGjBlh4%u!Nb~T?_-z-4yr^nAJRsnTm$P3N#1DmDK`6PT~m4e+D>emHMIVd33
z6@{)aIh^%#K1&~2rT#d9TX6gJIJAwqus`tf%PuTH-~uIagl*l{+J$v45C#E*w2yDr
zS;9-(lEjgdg!imSC=!Z<BB4kq5{iT(;s24a)HQW&@XfxQz%7k2lQ`;q`)0eGVL2LR
dN8hXj;0i$#7-n}eN{#>k002ovPDHLkV1h;seii@#

delta 159
zcmV;Q0AT<B0)+yQF_A+Y2?YZVBoVT9D~FM2D1UNEL_t(o!|jqW3V<*W1V`~bHdg6V
z-(!7>zYwf#V<lJ}Cm0f8w>y}GWN$$ELoBCaIhC(jfXTgVrg(GY?7A^{+}OHZw}Jch
zmSewp%XZN~-z$)Wl28&#LP;nIC7~pggv}dxWC4x}Y`B3F*ekFK7xVQ|vi(R3-T(jq
N00>D%PDHLkV1hs6LVExJ

diff --git a/include/gui/ContainerWidget.hpp b/include/gui/ContainerWidget.hpp
index 7c13cbd..77279bb 100644
--- a/include/gui/ContainerWidget.hpp
+++ b/include/gui/ContainerWidget.hpp
@@ -35,10 +35,11 @@ namespace gui {
 
       void addChild(Widget* w);
       
-      virtual void handleClick(int x, int y);
+      virtual bool handleClick(int x, int y);
       
    protected:
       virtual void childAdded(Widget* w) {};
+      int countChildren();
 
       typedef vector<Widget*> ChildList;
       
diff --git a/include/gui/ILayout.hpp b/include/gui/ILayout.hpp
index 3309c13..da49a68 100644
--- a/include/gui/ILayout.hpp
+++ b/include/gui/ILayout.hpp
@@ -40,7 +40,7 @@ namespace gui {
       virtual Widget& get(const string& path) const = 0;
       virtual void render() const = 0;
 
-      virtual void click(int x, int y) = 0;
+      virtual bool click(int x, int y) = 0;
    };
 
    typedef shared_ptr<ILayout> ILayoutPtr;
diff --git a/include/gui/ToggleBar.hpp b/include/gui/ToggleBar.hpp
index ee27ee0..f54c0e3 100644
--- a/include/gui/ToggleBar.hpp
+++ b/include/gui/ToggleBar.hpp
@@ -29,6 +29,7 @@ namespace gui {
       ToggleBar(const AttributeSet& attrs);
 
       void render(RenderContext& rc) const;
+      bool handleClick(int x, int y);
    private:
       void childAdded(Widget* w);
 
diff --git a/include/gui/ToggleButton.hpp b/include/gui/ToggleButton.hpp
index ea173dc..5f0edb0 100644
--- a/include/gui/ToggleButton.hpp
+++ b/include/gui/ToggleButton.hpp
@@ -30,9 +30,13 @@ namespace gui {
       ToggleButton(const AttributeSet& attrs);
 
       void render(RenderContext& rc) const;
-      
+      bool handleClick(int x, int y);
+
+      void on() { enabled = true; }
+      void off() { enabled = false; }
    private:
       ITexturePtr texture;
+      bool enabled;
    };
 }
 
diff --git a/include/gui/Widget.hpp b/include/gui/Widget.hpp
index 86a981d..71e74bb 100644
--- a/include/gui/Widget.hpp
+++ b/include/gui/Widget.hpp
@@ -57,7 +57,7 @@ namespace gui {
       virtual void render(RenderContext& rc) const = 0;
       virtual void adjustForTheme(const Theme& theme) {}
       
-      virtual void handleClick(int x, int y);
+      virtual bool handleClick(int x, int y);
 
       void dumpLocation() const;
       
diff --git a/layouts/editor.xml b/layouts/editor.xml
index 08a0921..48fac62 100644
--- a/layouts/editor.xml
+++ b/layouts/editor.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layout>
-  <window x="10" y="10" width="320" height="40"
+  <window x="10" y="10" width="325" height="40"
           name="tool_wnd">
     <label text="Tools"
            name="tool_label"
            x="5" y="5"/>
 
-    <toggleBar name="tool_list" x="65" y="5">
+    <toggleBar name="tools" x="65" y="5">
       <toggleButton name="track" image="images/track_icon.png"/>
       <toggleButton name="raise" image="images/raise_icon.png"/>
       <toggleButton name="lower" image="images/lower_icon.png"/>
       <toggleButton name="level" image="images/level_icon.png"/>
       <toggleButton name="delete" image="images/delete_icon.png"/>
-      <toggleButton name="start" image="images/start_icon.png"/>
+      <toggleButton name="start" image="images/start_icon2.png"/>
       <toggleButton name="station" image="images/station_icon.png"/>
       <toggleButton name="building" image="images/buildings_icon.png"/>
     </toggleBar>
diff --git a/src/Editor.cpp b/src/Editor.cpp
index 3cb8ce6..aebc9db 100644
--- a/src/Editor.cpp
+++ b/src/Editor.cpp
@@ -252,7 +252,7 @@ Editor::Editor(IMapPtr aMap)
 
    theEditor = this;
 
-   layout = gui::makeLayout("layouts/editor.xml");
+   buildGUI();
 
    if (map) {
       map->setGrid(true);
@@ -266,6 +266,29 @@ Editor::~Editor()
    
 }
 
+void Editor::buildGUI()
+{
+   layout = gui::makeLayout("layouts/editor.xml");
+   
+   layout->get("/tool_wnd/tools/track").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, TRACK_TOOL));
+   layout->get("/tool_wnd/tools/raise").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, RAISE_TOOL));
+   layout->get("/tool_wnd/tools/lower").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, LOWER_TOOL));
+   layout->get("/tool_wnd/tools/level").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, LEVEL_TOOL));
+   layout->get("/tool_wnd/tools/delete").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, DELETE_TOOL));
+   layout->get("/tool_wnd/tools/start").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, START_TOOL));
+   layout->get("/tool_wnd/tools/station").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, STATION_TOOL));
+   layout->get("/tool_wnd/tools/building").connect(gui::Widget::SIG_CLICK,
+      bind(&Editor::setTool, this, BUILDING_TOOL));   
+   
+}
+
 void Editor::setMap(IMapPtr aMap)
 {
    map = aMap;
@@ -607,19 +630,23 @@ void Editor::onMouseClick(IPickBufferPtr aPickBuffer, int x, int y,
       amScrolling = true;
    }
    else if (aButton == MOUSE_LEFT) {
-      // See if the user clicked on something in the map
-      map->setPickMode(true);
-      IGraphicsPtr pickContext = aPickBuffer->beginPick(x, y);
-      display(pickContext);
-      int id = aPickBuffer->endPick();
-      map->setPickMode(false);
-
-      if (id > 0) {
-         // Begin dragging a selection rectangle
-         Point<int> where = map->pickPosition(id);
+      bool clickedOnGUI = layout->click(x, y);
+
+      if (!clickedOnGUI) {
+         // See if the user clicked on something in the map
+         map->setPickMode(true);
+         IGraphicsPtr pickContext = aPickBuffer->beginPick(x, y);
+         display(pickContext);
+         int id = aPickBuffer->endPick();
+         map->setPickMode(false);
+         
+         if (id > 0) {
+            // Begin dragging a selection rectangle
+            Point<int> where = map->pickPosition(id);
          
-         dragBegin = dragEnd = where;
-         amDragging = true;
+            dragBegin = dragEnd = where;
+            amDragging = true;
+         }
       }
    }
    else if (aButton == MOUSE_WHEEL_UP) {
diff --git a/src/gui/ContainerWidget.cpp b/src/gui/ContainerWidget.cpp
index 66c90f5..8a349cd 100644
--- a/src/gui/ContainerWidget.cpp
+++ b/src/gui/ContainerWidget.cpp
@@ -50,14 +50,28 @@ void ContainerWidget::adjustForTheme(const Theme& theme)
       (*it)->adjustForTheme(theme);
 }
 
-void ContainerWidget::handleClick(int x, int y)
+bool ContainerWidget::handleClick(int x, int y)
 {
+   bool accepted = false;
+   
    for (ChildList::const_iterator it = constBegin();
         it != constEnd(); ++it) {
       Widget& w = **it;
 
       if (w.x() <= x && x < w.x() + w.width()
          && w.y() <= y && y < w.y() + w.height())
-         w.handleClick(x - w.x(), y - w.y());
+         accepted |= w.handleClick(x - w.x(), y - w.y());
    }
+
+   bool inContainer = this->x() <= x && x < this->x() + this->width()
+      && this->y() <= y && y < this->y() + this->height();
+   accepted |= inContainer;
+
+   return accepted;
+}
+
+int ContainerWidget::countChildren()
+{
+   return children.size();
 }
+
diff --git a/src/gui/Layout.cpp b/src/gui/Layout.cpp
index 37acec9..7871019 100644
--- a/src/gui/Layout.cpp
+++ b/src/gui/Layout.cpp
@@ -43,7 +43,7 @@ public:
    Widget& get(const string& path) const;
    void render() const;
 
-   void click(int x, int y);
+   bool click(int x, int y);
 
    // IXMLCallback interface
    void startElement(const string& localName, const AttributeSet &attrs);
@@ -170,9 +170,9 @@ Widget& Layout::get(const string& path) const
       throw runtime_error("Widget " + path + " does not exist");
 }
 
-void Layout::click(int x, int y)
+bool Layout::click(int x, int y)
 {
-   root->handleClick(x, y);
+   return root->handleClick(x, y);
 }
 
 string Layout::PathStack::str() const
diff --git a/src/gui/ToggleBar.cpp b/src/gui/ToggleBar.cpp
index 750b744..ab84027 100644
--- a/src/gui/ToggleBar.cpp
+++ b/src/gui/ToggleBar.cpp
@@ -16,8 +16,11 @@
 //
 
 #include "gui/ToggleBar.hpp"
+#include "gui/ToggleButton.hpp"
 #include "ILogger.hpp"
 
+#include <boost/cast.hpp>
+
 using namespace gui;
 
 ToggleBar::ToggleBar(const AttributeSet& attrs)
@@ -25,7 +28,7 @@ ToggleBar::ToggleBar(const AttributeSet& attrs)
      nextX(0),
      buttonWidth(32), buttonHeight(32)
 {
-   width(0);
+   width(1);
    height(buttonHeight);
 }
 
@@ -48,4 +51,16 @@ void ToggleBar::childAdded(Widget* w)
    nextX += buttonWidth;
 
    width(width() + buttonWidth);
+
+   if (countChildren() == 1)
+      boost::polymorphic_cast<ToggleButton*>(w)->on();
+}
+
+bool ToggleBar::handleClick(int x, int y)
+{
+   ChildList::iterator it;
+   for (it = begin(); it != end(); ++it)
+      boost::polymorphic_cast<ToggleButton*>(*it)->off();
+   
+   return ContainerWidget::handleClick(x, y);
 }
diff --git a/src/gui/ToggleButton.cpp b/src/gui/ToggleButton.cpp
index 1837d4c..a4d7fcc 100644
--- a/src/gui/ToggleButton.cpp
+++ b/src/gui/ToggleButton.cpp
@@ -21,13 +21,22 @@
 using namespace gui;
 
 ToggleButton::ToggleButton(const AttributeSet& attrs)
-   : Widget(attrs)
+   : Widget(attrs),
+     enabled(false)
 {
    texture = loadTexture(attrs.get<string>("image"));
 }
 
 void ToggleButton::render(RenderContext& rc) const
 {
-   //   rc.rectangle(x(), y(), width(), height(), colour::WHITE);
    rc.image(x(), y(), width(), height(), texture);
+
+   if (enabled)
+      rc.border(x(), y(), width(), height(), colour::WHITE);
+}
+
+bool ToggleButton::handleClick(int x, int y)
+{
+   on();
+   return Widget::handleClick(x, y);
 }
diff --git a/src/gui/Widget.cpp b/src/gui/Widget.cpp
index 74c7a2d..388fbc2 100644
--- a/src/gui/Widget.cpp
+++ b/src/gui/Widget.cpp
@@ -52,9 +52,10 @@ void Widget::connect(Signal sig, SignalHandler handler)
    handlers[sig] = handler;
 }
 
-void Widget::handleClick(int x, int y)
+bool Widget::handleClick(int x, int y)
 {
    raise(SIG_CLICK);
+   return true;
 }
 
 void Widget::dumpLocation() const
-- 
2.39.2