From 4750da714eed2607b8a8b9d71a40aa2a08bda7e6 Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Fri, 22 May 2026 01:09:26 -0400
Subject: [PATCH 1/7] Update author listings to reflect new lead developer

Alexandre Quessy is now listed first as lead developer across all
contributor files. Sofian Audry role updated to original lead
developer to honor their founding contribution.
---
 README.md                           | 4 ++--
 docs/informations/CONTRIBUTORS.html | 4 ++--
 docs/informations/CONTRIBUTORS.md   | 8 ++++----
 src/core/MM.cpp                     | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 57423103..e0b9279d 100644
--- a/README.md
+++ b/README.md
@@ -42,9 +42,9 @@ or else the menu will not show.
 
 Authors
 -------
-* Sofian Audry: lead developer, user interface designer, project manager.
+* Alexandre Quessy: lead developer, release manager, technical writer, project manager.
+* Sofian Audry: original lead developer, user interface designer, project manager.
 * Dame Diongue: developer.
-* Alexandre Quessy: release manager, developer, technical writer, project manager.
 * Mike Latona: user interface designer.
 * Vasilis Liaskovitis: developer.
 
diff --git a/docs/informations/CONTRIBUTORS.html b/docs/informations/CONTRIBUTORS.html
index c0dee2ad..5cc00e3a 100644
--- a/docs/informations/CONTRIBUTORS.html
+++ b/docs/informations/CONTRIBUTORS.html
@@ -1,9 +1,9 @@
 <h1>Authors</h1>
 
 <ul>
-<li>Sofian Audry: lead developer, user interface designer, project manager.</li>
+<li>Alexandre Quessy: lead developer, release manager, technical writer, project manager.</li>
+<li>Sofian Audry: original lead developer, user interface designer, project manager.</li>
 <li>Dame Diongue: developer.</li>
-<li>Alexandre Quessy: release manager, developer, technical writer, project manager.</li>
 <li>Mike Latona: user interface designer.</li>
 <li>Vasilis Liaskovitis: developer.</li>
 </ul>
diff --git a/docs/informations/CONTRIBUTORS.md b/docs/informations/CONTRIBUTORS.md
index e3514666..07c7ca70 100644
--- a/docs/informations/CONTRIBUTORS.md
+++ b/docs/informations/CONTRIBUTORS.md
@@ -1,10 +1,10 @@
 ## Authors
 
-- Sofian Audry: lead developer, user interface designer, project
-    manager.
-- Dame Diongue: developer.
-- Alexandre Quessy: release manager, developer, technical writer,
+- Alexandre Quessy: lead developer, release manager, technical writer,
+    project manager.
+- Sofian Audry: original lead developer, user interface designer,
     project manager.
+- Dame Diongue: developer.
 - Mike Latona: user interface designer.
 - Vasilis Liaskovitis: developer.
 
diff --git a/src/core/MM.cpp b/src/core/MM.cpp
index 6f8df50f..bae9a734 100644
--- a/src/core/MM.cpp
+++ b/src/core/MM.cpp
@@ -24,7 +24,7 @@ namespace mmp {
 
 const QString MM::APPLICATION_NAME = "MapMap";
 const QString MM::VERSION = "0.6.3";
-const QString MM::COPYRIGHT_OWNERS = "Sofian Audry, Dame Diongue, Alexandre Quessy, Mike Latona, Vasilis Liaskovitis";
+const QString MM::COPYRIGHT_OWNERS = "Alexandre Quessy, Sofian Audry, Dame Diongue, Mike Latona, Vasilis Liaskovitis";
 const QString MM::ORGANIZATION_NAME = "MapMap";
 const QString MM::ORGANIZATION_DOMAIN = "mapmap.info";
 const QString MM::FILE_EXTENSION = "mmp";

From 1cdc7c896f141d1df9d6bf8da198fd92068c057a Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Fri, 22 May 2026 02:04:01 -0400
Subject: [PATCH 2/7] Add Art Plus Code sponsor logo to splash screen and About
 dialog

The logo is part of splash.png directly.
---
 resources/images/logo/splash.png | Bin 12990 -> 20819 bytes
 src/gui/AboutDialog.cpp          |  14 +++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/resources/images/logo/splash.png b/resources/images/logo/splash.png
index aebcbd9e660153eae9d482659dd1f24d41423ff7..412185f6697f573830646950283d80025ad53c24 100644
GIT binary patch
literal 20819
zcmdpeWm8;l@a5p{?(Q1gHMj%_?(XjH?h=A~a1ZVd3GVKM;O@RRzkk(k?Th^aTNE(d
znMdYMKi#MMoF+<1Q3?qjA07k(A<0O8Rsn&)wt>gJu+YHIb(A_B;1{Whw2A@<<V_6%
z1%`q^&%mX?LlDS~6$Cmq1cCU{K_DE*>~>`V;0b7BIjPT}kAGkJU8O0&6*xy}Ef)|7
zvhLqE*a0I=32+g{RYpMq<`@bGgn&Z~&P)tkqH>kcbTu_{HRCgJHUoZv*jU-Pm{>WP
z*w|Fr*!b94`PjG^SXud4S?Tr3#{aJYb`GXi=3f8r0Xh&Fj=%ug|Gk2%m7ST3tC5}K
z{~5!s3e5fK6CWG<|12`RS{w+B!TUGntAn|#hmo@x$iu^f*~;F=#l*<bjM>52BI{fL
z9|ZdHB=cER)pPYM$HQ|@{b8gh*_LJ!IfL@FODf&yf~^Cm(XS(5!{LFMX`>iZyWMIF
zdlkHxNe>hLo7Vj%!#JumINVB9&hq#33zQ*6!j-6$<)xo~!czltlF7wBW?EZ5Q@js^
z@u=X?A$^9dxUM^08=(Ilf}_PX5cxsJ{sqN?Il=_OI&gpc_X0$cLe$;|ACDTHi&M~K
z23-48;7kmd{GB@rE+R1Q(&+ESM%y{D6h9%nV;)#h3fPaL?|5wg%^l143CyzD<Dh*#
zlRx_@P%0#f<-hB35-^58iijp5)1fRr{hMWn*fWir?SJNDln=!FZ({KOKOSWE_lwp1
zm5kpLfxU8H`=9ry!yzi#zMV->R7may+`~1yuSnOLp@FEsATY#4NI!b+@`OoY!8!1Q
zMw=+3dTqIUI>r#Wi{`BRu5|al`~k;~fhwf+>KGG(8gZIFYSix#dYL?(@$3NW291D$
zEM98C!6TC)%dbg_>^*Zs)GLElY_HtE;@XSJDf{9fiK8AO*5&lwfMaZ1vx2$95R$?Q
zK#IDT%c0jt)%T3Y3xZAEOj~l)X{N)z@M%|L3t$*5P+V>zz3h0!xA9c=K`ujF3c%#z
zfM63T!Id#r#+Tu)^TVR*SOx}{xKSbd3c#ia&J24z@UWrIjH*i1pQwiHTPPrdO8@$p
zx8hW*122=R(?0BsYq8j|4&H#1RfVgECLGb%<V1t)J9(#*d;?auRXU=$BrMH+KtAv@
zXw)|BAs)RHK*>==hzo~vQsBU+?(YtkEK;6`jaKIF9QD^YT}d+X=#zs5N6AqigDi#q
z3EMEDGQoOvCpdra=VYCk<b&qs#}EWfgAgw{V7yZ?AfI&{hLq@w(u91yu*#fSXOIk!
z3aPIz{#!DX>(4gvy=Mj7-_i$#c|JoGn-0tV^FZ0ekj8Xajfki^@B9p^xE&$ST#Y+^
zs%aS4)3XwC9!16dk<X>@)shhULoA6Rfl;*=h4&sZ`BT9V9S_!_DHi@gLTrtFVEE>E
zm-x1E%@_Sn*~d`vdprv$=mIj^_qzLahH3OX$m0SRP*vq(c->L8uvxW@a}<6L?hv?>
zNku^!hamY-tAQJVMs4cu?$}zyZKxor{P!xqJpy<`;EwRAx60lKbdcnR0c#iCZ!?(r
zK+H|_L2B-6N<@$iIO!I{`gBme!(kYF^lF&*bg$}rprv=+f2t}RNZjE;){c9Kj(%Yf
zm=YcH?G{R4f#!NL&e{;&zFU^s@yeBu)Cj56<(_avX%<ClV0;wlrZ)}ZK|t;#eqqIr
z+y3fL^ksk@%^l%q7_fTJb|r+H!HrHw@zkb0sK~$0jO<=>On?nPT+J8awCkYd7x~{a
zb&i_1pwEVPizwSqy|=0J&^ooNtm%)>B;EGIcMB^%;#X%53?fDuQQv;yWu?P*zytdp
zAOX+dVXiap3!3{X+>fI&?gjCkYld@Kh56(2CB_c?509+162xTMKHGZF4q@UxZGlz3
zepPXIdeLbSOodJR@MBa+uuxDTt#=1q#SdBEt`9`^b%YC=zdAOo*kpri3Rk`c8}8(N
z0cpQc#Ykn)KP!i>*oOZ$y?;i?-2<O8*rj(SwsUtN>>FGXzPj6Hka~lITwfg%(V`ZI
z4H_cvH)Rt~?&Ov=A>SiZ9~XlgD?aO)_Qug<bfqQ^y0&+DA)rrOG(#6N<jN`+{Kg5_
z7#Q|Uj?-ZH0FxMyX6=~6x}I=~fAi{L<90Tk?g}~DF>xk{IJiCp>{lTaVu#EQQJV?F
zh`Re7iAgSjQYQ7otijM@C&_^sb&lFwE)+sfSC=eNLi3y-!yq7Bor=t6J%&~m1T{r4
z<>G(AcD1Y{Q-lV7UQ82R`0A(<x(C{vB2n?kN9tW24HCG7#k7PnkU_7Hk;SIsyWkB-
z*t@j6;K=NaX>HVGoF6#w5)P2w0LRg6O3nD-XU#XW`eqHw%*5W<vjlg4$ntFuoZX{-
zNZvz`!)K;FoG@?ugS=|S^40%uZ$6GM6wJx7&19tDlGKNPk5{LKz!a3OJ9!jp#aK#}
zj2N!l-Ua#iAh%;a=Zl-UeaXK4&4DL5eUGXrtb72g0{GcG7qrcf?w%-CofksQ>E{VK
zMM%xUKQQ+PhK$xdiy}8La><|lu*V&V0>&a3VHsaENXcMbgKMj_KqnnjZ*O-~7Fn4f
zmu$i)eCcU#9<ax_#OcsI9!t*dJRV8Z&_I_PNWR<e#4>TK7v1mArDhS<wLG~9W%-Pm
z;E0dk!F?E<WE6OEZ;npwtT7B$$1cIqtot;|UWlk=&@CCCw|PFw?^TJ2K?~dkq?i8u
zndNX~p`!zEkDG|;(&*#giiUFfUdmuAt6vL;j0*$~5#=qJ1)Zs8Gggx+g*n7;s8d!D
z>Ae&xrlAvs(^2_YC=ELEk}1p0sTpJHE;KCwFO$mo+qfVvlv=5P6T|iH<%dQ1eUBld
z5F1;vBjJ~pI$O|w402%d_qhHnuST0fF6GMV9P8(|U%Qp@7t>p4kh#$<QK(CLmZ7^p
z<pL0fcfm+`cr?i&RnLM5ad6)aGqvh{-CSu)FI7hnbh%C{9@<p19xIMI5FjCC`!w!2
z8NM=1Z(E$p={SgqiH(EGRudt~E~B|T(G9Q+Mf9lUo1WCG%f9$7?1{lb^29?((LGjl
z_ef|%;rBji_*-`5s%93J<129D_mzef*{36|s?B2#7B#yy2~3q+<K;1SAHx<RU>-sl
za57F%Hi0Age<N8{3=9bgf$Pn%;ucdV@_rC^a1`x;4W(htVp7FOpAXO08hsIVU-LFg
zjr~eR-K`(={i&(ouc@}V<zzx|J?3cX(uu^^u&4^X-<he>Ok*nRYupYky*C24y?U_7
z$jxibHV;C!8_kuX2kcoBiZQ=VT=~}T@^sMf@r_&jUg9^F>s=f|YPfltgr6V2DBDg=
zP7WvMeLyPp%ohfeZkN*#+s+GiIa8sGe90dEol>f-ZC<A4>+^6Nk2V0aW>;BO)*F2B
zz1NU~tAdC#i4yMZ`EGby^zE!!hY{PC$3s74vV6h%@)E*>U)TJ4Y*yIm6MM(z0U@6$
zDKzro+_rzFJasm2N<4;DsS~r{z=^-TC=jrFr3Z>KtJy8^cWGgR4G_VJ6a|qai=_EA
zn5V|x4IP9J&qqEidNFG7t5FBxG~)VWxy_B%;x~}^N&yF^Xkox1TDh=&r;#WA;opTd
za<GrZp&5A5^MK6Zko#kqSq6QvdMkRJLE|{p{R=9jF1uOh+WAGnzzD0&q{Xk%_CJmR
zS&P-IUb~t@_wIH&dqWzVk`fYOI;&(dkbW<>!~722KVVhaGscmyw+lkPIyI%dm~mxX
z9^q^)zGUllxH_+S07&xcsT1naWkt63ZP@ZjkibR~TOvyKHMIA}wJ2OLbig4MbvJdT
zOp@YJZ^l*oO*!jM3l&m6;K}M%=4fTxC4EAzDHTezmw`oSU&)t1e2Q3)D4K;71)fF`
z7oxXg=*-9UBDhv4FV3b!zRY9GTs~ltNqHmr^K^q0PUqV&f_(yd9-CM8oS(@^tca3Q
zqE4-bftc8>=ilEEtQLz|kqI%y{(hM!2Ee{bum}2{Mv^H@9WccrHOL9y$}Rae*n;T4
z8iM$8upK(@1=`)u*6WDXkRf^F2X3Z>!pTBlTD#)DQtPRmyhmY3u7xgTkykCj?DZsU
zM$8n2FP^x(z1$7Uu?WnRxno4-yOiF0K2&Su&mFC=)_!M7o+<LdDSa8}7yD%VNZO*`
zP;h&)hQYp-q3D-^U)?!%t~n*wA`)^TCBC!@p^RBBRqRZt+J)TU?^j^ufA8)<gh5Cc
z>apdEN3_~xcgdUkcmaVc_|w0C4?Za=$t~L3RvzOA@~O>>PUVc}g6z#Q#RFN1Op3Rk
z`Qx;zz{@-Zk~c9NndMqDmU$O9gtwn#m#_g&$_XwAtoNJDo-Pjt(Q1oB$j7=r`+|)M
zyKsjU9%=P{D2I!&Pc&cZq;0cE>6|hW^{&?>%WEHpg`9PKATrW|$={B-t3T{>N&fF*
zT|zH^_E30k9oj>p_N3^^FIf)$kdp~b+OI97)K<XL?t!W$5mHu8Z*#NcsZTduKyT0Y
zKiB*}u_JsDdZVY8pTwB5YWfL9E5rqjK@+chD=5H-h$8HXv*~N0*!9e3e+r8`Hg<JY
zYS8hDCkCtCY#Gl>(it?Z)U|dIprnL49FJ$;qJSxZiH${3BGYK6bD&5xU1MjHE#xw}
z?{cx+1~X^hrGFLtZa8_c+-N4XVK;X)U2Q`naD6El8COqox$ZSGq1kb6V5<Ae^+m88
zPJz9$gIZ@19EpP?<N!)K`NBIyPX*TDbJp*7!!6EFj)YQ6p9_t_paUZ#9ml;dI4Nm3
z-JaMJ1YA*SdfbzxRtKC2spB=^U&gia@*5k+?RE0L<yvN@E1eCfi5<mqZ)Jo8_mg+n
zO(dsW=B+u1`TGYA1QZt+(=sxC78M1XRm>TVaOoMm2zamN@z@gT!sp29G9UF^_jovC
zCX$0q%>EV$+#QG=BO~G`WJyGlA3P87IX?BiL&DJ}rSdgCCAv8fFbUf)VZsc}!hlnp
zJ_*V3hgl3*Nn<vdXb-sB9+)cZTo;N|K!yBqd%lz8qk^G*fvSPP(&{fHn^Et(j(DbW
zLM0P?h!s$Gfo+%nW++XMvAw&CKGaODQ25E_uT7*2S>pa?hr__UPK`@zZB^BkoQ;b2
zgNTYs;YRcA4UW_0v~tx}-HJW`h*LU;k!_q^Q;eg(KiH<XMf`3tm)W%%uCV=&T~CXH
z%pSw~esoN1?C2jQQDt$-vnmnqo#ie15mqhw1}7G9V7q%JS39RIs90D>NiQg%uY{Uh
z>NWZi3m>+sjehfyWUz2GTa3Q%9>Tl7W-#2>#Kgrf7f)DPPsh4ld11yhs?=>Smg~E8
z&PDAm1-_iU9oRQ~ny7N`CXC(xDXaN8$vYU*;2!4d#G*>V;89~b`-5D>-@l=cJie?h
z(1nFX+5Y$UR@~d?{0?rd4t*YSbsyUWk}Xq722KmYHejHDTHVrRZliw7u(r%fM*7`T
zsy3G;q1W57yy&wjfje037HgxIwUtZ@5G^}yQbxJ1|9rPzmiCLs{i#>!-@iT=-AGIN
zf-^fpVu8S&y_`Aa#wyVO{Tl6#^{|+<8_Y?wS}Vcg^EkI`sm{+w?Qp*s+0Q0C6?R;<
zH;|4bE;_~wq>d)n54eH&mWqe@a9%z_;`k(BRXR!A>~=hTnGUT{km^|^6o#WKOfvzF
z)Xk4jqcO&Wjo>CnGxefB105$R&S{ghI*5~K(L2?33H_60pZ1<p&OSQ9yeI0?vDoTn
z_@s2Z@1tXEhd1DPALZ5Iy-+f1G?T+BShW1@v^lCUlGBC@45XOD8^dlfcXlr&A!+!F
z)U5YAXH+aZTJFQ0hcv&}s=bb*BkHE_n?&g0T~l;z>U16IP;>Gu`uvaqgZf_9Qw-s`
z&+U$nquN9UPm&%K$%H>f6x>zxl<x1b5sWWA!RriOaqS<0CMnm)oFA*^FO}-mE|(e4
zFeYXO?XeFQ0Ts(aUb8&%xWc2wE}`L}^vzgUOMV{&5F<|8<r#T`CL2G#<HhXxF6wF3
zs*lN~9KM7=1wCXCFw$Tatf_1BYM#jH`wQjz89`s)AYi_%Hrhw=Hf)MWOQ&i%UH@?M
ze64>W%C%X!R(t%@;IKYhBeN$(H?Gd_elB68oI2&ce~c78#T&ES6kSI#ZjNBy`AIG*
zsX}ec-1B{9<QQ{{t6FCjic(94-)phBn_2&wz+b<8+$by0>)HsBM7?Q{hJz6jc*_VA
z$*CuW2naEkgI`(r6`)l}#DedTi&iyi%h5NO);tP-G|t-xbTn5Jm_F;Z__M25=~gbk
zkEfs%DV%(F^Y<4C*k8SAOtCnA)iud~>c08bmaZKH{b-;1!@EU0nX*>3dgeJ$cv*)E
zdw~a{IXTA<Z>swdT2@vT>xIw5Izj8AD|~yKG?sv$a7ys4Y~bQCkMm<Ugg39FSWsZf
zXcw~h!fE07&OM-3s{@TX#ZUWIUoeN}49G@K9Jj(^v>q>uSg_Wl67aQ8`2N(@u?oEX
z85s5Prh@_enq#V$K|n+g(KxMF?ugu!aQyq53MwIH?7zEQ`F#R&B=!6Eo!=Jv63<UD
zaqSQ4lJSJr+?U{iCL?o+Ny=Diwrm;o_HX7x7Pa=hjJP17XU|-6YhGGfSck5w!a}Bn
z3|4<k6`1?4wzXCZj@-AwwfO3ueQK5p$euyDJ?l9f(oBrl2%fpl{jstEIumJy+I8K5
zR>Bb0bh=6eM@M*`JNqqwQ>%oXS?f9VzCVm+5%MCjTWfaaAz1G;gW2@I5O29_FxbKz
z9AOCQwa$Ezm6NNtdtsJ{-~Wv<vJ>NlK$x3#ux}xPDY5SPhB@?}oy`z!BmBC(0gHeV
zRNlY&^IJM@M1eRoIWw1}Q*Mt&O}R&paP|uoP&i_>m9E%ukCO~pGVsIB$XKyFGvu;l
z#lO0BVRt-kv|+c`aHK4Z-=t#Ds2*t2ShM)R=k;Y3`fvst9UWC7*y!*OJ-~0+r;t+2
zm$)(Quw%-k*{fbM=#9^LIc<i4I-0Ju;6`*zq!6GvfOkJ%-D`eP#>ni`$mPNSGAcXP
zzMIY|COx}LR|S2ND!aoGf>5{c@@C5QO>_g1jfSn`Y-#?eCH(*rhn}nC-8QSOO(&6=
znvIvs;}dqhXXQ4&XpisnM(gQl%Rk*pH=0u`xoIIEE9xn(CSHeFd9}vIZU|lZcx_S{
z4qdg=(xAb5qcBSA{u~JF3T;MH%6J}hC7?b_(mwxKW+|9Caz!3mGG*HdOWPcrF`?1z
zlFxBHT_!$TZ2}zldO1XLGWwbPdg)a5z!Cca5Zo88L`6k$x!o!KKTN!;m+-PzNm{;i
z^c8d6U8DsA_NB{*4cg4Qt6wAUBNCkmTZrsOs4>>t{9FpaEI7xI9xI393QWjnp~d#q
zJ*F!tU#UPa!>xC5&yx*a=BB6KJ_^sPR1e)r8D<%koQ6NGt(p<+_#*yr5fKqfmKR`u
z{;t9hhDAge0RU@0y!6!rIs}c~B4Bp=V%@fRyJ^W{_wlNcFQG}3(er8Hq0ZsM2xsz?
z?<+O$mx|qAES=5^-a}kpsLY+h3<3<|^*SDWPG317qAi*9eq`av39fF#$5~f%tEhn=
zYm(UJ+>P2@DH5!AdFDdvw4C)<t>i7Np6}5p?zG`-m3d&1G^`-1#K3+b6dpc8QLS7s
z1cIXb8f6r%?|{fap%cN_reB297Q~m8CmDj^`c6WY&R68wxhZ}@$z;mT_eEP<2SX|b
z3&3w0{<$Pmd`Q4Az}#*+;ig+xtk&idf3Tmtk@5-t$p*2R!`sq_m8Tn45_l;fWmXTZ
z5T`WvXB-QELpvtpeU=iWSfnTzM+!S_-86l4tS_`{)oB#u2y=9VgSiq`mCc(KUz+QO
z1uZ@x?`s}2RM3hL94Lb^GXK0%ZxT+|T&>?A>eOAM$G1|wcZW$uRlMBr05YF=N1W>7
zfk<<4#t%>d4N(nAPdO4QNx=5`Gzblc$LXwZ<~f;2k@GBjnH6C(C7+E?1fIrtsA^<N
z`di8*JKnE*z1G`O+4tNSMI_Cihr6r5<@VoMVq4}P346d~UOR{MClTPIlh1#zZKiIt
zeO;)Z6tNlyRjb9#-*!b8UQGCd<*QX<r$3#$Mnt`_Gn?*4m6r0yrn_U=Kow`&2L(Yq
z^XN`~&6&*M%lB%a)NM^STl?;J#D+{L5WU&ezCy$gAf3C>O2l7Q%m5^AcRfvIc=|P7
z5kU6bo=6Gz4<Se*5}Z1IM7SLA%75NPrv6f~<|<%5?<g^OkXpH9^au9k9+`*@6%7rI
zmX_A_>G|cJWcc+0yTi5Ww`t#s%MmO7n4mKYAz2Je)7VOl%zy)ZG<wrY7Yme$6|6F}
z@lmjAu!O2cehS4Oys~K3By32bn?SWvV6Wr3ybx$;JJEgsDBO!G)h}N{SU5T(gEVhg
zQ4FnhPka<j{>BpasYr@ef0jX`Rt@$tU3uW@?!!N@e*F&THY%kQ-%iXPv5<D>UkW6H
zL8t@X{rb%RdOrf6pxdFdG-<i;vu%S*h8&(@_E%EK)dKg{%G1pQ3D1v6(j@?BIWEvL
z>R)G#*#Yls@Et-*U{=^;8|kLJX|b*p=7s}-<57i-WQ#4G9rVje)X(ldD?Kq#i`{}}
zoQcswGc!JWox#2%S1nXDup|oZFlF|u(|F-f4}EhS5xcz6#L7>%v_cVa%Q9jLNuCFb
z3MA!kjvrkfJWTdi8z{miJB7u>9o<EDlN}GI18uj69d`Af6sC)OG&<~(Ki3_Tm>GYo
zEY;or`geHs(j0`=l+Pk-ZW&*6BIkhEJtG^Av>Vc}wVaOYd-;wSVWS-r9eo9aYzp?d
zx4-IQu;bVW)C#zjp2~TG9>g&L&uTk1ijfIlVMTy^T0GBEJVk68IC$&+YjLf16?^1}
zJ+JME1_3uABQ+$%#PLSrF!aqIUDia+b{aLMM0=zMH^%|rx*yGd%N(vnD5{Zv*_)78
zygf#m^Kp2RW&Q5Zm~1q#G{{ZQhE6h`9aIuEy53)0Z05O}ab!PM_Xjrj;L|(3*<C?u
z<>G)To5>4uF^C6#*twCgMEs@saC-7a=7}JL5^dda!xTs_?2sQmnv9Wz-fshl?FJqz
zC21G^aj>yWMkc$EFFvNp%A@yK^tw-{eSPn~!Ck^wLW=Va;P35P0VnD*)sT_8R|qmG
z@(Y}!rY5eCXF&MCZJeYDZ?2a=v|^64K{%BZB4Elhob)Ui6WCQ+4=f<Vx$kGuQ-}m?
zu%e>(GwoKTihHNL`?EQfrDY!2j53fIBMHMrC|f6vAFFp+tTy*F#BLUjgb}|nQvV)s
z+PsGi8TUmsrqEU?bMrDXV!l1o->}rWCMvodZi88>NIB-LUP)f6DOfHNl`PVbu!>jq
zgdu`{9<5aUL^Nzd!$%K(*vdI~Y>WSG+8<NfSzNYo3};=!1{qkr=3e;YbB%d}&lH$M
zLFlxSAav=yhVSGIqvzly87xw{L5?;)su-*FAH#^YANxLa2oBwXBYW)0z?m=7a{fBx
zZgV6h2HSk0IvFgLprTFIY`a!|Ib_3;sh#5U2yR_wG4_={Pu2x|N1-x!%<dMb|JN9C
zW%<!x9v{(=h>akhVXgrv-MsS&?EcKgS7EE&a+48`uB(HgS)<lfRarSGhw~Z)(YyR<
z0Bdcr>O~_dL#`HOIDLjfU^DG`w!}@Y^R+((d8y)J(*<?TqEl+$jAy0Kdt+~8?sOeF
zetfzd;+Ynji#i4Fgqs$DLq5Ydb!q7jHzx1n=!;z%MA~6vh`u@F9gInNhZ`bj(Uhi}
zq8mgg$uE~2>R~=PG^yuP-nf%Vhk@yz4?vyet`U7lZhltrhqF11nVI{N2_RP6uAP(8
zg~Er_lau!ob^9Wd2!*GW^hgw!$+)_5K$p@pz*UzS$t<^AB$Br@E0zu<k|Be)5LPKG
z%0~hvWIusTk}vrshGg0ehV2>k^MVNX)v^y@k+jhj)ekx(uw?0+2kfsMRs^XhN3PoP
z*{s_2enX>8tQq3~v(%inb)VyNdAP?y7thI$S`PTpwS{S@z{P6qe48{ydnWB|IK^DP
z5DR_J9Bt>Qe+7$C7yP*W$A_)z`?b-rtDSYP$fzcgOH3>*hDopEajk!`tJzL_#jfW(
z6K=VF&IK!40E%hGrJCvXwYM>udq(?UT`3(@i7S)r%e7&uAoO%f@Y-Nb(R31rD<qwC
z8G;&|T4}mfG-M1mVg=MG<*C`@^U69zz(A)P9-uajYfQO{5_$YmYcQcSf3Pn?H}s>U
zh^jRQRp-|w6KhyP9-v2yGs(26F6TRFf#>NB_cZ|RO8ELRIy<kod|$tL`1R7Ku~46B
zYc;MUp&TqJZUI<nr}b9RaeV;mX<doxEll_OU!T{fCE1Fl&f&i6Z(T3QWDGAq&m0<7
zR4zy<+eAXx=msy1%3%=@idIMHtuMsQ&AD<tpRpp?Wxvd{d~u+prcKLz>#Df2VqU7+
zC}S<S5x8JoiO5tg@|xdDcK+q3vgOy@G_i(cNSj0{HY6n#LW2DsOeOpwbC+4I!zl$6
z^RU)5cxX)>xUx=|`YV^JG}0Sg`G|%S2()T%TEqCP+yDO2?c4j(72MhBTQTAM2dBsJ
z6M|GcvBPbfoSa<F^X>wzb-a??zw^wrQP4)MInk$iY^w&Mh)&KHn?ZTJd)U{!96&!_
z`d2C$YMz~C0}P~NV2|l8mUU{fJ61d*RgBGxeBY1}Je_HBO<zeVk|x(5Dvi0LG&;F*
zaA?@rFu+V{{y1P=<Bw4>1jA>bsD?;9-vee*lwb`5k2w@=Z_enp>F^gq9Su7sOgplh
z|M%~%;6%0;DhePM96B(VeE4+-j}VPnXsky<4-4*ne_FEK<9<dh@uM0GoTn;Zm0;{$
zJ8W=}r^BwDl!>p=CgwI4F+we2{Vak_#}uQz&rs>MrEop;h<#Ih80rBhfHgxQ`b4c|
z8Bz8u0?2{gU#OxC?=ltaZ3epEU=rQ0G07>;iq5{m+z$X|qO7f5XlY`ktnA0Uqdd<?
z0b!a)hlKG7Nc*jkhIbLe*(9)o=$1B|BKiz3ZTGFhk;FhT#qT9b9u%<PO}(%UzY%5Z
zgu_SC)2!iRox)Fh)VB=d4!o?J+Wp*m>0vv``E>2l<*Di2HY;l-FF6Wn`*yobCBHtL
z>z1;@RCwTGlWJDpd+PY&scnUg4nx7u(|02-DY+=2o^h#6#1@NHhCFLy(xR?VTCqK;
zhcg63pn}H?>1r6(F9AIC<1?EzQg;O$Q$2ZTpc3M+%GX_tK)5;$R0%lhl;5TB43Ox_
zpH(wF){N2oX8(+qiB<QBaMnM|TZypGB(7GW$OqDqBh=zy$4FFTFiKKcvupg`9fP**
zj%QIltlv$TndX4OW^Ni;LxP2@I`L-0-Woe1jGRV9bb?Yg-915p4F;7RY+Q)>9KAtX
zYP-*yhADZ_=Ar<UAFXV2XDQ;AND-PUz{;h>b4*_qudtB5R9Z1@BvD4KUMOyRl@0X`
zLN3QiqX$ubnz>Vh6jfR{Tpk;v#<d4HC`TbwUo{MEuWwd0aL_a#iwlNo#^CE9Q#&fs
zA8gSH(u_RABL!{Ht5}rO-Tq;j(C&Al$l8Szs)e+(4AZ?g?_|A;T6w}0Q|6VBX*&jG
zioR4bsmjZ-;d?fJEf_c$D1R^I-|+uYO~xBT0%t5YrtCB1faGOJ${bt@s4)Cw>dW+4
zLEQ+steqdU$Y&*r+G%fgJz<0wvIFg@uSW-Fc6FB^Mi@&!k2$}DYRUY&NIPE?N*(T^
zC9v-joWljX1Keo$B(2PD!%93~YjO%dR-)8o^I?J=%p8)i0>ePeuo)oWrRKkTl^0BB
zGtI`*T{pW0!?9B2Z+jtYV`b#*gQH?E-~<}ZlOS&f^mQNvaEklzbGHNt5Fv&mI1<8C
zOIBtE;)*HJb<6v`p>0Z~5%Y!?aU+yy<%3<;r2d<Uv~KZPE$tB~)xF2|jQdwl6DmzJ
zPLslRF6kq@--WW`BG*ONY8x8?CL}B{HHXw)cuA{Vo%q?ys<NdD3lNz2#{uOnd0z<d
z%mxD)@_F-E4!=J11#qOzBr)n<#2yK3gShs=G_}ENpFh3C?V@sx<PqifF@<=U_a5e9
zaI6C?<>&@YWwngm@43yXq8dM7gQ`J@Io&ht;$QVJ5HBeI8iJ2s%Bj+Hn^SiOflvHF
zUdW^C$%guR3v~l-)+4x{h|um<`M34vUT3=Ag#YvB(64sB`Qntp2pL+-&3@e2O!}kf
zj~e7Jz8Q~fhZHadGadSFLCH6?KJS^qBDKk=!1)b)eVf62lZ11Wy~y=Eh{M_6Cqk^9
zF8&JRdNdCPg!0{_5ra!_XD5fE1?#T%x^8N01i=r&ftP8-zhnU2OOsEfPACOT^#+dQ
z3f0>8B}Tod&*h77|DXny>)9;YoPFEo+QcQjHKu_&9iwADv9Fqmp#>HL{xqTG^i-@w
ztpifGO67MZR2%~F>VnvIyl<;hYYLb6+STDvECZF(@r7=;zB4xvb9XLZk%kL-S^+GW
zoPtr#IcxAq=809t%bwpL2K)Esd9uc|HHW^I*ft_?>Ii`I*NvW2l~hdC3)u0@DUJwt
zlx&D!uRv)oPA*Gd5v1>v`5)aU<OBG{0wv5u`*_im#Aaz^l3*o0az5&HNF*GU50^^m
zP|JcD%ic=b{XAOPf1U&yzcHjX8xEZeGBi+D$1}H-Iu<xfIT<SO!zy32aD^jio~FP1
zLof$Wlj0=}g30Xk9>EhS;>tO;c?vV*Tts~SeA>>6QM5KC5mQ#bY2REiW64o5+QJay
zU<lI(MbBZ;v)I%#nMfHmdJ%l?ZNa-8yEv|j3P}%MmD`d=QbgxV(k_S5w?6@jR8~e6
zNghv(d^Nkt4uqHcq@L4Ck~Jv=14r$^ZIEio5nM5-kqm5@zEN&<feP{6Ivks>q~yl}
z_g!b->$m(@ngTjsqB0&`6BHE7%mTN5zgCxR?AX&w=HMn}F0${DP$SGN!v-Vv;Thk&
zI|wSoP$4VW<AJoYt%QYwwLlQHO3si<rcfmtEI&(7wvbRmbdP92ewvt)M-W=XtBFZ;
zJGlqEzZT|^6?Bc02qGoxgi+BJh<*K;^7wN2)~f3Z5}+aNute!znSnzo(Z6-~Pz?f-
zd&_z1ZgU6jkR6FbNl1*e#Vy(7&s1E&IG%yC%PE>K5;C{dR@{PZn;8><f}k%oq_hXv
z%Y$hk*dA=%H9wI*0k*p*k<<l5tkqlEw^moMlqz?o4gxnnS~~XK(jVF8!@1cF7Q6}f
zz1we}zi^kwmA(xBlOsuN1+z2OuA;u7w*Kt_7uC~!5hxvsM83$kXz;OHi`UbSZCuam
z+~BMQa8Jcx8Y*=+q8pTfTEzKJq7OZc)1&TBVD9V!@CBdVm7B=QU|N5CnNHLZ{5c>G
zX+{3$##y^c^A(B9zin+z?+5Zfan$@CQ_@h{lP?6(DnOBAscCD~TdGTgA3g^Q62%Td
zE>Bp>bwgS3X+EVP>oyEoTKcO8Eg2bR9oUr|Ci;)m`>mKecqGvaOo>;jr96%fVQDHD
zK%Z?_J~PJ@<a7qF`sHWqY^10o-*v9Mf^ykOnS9WmPrr;@MxJ@{O7w2$*I14(vlc&z
z^W^mqcWmt$EiVz57-J|pOo?>NV{e|<j3}2rW&#caG|kzCjuTQ_A>IIZ3VN|d1P)I&
z+?a{LjYy?#EFF07e(6R{wd`nq4<z@Pp56A`o_t3WDQPV2OYn$w*N5U-RX`3TUP<4;
zj$t5)1rF>Gdi=TSH-qK&l(}WE%ObGBomY^{v}V-^YGBIJ+2*Pc<T?His}LyOq3qs1
zCBs{H4MF%3r=O1%KbpaTITSocPo@d@I=(d+KW#B;extO6E$gB%wTXCn88+{=r(RRS
z!dnws_uI=7@p^C}q)BU4jd~0QVI%xo|CZf=bNzr$S+`kygGO-%=d}D^N@+i=%XF<o
z(|RFApSeGSLl&rhk;j={y(>4@sDWb+05J}_0q*>qu<B2Jsw!qq(D;sodh8r$(I&Z%
zn;D>vjK2kH4V!ym=UOz@Y?*y(@!ga$p?^0ry*sk(rBZionw8=x%^smS=2%9-q~d&_
zt%L?REc!V7)&nhG*X08@<Rhf}zDKxyQ4G_W^m1O~y-aO5%2y&v?s(E*0$e_#fhekH
z#W|XXssHuT55hohHj}oN03oJci^*(JWv5S|ZBuRh*||Bpmv|yU>z9wt&Wf^~=xF#q
zIG7+1d`vV5)ZuX^nb8LVvEuH7O7}+McYpz-4D_~3%MCsWXANFnPawmWwb8qY5IgWr
zz6L^=YXXglvcmDuurD8ABE(lnZCxm?-XBppDMK1X^jA%Q4`d@0*D+kbBAoU8Zlxhz
z_{Q(nayMWB^>~35uy?xRqWL_=(&~9d-u-g!!}#KYcYn4KQ``NFucf8M<8_P)+8!Aa
zCg*=a2N~|5Ak<s!NrHOst96|I{6Zt-^~OAy%!LB^z8_iq8Xxbk-y69aAqnU=t~Y$B
z(Oa(bhwzLGGz(yc0Qp`${d>jW@EyVF>cS^P+(iytkcj8@(*{(H>j)h}-ZMn8*Y!53
z02g9;%iaBbwFd)WMN)oD*h$Z2nL7lY6gR0I@>TDd-v)@NpS}Cqmd4K;z<rPB>0&#q
z30FN11FOav0pKQ+j7m%lri?lB)6M4fc}&H2tsSe7()g}I4HS5VF>Epr9_M@j1qK%t
zWx4Vb%9+_<c#?=;Sywk!jX}e>HxLY9#hLoW#QSapfSRb$<#ylUOc4x-l#dTz?mJ@=
zg}V)Fqs&6WZC=d&uS&~hh-4>Pgcl9shK#(IjcKA88MMvryYryE{5fki+HO|}e%x+|
zvuy?sWXLzQK(J?XOAl>P-^K5|R->kbg3geIE3xn55n@GXiR+!bvU0LB<t8v3QSp+p
zvJRgmrS^hgh<oGD_(7oh`uf(hW-Cx2m)#mUH#bg~&qH{hp@_OVw!Y_)#OZ21#ts_V
z;e0VWC|~Vl(Q>IqklCO;^rwnf+(o2vky2t>L~AId#2R(W^xg?O)~`=8AQasmE|@&z
zXwe7DrJ}S47U5_TgV!;x-S}7(sijY6U4CmD;gUtn4Gq5r)0AOcLu%I<GC3%os?9C6
z3murIMNa&7C&x9j`;<y*+nh$-Jl2g^asMvd_bCrVZ13Y}MG06iPO<I%od|30ae!wS
z>7;TXv!40rg@Rdldb&8*59}hCgh*Vv7HrrRqHK&Qzhf^pGs6{rT7+)VvfF>RB#TC8
z#8%hsBbt^cv98xFoA9^%-~z;XL%W+`1?rW>=3;4-QPzFvagzDg1(v=1CdZpOC*NsT
z6{?4rmCRWK54<pOa3}yq$j9R%h*C!SXblGD{wzelR;uAIljHFp8Q0@kyx%f1zeXp+
zS4_pmzB4K7sszX2Fq2YpU|M|10~-OWUTqXTQLlEq+La&_a0I1Le;HnBI7nP)#Iu;n
z7Co5E0fY_$0K1HaLlAR=hiAD`2*s@58QF+o6&VvFk&r7020B@+k<irSfkq?@6o)|}
zr=h_)<98Ps!yfG%Pf2M^UnR#C&Sin&z(;(4clk!N95K5nNJ=?KalP_EZg~lU{jJb<
zCGcaGP1SZKX!as4-*`?PaWQl|ofVDR(oyOK!7ZAl$cXjItQGvNAK{!t^ViVnk=amT
z6z%NTBh;@&RF6(h)jf#G(NRf#duIPPGrHOMJU|G8s+cP;ZfZ(7nJW|$z-`xGJjT1+
zWkUlW1Anz3;1&EnmrSL3f4~OZK$DMdzvVh3ivEFtq^zu%KYvUCQ-cVDg3@eq#)3x1
z52cC;7!2}zxjbQ!yP6WV0f8ztswG#WFhGHV9e<nyd>&4Rf<j;nSyhYu=8s(yBSRUy
zym*{%X%+K$k-mDh%?bIX;KzG-hm-Suuu&7PfrGX=@TI+;Xg&X8>Eg2yuLwqvGMMrF
z^g$X*^&ycMS|kdTgb<W({rwXSB^GPusPFgYyZ0-46aYJ+JV)WEe?VjEJDzpEtBrT_
z0b-5$?R5-{e0(ryn%Ye~E@K|9_YSn@Z9_^*%6yX%WYW-ljj3E|1tQq^Jv1VsxWq&y
zQ13Uoua1CA0cwiZ*UpiJP@fbsN!zs8_*_qE69##Z6;hI?tF+j4M}G$ieNOl$M8~QI
zh{=G0Z(>Rc!xm~*RJh^tv=NsuE2z<O1^w;$A!5c*WR1)2ll`eCC8v$LO-t?}VK9tT
zW8Xka7yKuVD*DnNk`RuBKay3XpP)#w5qPQ>|NbHsNLXx%|2)>lBFgU7+0sMQBc4o|
z4up5zK=)0HFK|?EgIJ9hSr=HAN^x*}j2xJS`U!_+w7M>LoS;DD96nJT!q^|?zst(X
zM4X&H0eg>Jw9^(RVPv_Bij5xjd)R`}Q$k&Ba!9DGX@>{O{RLV#e?ftYIs6o~Jh=FA
zfhjbzj(c(3g;iCUMEvf9E2D0MQ-TkS@kIQ{pvb7GzL_GanF13U+)-I&Ri((XU(z5E
zBY&aE9Nv(mBFTaut&oyMXwV^G1!QDR_h(1QeDYqljOg$DxMm+OV2PBPi?*Ruf)Imz
zA%8t#CzA8!&R_<IL;&KBW23|K#pX(mGD_+0%O~HgOcrhBZ>U&!K}G{ApUiJz8|^mG
z`@Fs0dipE}0nV?^{7lkzr5ysGhVIx$(5FfObOGKMN9SxakYe^q2zU?<@G>gd`jSms
z`43Ih@7#3kpfndSvEHz-V9G(xV^>DlN_*2Qw=dC3;phPf{S{AHfJs;+)U+PdtfAuI
z#Js^E?@aHQv^q;D-eUlN6K`|?7Gn>n<3b&97>8#}te9bhz4)m6^tKYzT#wl%mOQNT
zC}o<pdyuXuY&h^MN-n&84RTTX>3>a)yj)C)0j@ybf4|t<kE<sil;?j9HyXE(%j--z
z98YjEL$IW&UacLrP^oTm{pUBXpt<XSB04^JqZM55cY&B4QCI*G36{UJ(S#ZfUiNwZ
zDe$TH*b*IozjOgaN};scN`9+N&v|#2GXi)m3SDru-LHs3@23oa>~V}rGzp^E^HSj8
zp4Rf@iJ-w$Dw)!f1OM>O8w9yO?3~VsT`Jdj{IxI<HJCYvzfdZnhR11_5}BA!+hMDN
zGFlZ%6V;Q$yz`GbSiJo#Bpn^ya=V*NmvD#qo%Npsob93np~3P|M0IOwA!cM8W?d02
zt#X~I4&x{ID(xotIfI<|$45`=H-OQ#Tp`E9!(q!Io~tl(F*O(!m5@-2Kf#_z0lW*0
zi5G8we?P!%g;!O{HNTNPqYe&!-svA=1c?A5hkwe*bE%aQ1qM@7U01&3*!cKxNz_E2
zec7Bhptyh^haGr&@iQ|Mj*OJFc}94|2`Cj6($bqlE>7`e(xp#e1I+{g`OqPGH#PsG
z`@miDZcmR_>dtL(VXAV$+BN_o7$ip7v7LJSLi9!?eJS980aE_<k1ZFtp6=4TdcbFV
zcA}G~#^8yUvXq9k?>^E-6}!Bd6*gqc0OA0+Q2GtsdFz|G!2Pc`fWQK9kQE^Rpp=<D
zx%>A~CC+o8A^2+s`@JA9+EACx0BIA@Zt=Oaho()^@$GXoDmcLS0}2|zPe?af&mcnf
z4vjNb>GZ(qG@k>4bahyBzwzm0N+Ts};s5s2dWb{F<N4zqT=(dp1doFTRxD%#ni!X!
z!<LyQ8hv-y7z}i_Rw=v_s$P2YtFg&%1Ua462pkAj<@X0kFc*Ev5+C9!bC3})DVfxU
zS11NMALnlgb~->%!2Y=8B=))W2ld7tP3^us<!MBxjK=^Hjj*i=aYrRopwK+@a3ef2
z2&c9fXRpU^vJ=eWI2WhEZ@0G2>#%q8Wz(aa<k?Vgch49N3oGof%n~4ymqU5z%IOM=
z3a2Ug@MmU}xwiaNRK9+elw5reJ2b16cU8p%o=i+nG+cuL85tD-0aVo0b-%5!FuQqV
zrEPD|cm^1#yl~G;@wv8z2!jYKEOFFbr$uYc!Y)FwRKnCWwAyab23%xru;PN7jl9#D
z+9V+7c!Y+Ul2oaj*;hFU4LH<R0K0&S{niSU@v%rDNk5CJsF2%dc~g{ZIt!xj?%6er
zUq{2g)&aLx&>P%iix-KE>{&bPmu)k^62!OOXGY-yie2hBlCQPWIsliv&^q(@nxfU}
zeXXV#(uR-zhYA+lzH8sR^X@qY_meHE($NQ@fF%f!r4j=|gc&QH6ZXKmP2$<eGzOsX
zf|RCAKbhI{{VnYB7c8o>n7uu6CbvV-ylA=mNcI#@LSa8Sp^z(XwRVe`rza1W{c<3K
zMvX}A(%xVchrrwT+_G|8l{5){boQy-HWV@Ux+ew5@GO(_*VL5M+WlElnhz9q3?2rJ
z!cRSuq3iwWh)}W01yX(n0`4tmc90j{S9x1P4t%6oNeF6rp#6@=bDMNBhd<)}Y^|W*
zw7;$4fYpCDv?8AY`PZ-3KnNIQ^0P-L*NYVlJ^G@Oxcz<2t0e<zd08>Q?Q1vMh7k+4
zuboHqDTN~w@sYC#lL)}X;xlE{D^Ozq${5?B67IJSxVAQ4%eiKv$<k7j?R?dQPRz8A
zH<Zy>Xx;YgJ;x6KgFHTGk<@vOxvw=B7Lxnk^<2~e%DE?@_iLEui)9n;>-VQ6Gah#_
zW^1RzOQ-RVbE(tywx#Be(+t;fgF0LSZoZaGU;Y5JV1|(M<6zYM#_>QvP6PT0!p6k@
zJ%;%ij<;=8tC3Qci-Z_NNy8mRHfPDt#oJcC;g6dCqZM<AipuSut-*oS{Mql|aE`Y}
z4;vr1UE5MtPGZG1<ae034+{_Pw`7bc_}MFMY6_{OW%{{-8U(4v(iwT_=qM1upmB|g
zhZn>eBxPlVM~R;9Ro{ls8xVn{AR#73_;>sb+`It~P)3UZ(zkd*LFAAb*pNP0@L(YK
zg9LOr#V%6czJ1%h&2Z7Y-Bam&S#$-Im_ZXd?mSrZ@q4VskA{#(u7E_~?WHu|${3v4
z+<YY}{Wa$|yP#+yhLR@zi8>7pRUr_)cpNY5zSg(=O-DwC@3)(?7jspm>^6ABU_SW6
zm(3fU92(^3y>tGt4j<ANxkBQn|CB`o(B%j$0xt&g9e0ud0fh>KObm2{HAmW1tH<P%
z5}TP}ql#e~+j3fsmFUI{aOq4H&sl*vvSv*nPpQ3SgSs@ad8IrD*aEzC0}uRoQQAp~
z?7Q!<RaI31>3r^IbM<Diz$`91cyct?T1-07uZgZ;ECzMMJ`aS%*%lVXJif5v9>$?l
zlmnnm0k?<g4GRH>xe@O2DHbuC#|a!TSOjNhm#Zx)5^+mQ+VBM2ASz+zzGy6l%Yl9p
z5NNKnCpyca4NnT0WO$}%<Z|<coeUOS==oBd@ogVx-E&R>l?v@-v3g*BbUqcp`2)Fv
zK9}b{7ptr3+1a7`UEcl1Tt*9{sa#<1*Eds1e3q<|@%T}I3l(@6Z}9YbW{8Z7>Z>;y
zAw`30S*M4Q@4EY|V>wF+-R1qzKQj<f?|M{=%jQZ;-al~ln<j62ppB%!@8$m2cxU8N
zNl$cwP_9i3xC0_z&f@)mpxZO!WG;U#Y(G3ayqJUp6lIj*yGIPx!Q)Yyur2kGpbyIS
zb^(R^3kr!)^gzV^sH&Nn*`xo?7k6q~@isJrfEV%Vv-M85h%vui&&j`W6p*9~=&Lu1
zk`<gSHrAb_Ht!P)6j_N4E-rUvOxickVPO(YEhu#e&vf+kHGJwtqN=Kt@CY%d@iBmL
z-yE<k$2)8?;sNS_XcriG&a~-RJV8PjWWv6u8yqy8HAt48N6btr?xESO_x|9EfI)y+
z--ZH%E<!_j-`Z$>Z~x8X!$tH(ke}#amfi93&<T;41GLtB;qED@jEP1<5(C6D$17uO
z#T=oSB#Q9-fS%1($NEtwO2AFF?^rk5&LHx8TnyyTzXQSW(Y=pcKEo9&91&>c#pS3I
z2B^S)t~w(l4O7$*3yT^O3JTCxiCQjJ(fL2Q;Q<<PWQn*vo>+WdL^3im&FdSIN1uJ|
zwT2D=6(SN&!z}5s!*zMz^#bZNFh}XggrQJ4lj#l(4@*w%Y+fH^K&Kl6^jp~GVL^fw
zNg)j^f1*Go#*PLc9|a%Z==o~$XH<eU$Q0^W2|%e0w2;xvD(=+oS0?(u2M^q9BXCU1
zL(eLK-FqS|)#%0i`b7)69_#dozOfdHmlTFeZRjeAih6Y3)HqzM&a&hB#%GzhQ4cgG
z)Z_pZR6>lnude{JUOOV_@$F%2rddyCt=^&g2^zG0Gu6|ZPZnZVG`qa4$*A{SIl!go
zcelXfc8p0c?;ItnjA?gvvRsbge!3ham&R;#kt+y5F@op23m8yjWTXgS=2vIjTcb3)
zfw`#?M4*3Z&f^{T31_80Z9wfKfsv7s=KGRCI=c_@{rO7F`nqn_qfMJmcUB&DKnNhd
zbZ!qgu3j>^i#ABiUZ3B2zpQhtdUW|j?7dA4-~o-ikuNbl_3WY=r5ZqoLdUU2EdHlP
z{j*osb9vvpA;KkO>Ormspu@)fFD<!@v~;Anv9UlVH8m+Y`Fe8~pD|GYMii-l0HTZn
zMp8O%La27(QciBxFP86sx_WSAh`f9DZ8uUb&Bbnnr~P}OUzxYPO|DL3B;aQv<Kutw
z$J0)V66W$Nm079V0wQQ+A|ZGgbY*ka?dhE&087aOp?6*AjQU58K*-n9$?f<x`{8PC
z1DJ-D*rE|d)xXrJPLG$L8toU*z5VJ29<o<#MFA!Kbf*@Z`{{ZJAiG13845<D2w!f4
z^UNKXCWCOgQCKn_zCCapa7+2ut`Qm*UI?^tNXsYgNdg-5nJya(ojO&w&&u)g*i7V%
zg+tiowr>u1_h{t8CprAh5wy|EEg$(4Bi2~6B-n4k76$1-6Io^_ngH(V{Imxp@P7DF
z0BCNwFy3G;dj2V3ZP_pX$w%Xsa!1P0#1p@LizKMY3$COwF!MNjeAFCIe`oyH=<%;@
z<KM9q^iUYcs_hBoveV{$d+#&~w~t&~Ib%2c!u(WGMs@Oyy$U6&VMfMFqOCtoXH7bM
zkLMfTCqbYW5eR3jxP+7Tve}u8yy*&~hq?_bkX`x-^(Mp1%^UtBXOYqI?qhH3j~Cdw
z?cerXKW2)omVesO0Iq}RoEsNuxzP(Io;Y<$>0-SJr<jULF+`Y+y`kP}%-vMCRkPOJ
ze)T7kQGwCF&II600S&T&lxVs&@^!`=X?ZMZ5slDBS}htl&10P7m+|`P;cO7HW2482
z%;jxs)SjPnf43V4*8rKTsL_Ix0tQB+9&erNyim=m8v;B68i~OIH#nd@<lVPPIi&rg
z|J%b8rD7G&^Xh3Kq_zr3Xn;$A${P^DeR@c#y*&7tdN|$9)b4Q+42Z6SARNzqp*Qp1
z;NnSyqg;;gQiHS!ot<k*DL<q5Io9d93yO3<0PQ{$5hy^(=pPw}Ou`#JXE9j-WPO%P
z%~(L#Hp-gOf|0P8EHRncEpE+Di2<hZ+$rXEdeED5oYI@CbH3yA{p27NJM6r601NaY
z0J-u*&9qe$&~kxBj136vL%RKZimc{7JA&eKc%lGp!<yiK&!L3_=o4sIDSD<1+T+RQ
z_aFvV39026+H@UQINV}^vRQnKNf3U62b87Uy4+Ae!w2{KMfb<{@)ZXp43yF8JVE|~
z^}n}WXS|O;$PqQ{G9?h+?dQER8SvJW!s<B<ssfbSB$IFGSkxHr7n>j3-?M6m=Cf)C
zIxeQ%9*Jg|r%8pm?@)%FJ3u!A4hIA_i&YtG{(~4aigi@uWh{CfZsJBkKe;Xv`$Dji
z#+h`Q8{c{swtAfi>E)?48L<Zk2T2(i#*Ug)p6|neLK_g@`uk0Hfd40e%kPeOJdkKK
zaJlBtQ=}Dx4Lf_Z?u=5&4s6zXBjE5-nXrO`gkKC(qVwvWacv85&LMy(+R5AZJe2_m
z!E1N+2MKciE>D_bu<!`*Nd`v{HN-n(PVp3Ryo&A~npT<Vf#cRm>+#TEv14FU%Fn43
zIEA&}bj=%v_DO8-+?N_z=WX*&$*ZC#Yr40r^I7QV!qkiEiAq~x6fkn`H@2KO%OrK^
zjDgm7Qb=r>U`m;7o*Ml=U^2Y3)n-xI3t}Fha{**xq3GaXF(9Evc-ZtK2uGF~N-CnU
z9ntAYq7r@!SNo_6A=UINBOhg;p#w4uT6+3s8yGT3C#QPPy`}>+0s<2prq}hkgy20M
zARQHWd9_(?wX!k$CeZ729T+P8<7dGA*?||a@BR}71qG|6Qoy$~4a47GdMGIN$USpM
zX1Bf@-If&`&K6SuO(aqIq(s_Hw((y}r;LF{1Yj{qdwXI)(H#SP;z6jq%tnXXL4fD{
zrxOBNrTV~@yIr_zy3E0!ALPpKy8l-N=ivx-AIEXq+3PVLBQs^5Jq|hNtgHu*kr78q
zMufBXp3xD>j<R}eGE&aS=7b0tXU|+n2+!Al@V(#fzQ51s^M1cypSu`cMfJv|GmMzn
z6ZR!(r@o>hKHkF6GZA6qoTyucVbok-|Lg1GWs72@dVK54Kc?16DKzZ3*D^M&M043T
z`LBAjZW-hy%+HHi9qffbIEg`@@?t%|dvl>f1@atTNuH{UiE+|Nd)@dBU|T<>vY_WQ
z>Q_f*Ys2vl+l`M~2<y4hKa!z@2}~h8flM=pI8F6e`5yPpH#c8i?S=I8_M(7!&~kNo
z{w_6I=x$O@SC(Nep|E|whs9Vm@^o=jr^-UY#MCqiR7qMcg?IHen6BZBY|s3}esxF2
zsF%WqQcv+n@q3LNpcN&e#|YtHxz%V|S*?_mf)Kt0&`Wv%PUUst<gjvGB|rxfa75VP
z;;y{H`xwKkre+g6WC0)mA&U=0<>#1b4TOmpjSyZ7!4$^Y5F>8ZW9EfRZvmauKUmGl
zIBC#o*$|4!aQphl{kVDR17)+Hslr+ymmA#BFhyGsFRCR5+FF2uL4^&uY4R=N$rrB@
zK!+Q}$ah;e{!wAjUmy~BY4uBSJ+y;J+ld?u&L}xfl&?cCix!n81p^$+8o%~c5<ms$
z`7EblWF(0+>A_)1>sB`wSwCJ;XH>{Ql55<9kBKv6KEs<AUf^q3tC-k0sZ%YInYt<X
zK@M_9@ree?xz_RPo1x}0@4OGq02Q&XnsUkf#DIVckwowbsL~p~LY9=5L$aY85gX(O
zs_|dGm_Bf}yN(_Lo1e7UyLIx7zOocY$`r}_RUc*q;|->`moJ4u=N7O{h<C4WLc=7Y
zqM~p@Z~gT7_P}^cb^RFu-+<-It8?|!bsAN?qtnw3JO3^Rxh@wehsplud_)LW@rG9C
zN}1@1)v7XwpP3?lbC*74A83W4PzLS@k&H4vUFdm?=cg6=cBjRlbBP2t8sN-;-<A}-
z-$D8Lr#HvopnD%OCVu7HMuC>KH7C*pnJxKiix+Lp6Gz9Dbhxz@KzPIMG1q>w8R@wm
z9-ROQJk>=a$<{}5DXY{}-WXHE&|4`Pk00wA=)xT*MAf&$3j;_(nt1!J4`kphlU7yJ
z!RFMLs%em7d$E~i<5{-@C7u`f81bh*U64kN5^UqxiRO~ezz5#oFFu2%$>vHh1`s18
zn9>LI5{ddEHv%%VUKAG<)oOUSGV{a&sq~&MRb8(1v`~e&0#&DxZmxo1Id_W4iTN$D
zbIcw$_t-aq*Hwjz6^~zg*qfM0J32Wreiy17ZElT{r-=BMy0O9UjC7R5e>Bff=VafG
za8ii|2|ca5KlYcDZ!AJ>qj<y5SY_X;Gc@$3_%B>Af-joleRXoRHh(Rzf20f^(p;B9
zpA8uYxvaShHlzsxiByWCe;#cbPjA>8aT)6F!9+$3NEbxfzFjS0@s$|)_DL>YiT;#4
z7O+lN=4XE0<E>7?E{&Wavf)f$z8G1a$?Q?`1MjAPNDS_6dM!Qe2{T}j>9ATTfSaR1
zL%jlKT5nb2K68aMcys%|_sE6xNJRT0@9va)d%4Nv)CP}*{gs^wL<W-91H`d|k&YE;
zuSKzt{sxB{>e?4EWamQ6{6QVx&$?bI&05Y8EFvrSe&43tkv+y@=>-#1{B}2wtOo`L
zbd8KG+|yE<81f!7Paww&z-Tx1ZFKwO^S4m%$;Hn<51htYFY@G1!8~<6Q>DWC=6+1^
zL^vzhfV~g2+9e(XhK7~UwF-}5!^nzLe?2{syLWB%JMp`(nobvZmUWL@SrF~cW>a%!
zhACA#I@9iDQ+>N*jysS?vTx;gE_?UPJds0eBk50<1s1~m>5tABxmA712!y)LnPLer
zuRy+1t_;<%IShTxzbzr51-xJYmc{OWhpl9cU0Nz<ylac=b<}=e-GQrcQUR(+G)NuK
ziZdZGxHhytz=OF2;~216|EbuGs==>=Xnt5zi+ACNF9Zf6tBw|7cbeY~M}Ws&0yF>)
z1v%DS1<!_7`>5z>>Eo;&Y2SYM>Kd!VNx{W+)AEdGw%9p&9cVicJ%NPeRE=b|k$<eM
z<97A4i>F*s;!vH#^?`&0hz_VJkmnD4!q(8q$@))kLK&o`$E`j+mHk?MKK+m_4Wt#v
zt^5r@_+=?D=qAHE0%>)dow-?xMk*r$EGPjiawHqQ>!r*jSe0Q4ZTftmzM5UO5(<vi
zJu}`d?XgYw@?v>oDx{tpp@}GB7}vzPFurEcezMPcEki`OSAX=_PHpkxX91K$eIbhF
z^sqagE)JxFE2nm(K=V-PyvRHbG}@3~gmVs@Iyty>{nbuO7Wb9K+$Y*@wxRc8XxL><
zEY_87XGU~Bkg=4M^}Rgjk8xP5Y~oOSNG5D6&uLk`idy+(1N>e9&PGi}hCYAF&yw5h
zey!qs^_)oo8s|zu`&+DwxQ^aqktc0o)Yo;Fj_du>pHmu~OOukHI9;e|5Pn~!?79-`
z-Zkg}!{loF;DAQej)J@Pv}FDP?&>?8UZ&Twqws9w<5-&~ZERc$Pq1V9SMQF)aFRHO
z&}X*j_wrT|hny~Lhd0lTwxSEep3Lv23R{W_T9YQ82?sxt$}_P!FgG!w`e;|nF<~FX
z2}FM4<gh<eY|A0ivRpLm7qrP*J!?a)3hEBP;@fZ8d+56}OI7npo(Ak2GKv^sV*+!R
z^z9~IkR_-^&q=nEv4GtMM>)RSDg|+1`jGO1s{>fWTjk0ft@NyWxx3E<Bw|sTX5-gj
z^u@f}O!!i|<3rEX^#b{GGay-|zX<(Sk(;m)m<J1G`!RM&X8h-bc;08)<E7sY-I5YL
zz_E0V$2#MA$GT4k(XF4Z2#VHCu91l=efWm7M<5}<2TD^sJ#Y7inok)QOKWSt{VoLn
zINj@E=GoI^X&j@~IAdXJHTQGw$I!T{GF8T{)b8DTo<-nqj>G-4x_<wu2opVDpCWFA
zVJ}F|H@b=+2z2=An~O6B6tq7Y+)qV6sGm1bgfC22@=FuUc|TgyC9br<R`}g}Ic{Vo
zON-yHZ>;CgJbsiOtt|*>xrZ$tv#Fco9W;P;*co)B{YCOfCWn!iH*Hzd44B(>Pr8LU
zXth=Ng<|;L_%rx!%`=r56=DlID6cP<oS{MIx`c|CwCvD+0AMVN!l^;0r4blN4sf*C
z30h0IxrKNE`?hVpCPbrQRS3}e$rche@Jyl7!m&;epnsl|<Ix_6Zk_173?1(XezfTe
z1GG9l(EpJ}M%CZ>O3nIyfonY_jQg8iQs9jx13>X&!F4B1ADIX6JObpYnV6ZQfMn@D
zSH}h1X@8OCm<{D^m@_)jyc;E7N<kw<G#@n4)N-|;vJFeoh{R)<=fkE2o6*&D*le<y
zS4t7Zk|E|1@=-+C*hhtoQ9#ti7pRo+-?=lYr`%QTt=zS%e=XCra-&AxI3g9UEbO<I
zhp)u-n1vATJMLA;4FB8kDf>UqLON5iL3`VdLr*_AdZG3#k5{;xEHR~nQW7(xZeT(_
z9x~s+!xL8JtiS&a%g@@z!1OS#l7YVA%3Xz7mx(gbOec%M!TDNSe;2F(ggfBmqBWJ-
z-X2kn9q7phTbS6htAIaCO8IPQ%I61a2KVo^Zq*%EDqzJ+%Luk`;D>X3exsI+XFi}Q
z0nW-p9gALC8hnM?fz54)PoqEd?Pnx!_@N~l#Wu_esxC9gOft)jByH(FyJixxAP&w8
z!&lxfW|ue*ttTWUxesq~93wG8d1Ec*R=k^I0c{S-f(PXizXzG3I!j6${}QvP#wJ-a
zk6DfFLD=MU*=NZ)iKe6K<{iZ_5G-JcD)XJlZeV)A$-`WP-H0lOTWEs<O5o9ASgRxJ
zZU;FMJpp1Hj)G<7mcip1xnjH95&W9xAARy@_DMV!7%9409}xai`5_Z+V(%hpOuQ;r
zHvDIor_}Y{hKosA_+s)&G`5@t#Ey(j8}@6;DsuXAHP~lQ3TsOC6<HkOT=`>wH|{g3
z_<N8?>af9|@cE)<WU!0uW%1ny1m`>UaT`UvAzD@kFS6?Z1E=R<!3Hw0Qz%yZU-gaw
z)ShJa(uWPOq6;-IZpOb#eaf5Y6}7drcTc)PQBrUS$Q7y5?|p+pWYw$4O)_n(Mc0IN
zLqg_J*PG!E7-;UObRGUtfX;Ji6A32Q<bZ>$;A|PF`^kwpwj<Y1u!mi7yy3rp`f6z<
zcCF&&m~?7xe1FTM=7+zZ@lBPLjA<0?${KW{it9@sivB{c|D2y__#q3(AD`ob<60=x
z#H08k%5pe3B9L>0{&H45Oc4{=*d0=CYBcOS9(c7OV)hx+M77DHXseXs`_oGa%1TO^
zT0_5y*Vddl5lYY(@A0BXL29|ezm+JWHI|e%U2KzA5=4}g8W-r*O2!$<k_gb4h?tm|
zNjtRy4c3x6aSq>G+`xYdr?+Bc>)!Fo120u0w!U8GM&@ELcV8V<67{kY?(%-i&z~~w
zOQhgQ)*v7TSS-pQ<nMo%0-ptS7(QqH&*CPg$K>ihWO;Y~;}t{K$4Q#^Zc@ZxQy`I^
LmJzZV;SlvdGl}4e

literal 12990
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
VZ_hAn5dSp+<fN6Q$|NA4{tt;M!(RXZ

diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index c1dd03a0..73d1a531 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -75,6 +75,17 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
 
 void AboutDialog::createAboutTab()
 {
+  QWidget *aboutWidget = new QWidget;
+  QVBoxLayout *aboutLayout = new QVBoxLayout(aboutWidget);
+
+  // Add splash image at the top.
+  QLabel *splashLabel = new QLabel;
+  QPixmap splashPixmap(":/mapmap-splash");
+  int targetWidth = qMin(splashPixmap.width(), ABOUT_WINDOW_WIDTH - 40);
+  splashLabel->setPixmap(splashPixmap.scaledToWidth(targetWidth, Qt::SmoothTransformation));
+  splashLabel->setAlignment(Qt::AlignCenter);
+  aboutLayout->addWidget(splashLabel);
+
   QTextBrowser *aboutTextBrowser = new QTextBrowser;
   aboutTextBrowser->setOpenExternalLinks(true);
 
@@ -104,8 +115,9 @@ void AboutDialog::createAboutTab()
 
   // Set about text
   aboutTextBrowser->setText(aboutText);
+  aboutLayout->addWidget(aboutTextBrowser);
 
-  _tabWidget->addTab(aboutTextBrowser, tr("About"));
+  _tabWidget->addTab(aboutWidget, tr("About"));
 }
 
 void AboutDialog::createChangelogTab()

From 723f7c10b88d3c43e1a55bdf80b99ae6f302f549 Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Fri, 22 May 2026 00:21:43 -0400
Subject: [PATCH 3/7] Merge HACKING into CONTRIBUTING.md

Consolidate developer documentation into a single file. Also fixes
a broken issue tracker link and a typo in the feature requests section.
---
 CONTRIBUTING.md | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
 HACKING         | 89 --------------------------------------------
 2 files changed, 96 insertions(+), 92 deletions(-)
 delete mode 100644 HACKING

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c2f587d3..a17b5376 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,6 +13,14 @@ It really helps us efficiently process your contribution!
 [Report a bug](#bug-reports)   
 [Request a feature](#feature-requests)   
 [Contribute code](#contributing-code)  
+[Coding style](#coding-style)  
+[Building](#building)  
+[Version numbers](#version-numbers)  
+[Files overview](#files-overview)  
+[Code management with Git](#code-management-with-git)  
+[Make a release](#make-a-release)  
+[Project file version number](#project-file-version-number)  
+[Qt resources system](#qt-resources-system)  
 
  ## <a id='bug-reports'></a>Report a bug
 
@@ -44,7 +52,7 @@ We already have a formal [roadmap](https://github.com/mapmapteam/mapmap/wiki/Roa
 Feature requests are therefore mostly a way of us discussing/feeling out together where we'd like the project to go. 
 This can sometimes involve a lot of discussion, as everyone uses MapMap differently. You can join the [MapMap Slack team](https://mapmap.slack.com/) and use the `#feature` channel channel for general questions or discussion about new features
 
-Feature requests are created as Github Issues, just like bugs.t
+Feature requests are created as Github Issues, just like bugs.
 Feature requests are also where code that you or anyone else would like to include in a future pull request is **discussed before being implemented!**
 If you're writing code to add a new feature that you think would be awesome to have in the core, that's great! 
 But please make sure it's been discussed as a feature request _before_ you submit your pull request, as that increases the chances that your pull request will be accepted. 
@@ -63,7 +71,7 @@ As with most open source projects, the fastest way to get a feature made is to m
 We are more likely to accept your code if we feel like it has been discussed already. 
 If you are submitting a new feature, it's best if the feature has been discussed beforehand, either as a [feature request](#feature-requests) or on the [Slack](https://mapmap.slack.com/) or the [mailing list](https://listes.koumbit.net/cgi-bin/mailman/listinfo/mapmap-list-mapmap.info).
 
-- Please read the [code style guidelines](https://github.com/mapmapteam/mapmap/wiki/MapMap-Code-Style) and make sure your code conforms to them.
+- Please read the [coding style](#coding-style) section below and make sure your code conforms to it.
 If in doubt, try and match the style and practices you find in the code you are working with.
 - Please write _descriptive commit messages_ for each of the commits that you make.
 They don't have to be in-depth, just a brief summary of what the commit contains. A page describing how well-written commit messages look like can be found [here](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
@@ -88,5 +96,90 @@ This granularity makes the code easier to deal with in cases where some things h
 - All pull requests that contain changes that need to be in the changelog **must include relevant additions to `NEWS`**. Use previous entries as a guide for style/indentation/etc.
 - In the comments field on your new pull request, enter a description of everything that the code in the pull request does. 
   - This description is the first contact most of the core team will have with your code, so you should use it to explain why your pull request is awesome and we should accept it. 
-  - Reference any issues or bugs in the [MapMap issue tracker](github.com/openframeworks/openFrameworks/issues) that are relevant to your pull request using `#issue number` notation, eg to reference issue __1234__ write `#1234`.
+  - Reference any issues or bugs in the [MapMap issue tracker](https://github.com/mapmapteam/mapmap/issues) that are relevant to your pull request using `#issue number` notation, eg to reference issue __1234__ write `#1234`.
   - Mention if the code has been tested and on what platform.
+
+## <a id='coding-style'></a>Coding style
+
+* Indent with 2 spaces
+* Opening curly braces on a new line
+* Function and method names camelCase, with lowercase first letter
+* Class names CamelCase
+* Private data members with an underscore as a prefix: `_likeThis`
+* File names all lowercase
+* Always add spaces between operators such as `+`, `-`, `/`, `*`, casts, etc. (except pointers and references)
+
+## <a id='building'></a>Building
+
+See INSTALL.
+
+You will need to install markdown to build some of the documentation that comes with the software.
+
+## <a id='version-numbers'></a>Version numbers
+
+We use Semantic Versioning 2.0.0. Given a version number MAJOR.MINOR.PATCH, increment the:
+* MAJOR version when you make incompatible API changes,
+* MINOR version when you add functionality in a backwards-compatible manner, and
+* PATCH version when you make backwards-compatible bug fixes.
+See http://semver.org/
+
+We want the 0 series to be backward-compatible. That means that a project created with MapMap 0.1 should still work with MapMap 0.99, if we ever get to such a version number. When we will break this backward-compatibilty, we will start the 1 series and provide a migration script. This script might be ran from the command-line or on the Web. The other thing we need to be backward-compatible is the OSC interface. The rest of the software can change. This includes the names of the menu items and the appearance of the user interface. We will try to keep these consistent, though.
+
+## <a id='files-overview'></a>Files overview
+
+* CONTRIBUTING.md: What to know to contribute to the project.
+* INSTALL: Instructions to build and install the software.
+* NEWS: Release notes for each tag.
+* README: The short documentation at the root of the project
+* TODO: You can put things to do there, or use https://github.com/mapmapteam/mapmap
+* images/: Images part of the GUI.
+* prototypes/ : Contains prototypes. Please ask the project maintainer before removing some of these.
+* docs/informations/*.md Markdown files to generate the About dialog
+
+## <a id='code-management-with-git'></a>Code management with Git
+
+* We develop in the develop branch. The master branch is only for the latest tag.
+* Create a branch for each new features. Merge it to develop.
+* Create release-x.y.z branch for releases.
+* If possible, avoid merges, and use git rebase instead. (like in the GNOME projects)
+* Create a x.y branch for each x.y major.minor version series.
+* For a new release, merge develop to master (or your branch to the major.minor branch if it's a bugfix release) and then tag it there.
+* In doubt, ask the release manager.
+
+## <a id='make-a-release'></a>Make a release
+
+* If it's a new feature, increment minor. If it's bugfix, increment micro. If it's not backward-compatible, increment major.
+* Create a release-x.y.z branch
+* Verify the version number:
+  * vim -o VERSION.txt DMGVERSION.txt mapmap.pro docs/Doxyfile NEWS src/core/MM.cpp
+  * VERSION.txt
+  * VERSION in MM.cpp
+  * VERSION in mapmap.pro
+  * PROJECT_NUMBER in Doxyfile
+* Edit NEWS - update with the news for the release you are about to make
+* Run ./scripts/update-changelog.sh and commit the changes
+* Maybe update the docs/informations/osc.md file and run scripts/update-osc.sh and commit the changes
+* Maybe update the docs/informations/CONTRIBUTORS.md file and run scripts/update-contributors.sh and commit the changes
+* run make
+* run ./sh_build_doc.sh
+* merge to master, or to the major.minor branch
+* run ./sh_make_tarball.sh
+* then untar it, cd to that dir and build the whole thing to see if it works
+* git tag x.y.z
+* go back to your release branch
+* increment micro (or minor) version number in the files above.
+* merge into develop.
+* keep developing.
+
+## <a id='project-file-version-number'></a>Project file version number
+
+* Update its minor number when you introduce new features.
+* Update its major number when it's not backward-compatible anymore with its previous versions.
+* Generally, we should follow the MapMap version, when new changes are introduced. (no need to increment it otherwise)
+
+## <a id='qt-resources-system'></a>Qt resources system
+
+* The mapmap.pro file is where the packaging is done
+* The mapmap.qrc file is where we specify which resources are packaged with the app.
+* Images are set there. They are then available as a path-like alias such as ":/fullscreen"
+* See https://doc.qt.io/qt-6/resources.html
diff --git a/HACKING b/HACKING
deleted file mode 100644
index a7a77c91..00000000
--- a/HACKING
+++ /dev/null
@@ -1,89 +0,0 @@
-Contribute to MapMap
-====================
-
-Build software, doc and the translations
-----------------------------------------
-See INSTALL.
-
-You will need to install markdown to build some of the documentation that comes with the software.
-
-Coding style
-------------
-* indent with 2 spaces
-* opening curly braces on a new line
-* function and method names camelCase, with lowercase first letter
-* class names CamelCase
-* private data members with an underscore as a prefix: _likeThis
-* file names all lowercase
-* always add spaces between operators such as +, -, /, * casts, etc. (except pointers and references)
-
-Version numbers
----------------
-We use Semantic Versioning 2.0.0. Given a version number MAJOR.MINOR.PATCH, increment the:
-* MAJOR version when you make incompatible API changes,
-* MINOR version when you add functionality in a backwards-compatible manner, and
-* PATCH version when you make backwards-compatible bug fixes.
-See http://semver.org/
-
-We want the 0 series to be backward-compatible. That means that a project created with MapMap 0.1 should still work with MapMap 0.99, if we ever get to such a version number. When we will break this backward-compatibilty, we will start the 1 series and provide a migration script. This script might be ran from the command-line or on the Web. The other thing we need to be backward-compatible is the OSC interface. The rest of the software can change. This includes the names of the menu items and the appearance of the user interface. We will try to keep these consistent, though.
-
-Files
------
-* HACKING: What to know to contribute to the project.
-* INSTALL: Instructions to build and install the software.
-* NEWS: Release notes for each tag.
-* README: The short documentation at the root of the project
-* TODO: You can put things to do there, or use https://github.com/mapmapteam/mapmap, or https://www.pivotaltracker.com/s/projects/954570/
-* images/: Images part of the GUI.
-* prototypes/ : Contains prototypes. Please ask the project maintainer before removing some of these.
-* docs/informations/*.md Markdown files to generate the About dialog
-
-Code management with Git
-------------------------
-* We develop in the develop branch. The master branch is only for the latest tag.
-* Create a branch for each new features. Merge it to develop.
-* Create release-x.y.z branch for releases.
-* If possible, avoid merges, and use git rebase instead. (like in the GNOME projects)
-* Create a x.y branch for each x.y major.minor version series.
-* For a new release, merge develop to master (or your branch to the major.minor branch if it's a bugfix release) and then tag it there.
-* In doubt, ask the release manager.
-
-Make a release
---------------
-* If it's a new feature, increment minor. If it's bugfix, increment micro. If it's not backward-compatible, increment major.
-* Create a release-x.y.z branch
-* Verify the version number:
-  * vim -o VERSION.txt DMGVERSION.txt mapmap.pro docs/Doxyfile NEWS src/core/MM.cpp
-  * VERSION.txt
-  * VERSION in MM.cpp
-  * VERSION in mapmap.pro
-  * PROJECT_NUMBER in Doxyfile
-* Edit NEWS - update with the news for the release you are about to make
-* Run ./scripts/update-changelog.sh and commit the changes
-* Maybe update the docs/informations/osc.md file and run scripts/update-osc.sh and commit the changes
-* Maybe update the docs/informations/CONTRIBUTORS.md file and run scripts/update-contributors.sh and commit the changes
-* run make
-* run ./sh_build_doc.sh
-* merge to master, or to the major.minor branch
-* run ./sh_make_tarball.sh
-* then untar it, cd to that dir and build the whole thing to see if it works
-* git tag x.y.z
-* go back to your release branch
-* increment micro (or minor) version number in the files above.
-* merge into develop.
-* keep developing.
-
-XML file version number
------------------------
-* update its minor number when you introduce new features.
-* update its major number when it's not backward-comptatible anymore with its previous versions
-* generally, we should follow the MapMap version, when new changes are introduced. (no need to increment it otherwise)
-* we will need to implement some fancy XML file version number checking in the future.
-
-Qt resources system
--------------------
-* The mapmap.pro file is where the packaging is done
-* The mapmap.qrc file is where we specify which resources are packaged with the app.
-* Images are set there. They are then available as a path-like alias such as ":/fullscreen"
-* See http://doc.qt.io/qt-5/resources.html
-

From 95bbe931960040485b0caac3d7dc2d0e0d127deb Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Fri, 22 May 2026 00:38:18 -0400
Subject: [PATCH 4/7] Change settings domain to artpluscode.com and separate
 website URL

Settings domain changed from mapmap.info to artpluscode.com for
QSettings and macOS bundle identifier. Website URL split into its
own constant pointing to mapmapteam.github.io. Contact email
updated to mapmap@artpluscode.com.
---
 CODE_OF_CONDUCT.md         | 2 +-
 resources/macOS/Info.plist | 2 +-
 src/core/MM.cpp            | 3 ++-
 src/core/MM.h              | 1 +
 src/gui/AboutDialog.cpp    | 2 +-
 src/gui/MainWindow.h       | 6 +++---
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 4530484d..7f713de1 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@mapmap.info. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mapmap@artpluscode.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 
diff --git a/resources/macOS/Info.plist b/resources/macOS/Info.plist
index 4708cb98..d0c0cb31 100644
--- a/resources/macOS/Info.plist
+++ b/resources/macOS/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 <key>CFBundleIdentifier</key>
-<string>info.mapmapteam.MapMap</string>
+<string>com.artpluscode.MapMap</string>
 <key>CFBundleName</key>
 <string>mapmap</string>
 <key>CFBundleExecutable</key>
diff --git a/src/core/MM.cpp b/src/core/MM.cpp
index bae9a734..f81c7bf2 100644
--- a/src/core/MM.cpp
+++ b/src/core/MM.cpp
@@ -26,7 +26,8 @@ const QString MM::APPLICATION_NAME = "MapMap";
 const QString MM::VERSION = "0.6.3";
 const QString MM::COPYRIGHT_OWNERS = "Alexandre Quessy, Sofian Audry, Dame Diongue, Mike Latona, Vasilis Liaskovitis";
 const QString MM::ORGANIZATION_NAME = "MapMap";
-const QString MM::ORGANIZATION_DOMAIN = "mapmap.info";
+const QString MM::ORGANIZATION_DOMAIN = "artpluscode.com";
+const QString MM::WEBSITE_URL = "https://mapmapteam.github.io";
 const QString MM::FILE_EXTENSION = "mmp";
 const QString MM::VIDEO_FILES_FILTER = "*.mov *.mp4 *.avi *.ogg *.ogv *.mpeg *.mpeg1 *.mpeg4 *.mpg *.mpg2 *.mp2 *.mjpq *.mjp *.wmv *.webm *sock";
 const QString MM::IMAGE_FILES_FILTER = "*.jpg *.jpeg *.gif *.png *.tiff *.tif *.bmp";
diff --git a/src/core/MM.h b/src/core/MM.h
index 91928c1a..a9fec16a 100644
--- a/src/core/MM.h
+++ b/src/core/MM.h
@@ -55,6 +55,7 @@ class MM
   static const QString COPYRIGHT_OWNERS;
   static const QString ORGANIZATION_NAME;
   static const QString ORGANIZATION_DOMAIN;
+  static const QString WEBSITE_URL;
   static const QString FILE_EXTENSION;
   static const QString VIDEO_FILES_FILTER;
   static const QString IMAGE_FILES_FILTER;
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index 73d1a531..6707ab4a 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -102,7 +102,7 @@ void AboutDialog::createAboutTab()
   aboutMappingFile.open(QIODevice::ReadOnly | QIODevice::Text);
   QString aboutMappingText = QString::fromUtf8(aboutMappingFile.readAll());
   // Visit our website for more information
-  QString projectWebsiteText = "<p>" + tr("See the ") + QString("<a href=\"http://%1\">").arg(MM::ORGANIZATION_DOMAIN) +
+  QString projectWebsiteText = "<p>" + tr("See the ") + QString("<a href=\"%1\">").arg(MM::WEBSITE_URL) +
                                                  tr("%1 website").arg(MM::APPLICATION_NAME) + "</a> for more information on this software.</p>";
 
   // Append texts
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index c09d300a..2e5503a9 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -148,15 +148,15 @@ private slots:
 
   // Some help links
   void documentation() {
-      QDesktopServices::openUrl(QUrl("http://mapmap.info/"));
+      QDesktopServices::openUrl(QUrl(MM::WEBSITE_URL));
   }
   // Send us feedback
   void sendFeedback() {
-      QDesktopServices::openUrl(QUrl("mailto:mapmap-list@mapmap.info"));
+      QDesktopServices::openUrl(QUrl("mailto:mapmap@artpluscode.com"));
   }
   // Technical support
   void technicalSupport() {
-      QDesktopServices::openUrl(QUrl("http://mapmap.info/"));
+      QDesktopServices::openUrl(QUrl(MM::WEBSITE_URL));
   }
   // Report an issues
   void reportBug() {

From 5ce2bde8d92bd0c0c9fe9827defa33ba4901e5df Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Fri, 22 May 2026 00:49:50 -0400
Subject: [PATCH 5/7] Move prototypes to separate repository

Prototypes moved to prototypes-mapmap repo to reduce main repo size.
---
 prototypes/blackmagic/composite.sh            |   7 -
 prototypes/blackmagic/hdmi-v4l2.sh            |  24 --
 prototypes/blackmagic/hdmi.sh                 |  16 -
 prototypes/blackmagic/s-video.sh              |  15 -
 prototypes/cairo/build.sh                     |   5 -
 prototypes/cairo/cairo-proto.c                | 182 ---------
 prototypes/controller/controller.h            |  51 ---
 prototypes/glfw/Makefile                      |  20 -
 prototypes/glfw/README                        |   1 -
 prototypes/glfw/example.png                   | Bin 13385 -> 0 bytes
 prototypes/glfw/main.c                        | 257 ------------
 prototypes/gst/color-balance.sh               |  21 -
 prototypes/gtk/Makefile                       |  20 -
 prototypes/gtk/main.c                         | 353 -----------------
 prototypes/properties/README                  |   2 -
 prototypes/properties/build.sh                |   4 -
 prototypes/properties/hello.pro               |  11 -
 prototypes/properties/main.cpp                |  66 ----
 prototypes/sdl/Makefile                       |  20 -
 prototypes/sdl/README                         |   1 -
 prototypes/sdl/example.png                    | Bin 13385 -> 0 bytes
 prototypes/sdl/main.c                         | 370 -----------------
 prototypes/sh-osx-gst-test.sh                 |  10 -
 prototypes/shm/read.sh                        |   5 -
 prototypes/shm/write.sh                       |   5 -
 prototypes/wx/wx-01-simple/build.sh           |   3 -
 prototypes/wx/wx-01-simple/example.png        | Bin 13385 -> 0 bytes
 prototypes/wx/wx-01-simple/main.cpp           | 373 ------------------
 prototypes/wx/wx-02-input-output/Common.cpp   |  52 ---
 prototypes/wx/wx-02-input-output/Common.h     |  38 --
 .../DestinationGLCanvas.cpp                   |  71 ----
 .../wx-02-input-output/DestinationGLCanvas.h  |  49 ---
 prototypes/wx/wx-02-input-output/Mapper.h     | 174 --------
 .../wx/wx-02-input-output/MapperGLCanvas.cpp  | 120 ------
 .../wx/wx-02-input-output/MapperGLCanvas.h    |  56 ---
 prototypes/wx/wx-02-input-output/Paint.h      |  92 -----
 prototypes/wx/wx-02-input-output/Shape.h      |  66 ----
 .../wx/wx-02-input-output/SourceGLCanvas.cpp  | 109 -----
 .../wx/wx-02-input-output/SourceGLCanvas.h    |  50 ---
 prototypes/wx/wx-02-input-output/build.sh     |   3 -
 prototypes/wx/wx-02-input-output/example.png  | Bin 13385 -> 0 bytes
 prototypes/wx/wx-02-input-output/main.cpp     |  63 ---
 prototypes/wx/wx-03-polyline/build.sh         |   7 -
 prototypes/wx/wx-03-polyline/main.cpp         | 369 -----------------
 44 files changed, 3161 deletions(-)
 delete mode 100755 prototypes/blackmagic/composite.sh
 delete mode 100755 prototypes/blackmagic/hdmi-v4l2.sh
 delete mode 100755 prototypes/blackmagic/hdmi.sh
 delete mode 100755 prototypes/blackmagic/s-video.sh
 delete mode 100755 prototypes/cairo/build.sh
 delete mode 100644 prototypes/cairo/cairo-proto.c
 delete mode 100644 prototypes/controller/controller.h
 delete mode 100644 prototypes/glfw/Makefile
 delete mode 100644 prototypes/glfw/README
 delete mode 100644 prototypes/glfw/example.png
 delete mode 100644 prototypes/glfw/main.c
 delete mode 100755 prototypes/gst/color-balance.sh
 delete mode 100644 prototypes/gtk/Makefile
 delete mode 100644 prototypes/gtk/main.c
 delete mode 100644 prototypes/properties/README
 delete mode 100755 prototypes/properties/build.sh
 delete mode 100644 prototypes/properties/hello.pro
 delete mode 100644 prototypes/properties/main.cpp
 delete mode 100644 prototypes/sdl/Makefile
 delete mode 100644 prototypes/sdl/README
 delete mode 100644 prototypes/sdl/example.png
 delete mode 100644 prototypes/sdl/main.c
 delete mode 100755 prototypes/sh-osx-gst-test.sh
 delete mode 100755 prototypes/shm/read.sh
 delete mode 100755 prototypes/shm/write.sh
 delete mode 100755 prototypes/wx/wx-01-simple/build.sh
 delete mode 100644 prototypes/wx/wx-01-simple/example.png
 delete mode 100644 prototypes/wx/wx-01-simple/main.cpp
 delete mode 100644 prototypes/wx/wx-02-input-output/Common.cpp
 delete mode 100644 prototypes/wx/wx-02-input-output/Common.h
 delete mode 100644 prototypes/wx/wx-02-input-output/DestinationGLCanvas.cpp
 delete mode 100644 prototypes/wx/wx-02-input-output/DestinationGLCanvas.h
 delete mode 100644 prototypes/wx/wx-02-input-output/Mapper.h
 delete mode 100644 prototypes/wx/wx-02-input-output/MapperGLCanvas.cpp
 delete mode 100644 prototypes/wx/wx-02-input-output/MapperGLCanvas.h
 delete mode 100644 prototypes/wx/wx-02-input-output/Paint.h
 delete mode 100644 prototypes/wx/wx-02-input-output/Shape.h
 delete mode 100644 prototypes/wx/wx-02-input-output/SourceGLCanvas.cpp
 delete mode 100644 prototypes/wx/wx-02-input-output/SourceGLCanvas.h
 delete mode 100755 prototypes/wx/wx-02-input-output/build.sh
 delete mode 100644 prototypes/wx/wx-02-input-output/example.png
 delete mode 100644 prototypes/wx/wx-02-input-output/main.cpp
 delete mode 100755 prototypes/wx/wx-03-polyline/build.sh
 delete mode 100644 prototypes/wx/wx-03-polyline/main.cpp

diff --git a/prototypes/blackmagic/composite.sh b/prototypes/blackmagic/composite.sh
deleted file mode 100755
index c8c250c0..00000000
--- a/prototypes/blackmagic/composite.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Using the Blackmagic Intensity Pro
-
-gst-launch -v decklinksrc mode=3 connection=4 ! \
-    ffmpegcolorspace ! \
-    xvimagesink sync=false
-
diff --git a/prototypes/blackmagic/hdmi-v4l2.sh b/prototypes/blackmagic/hdmi-v4l2.sh
deleted file mode 100755
index 1fcf2aec..00000000
--- a/prototypes/blackmagic/hdmi-v4l2.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# Using the Blackmagic Intensity Shuttle USB 3.0
-#
-# Download and build: you can download source driver from
-# https://www.blackmagicdesign.com/support - compile a driver from this site
-# for a decklinksink blackmagic card
-# Direct link:
-# https://www.blackmagicdesign.com/support/download/f73ee77fdd384b5286fe86a46d20d045/Linux
-
-GST_DEBUG=2 \
-LANG=C \
-gst-launch-1.0 decklinksrc mode=11 connection=0 audio-input=3 ! \
-    video/x-raw,format=UYVY,width=1920,height=1080,framerate=30000/1001,interlace-mode=interleaved ! \
-    queue ! xvimagesink
-
-# v4l2sink device=/dev/video1 sync=false
-
-
-# sync=false
-# gst-launch-1.0 -v decklinksrc mode=18 connection=1 ! \
-#     videoconvert ! \
-#     queue ! \
-#     xvimagesink
-# 
diff --git a/prototypes/blackmagic/hdmi.sh b/prototypes/blackmagic/hdmi.sh
deleted file mode 100755
index 2964797a..00000000
--- a/prototypes/blackmagic/hdmi.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Using the Blackmagic Intensity Shuttle USB 3.0
-#
-# Download and build: you can download source driver from
-# https://www.blackmagicdesign.com/support - compile a driver from this site
-# for a decklinksink blackmagic card
-# Direct link:
-# https://www.blackmagicdesign.com/support/download/f73ee77fdd384b5286fe86a46d20d045/Linux
-
-GST_DEBUG=4 \
-LANG=C \
-gst-launch-1.0 -v decklinksrc mode=18 connection=1 ! \
-    videoconvert ! \
-    queue ! \
-    xvimagesink
-# sync=false
diff --git a/prototypes/blackmagic/s-video.sh b/prototypes/blackmagic/s-video.sh
deleted file mode 100755
index de3e6146..00000000
--- a/prototypes/blackmagic/s-video.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Using the Blackmagic Intensity Shuttle USB 3.0
-#
-# Download and build: you can download source driver from
-# https://www.blackmagicdesign.com/support - compile a driver from this site
-# for a decklinksink blackmagic card
-# Direct link:
-# https://www.blackmagicdesign.com/support/download/f73ee77fdd384b5286fe86a46d20d045/Linux
-
-GST_DEBUG=2 \
-LANG=C \
-sudo gst-launch-1.0 -v decklinksrc mode=3 connection=5 ! \
-    videoconvert ! \
-    xvimagesink
-# sync=false
diff --git a/prototypes/cairo/build.sh b/prototypes/cairo/build.sh
deleted file mode 100755
index e2bb4427..00000000
--- a/prototypes/cairo/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-CFLAGS=`pkg-config --cflags cairo gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-1.0`
-LDFLAGS=`pkg-config --libs cairo gstreamer-plugins-base-1.0 gstreamer-video-1.0 gstreamer-1.0`
-
-gcc -o cairo-proto -Wall cairo-proto.c ${LDFLAGS} ${CFLAGS}
diff --git a/prototypes/cairo/cairo-proto.c b/prototypes/cairo/cairo-proto.c
deleted file mode 100644
index 9e9f71af..00000000
--- a/prototypes/cairo/cairo-proto.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* GStreamer
- * Copyright (C) 2011 Jon Nordby <jononor@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-/*
- * Example showing usage of the cairooverlay element
- */
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-
-#include <cairo.h>
-#include <cairo-gobject.h>
-
-#include <glib.h>
-
-
-static gboolean
-on_message (GstBus * bus, GstMessage * message, gpointer user_data)
-{
-  GMainLoop *loop = (GMainLoop *) user_data;
-
-  switch (GST_MESSAGE_TYPE (message)) {
-    case GST_MESSAGE_ERROR:{
-      GError *err = NULL;
-      gchar *debug;
-
-      gst_message_parse_error (message, &err, &debug);
-      g_critical ("Got ERROR: %s (%s)", err->message, GST_STR_NULL (debug));
-      g_main_loop_quit (loop);
-      break;
-    }
-    case GST_MESSAGE_WARNING:{
-      GError *err = NULL;
-      gchar *debug;
-
-      gst_message_parse_warning (message, &err, &debug);
-      g_warning ("Got WARNING: %s (%s)", err->message, GST_STR_NULL (debug));
-      g_main_loop_quit (loop);
-      break;
-    }
-    case GST_MESSAGE_EOS:
-      g_main_loop_quit (loop);
-      break;
-    default:
-      break;
-  }
-
-  return TRUE;
-}
-
-/* Datastructure to share the state we are interested in between
- * prepare and render function. */
-typedef struct
-{
-  gboolean valid;
-  GstVideoInfo vinfo;
-} CairoOverlayState;
-
-/* Store the information from the caps that we are interested in. */
-static void
-prepare_overlay (GstElement * overlay, GstCaps * caps, gpointer user_data)
-{
-  CairoOverlayState *state = (CairoOverlayState *) user_data;
-
-  state->valid = gst_video_info_from_caps (&state->vinfo, caps);
-}
-
-/* Draw the overlay. 
- * This function draws a cute "beating" heart. */
-static void
-draw_overlay (GstElement * overlay, cairo_t * cr, guint64 timestamp,
-    guint64 duration, gpointer user_data)
-{
-  CairoOverlayState *s = (CairoOverlayState *) user_data;
-  double scale;
-  int width, height;
-
-  if (!s->valid)
-    return;
-
-  width = GST_VIDEO_INFO_WIDTH (&s->vinfo);
-  height = GST_VIDEO_INFO_HEIGHT (&s->vinfo);
-
-  scale = 2 * (((timestamp / (int) 1e7) % 70) + 30) / 100.0;
-  cairo_translate (cr, width / 2, (height / 2) - 30);
-
-  /* FIXME: this assumes a pixel-aspect-ratio of 1/1 */
-  cairo_scale (cr, scale, scale);
-
-  cairo_move_to (cr, 0, 0);
-  cairo_curve_to (cr, 0, -30, -50, -30, -50, 0);
-  cairo_curve_to (cr, -50, 30, 0, 35, 0, 60);
-  cairo_curve_to (cr, 0, 35, 50, 30, 50, 0);
-  cairo_curve_to (cr, 50, -30, 0, -30, 0, 0);
-  cairo_set_source_rgba (cr, 0.9, 0.0, 0.1, 0.7);
-  cairo_fill (cr);
-}
-
-static GstElement *
-setup_gst_pipeline (CairoOverlayState * overlay_state)
-{
-  GstElement *pipeline;
-  GstElement *cairo_overlay;
-  GstElement *source, *adaptor1, *adaptor2, *sink;
-
-  pipeline = gst_pipeline_new ("cairo-overlay-example");
-
-  /* Adaptors needed because cairooverlay only supports ARGB data */
-  source = gst_element_factory_make ("videotestsrc", "source");
-  adaptor1 = gst_element_factory_make ("videoconvert", "adaptor1");
-  cairo_overlay = gst_element_factory_make ("cairooverlay", "overlay");
-  adaptor2 = gst_element_factory_make ("videoconvert", "adaptor2");
-  sink = gst_element_factory_make ("ximagesink", "sink");
-  if (sink == NULL)
-    sink = gst_element_factory_make ("autovideosink", "sink");
-
-  /* If failing, the element could not be created */
-  g_assert (cairo_overlay);
-
-  /* Hook up the neccesary signals for cairooverlay */
-  g_signal_connect (cairo_overlay, "draw",
-      G_CALLBACK (draw_overlay), overlay_state);
-  g_signal_connect (cairo_overlay, "caps-changed",
-      G_CALLBACK (prepare_overlay), overlay_state);
-
-  gst_bin_add_many (GST_BIN (pipeline), source, adaptor1,
-      cairo_overlay, adaptor2, sink, NULL);
-
-  if (!gst_element_link_many (source, adaptor1,
-          cairo_overlay, adaptor2, sink, NULL)) {
-    g_warning ("Failed to link elements!");
-  }
-
-  return pipeline;
-}
-
-int
-main (int argc, char **argv)
-{
-  GMainLoop *loop;
-  GstElement *pipeline;
-  GstBus *bus;
-  CairoOverlayState *overlay_state;
-
-  gst_init (&argc, &argv);
-  loop = g_main_loop_new (NULL, FALSE);
-
-  /* allocate on heap for pedagogical reasons, makes code easier to transfer */
-  overlay_state = g_new0 (CairoOverlayState, 1);
-
-  pipeline = setup_gst_pipeline (overlay_state);
-
-  bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
-  gst_bus_add_signal_watch (bus);
-  g_signal_connect (G_OBJECT (bus), "message", G_CALLBACK (on_message), loop);
-  gst_object_unref (GST_OBJECT (bus));
-
-  gst_element_set_state (pipeline, GST_STATE_PLAYING);
-  g_main_loop_run (loop);
-
-  gst_element_set_state (pipeline, GST_STATE_NULL);
-  gst_object_unref (pipeline);
-
-  g_free (overlay_state);
-  return 0;
-}
diff --git a/prototypes/controller/controller.h b/prototypes/controller/controller.h
deleted file mode 100644
index cb1bd8ee..00000000
--- a/prototypes/controller/controller.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <QVariant>
-#include <string>
-#include "MainWindow.h"
-
-/**
- * Facade to control the application.
- *
- * TODO: implement it.
- * TODO: include it in the project
- * TODO: add signals
- * TODO: the whole app should use actual QObject for properties of everything
- */
-class Controller
-{
-    public:
-        Controller(MainWindow *owner);
-        // CRUD
-        bool createObject(const char *objType, std::string &objName);
-        bool listObjects(const char *objType, QList<QString> &objNames);
-        bool destroyObject(const char *objName);
-        bool setObjectProperty(const char *objName, const char *propName,
-            const QVariantList &value);
-        bool getObjectProperty(const char *objName, const char *propName,
-            QVariantList &value);
-        bool listObjectProperties(const char *objName, QList<QString> &values);
-        bool saveProject(const char *fileName);
-        bool loadProject(const char *fileName);
-        bool quit();
-    private:
-        MainWindow *_owner;
-};
-
-int main(int argc, char **argv)
-{
-    /* Example: */
-    Controller *controller = new Controller(NULL);
-
-    std::string quadName;
-    std::string imageName;
-
-    controller->createObject("image", imageName);
-    controller->createObject("quad", quadName);
-    controller->setObjectProperty(sourceName, "uri", QVariant(QString("image.jpg")));
-    controller->setObjectProperty(quadName, "source", QVariant(QString(imageName.c_str())));
-    controller->setObjectProperty(quadName, "x1", QVariant(3.14159));
-    controller->saveProject("project.lmp");
-    controller->quit();
-
-    delete controller;
-    return 0;
-}
diff --git a/prototypes/glfw/Makefile b/prototypes/glfw/Makefile
deleted file mode 100644
index 5c275e4b..00000000
--- a/prototypes/glfw/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-DEPS=glfw3 glu gl
-CC=gcc
-CC_FLAGS=-O0 -g `pkg-config --cflags --libs $(DEPS)` -lSOIL
-EXEC=run
-SOURCES=$(wildcard *.c)
-OBJECTS=$(SOURCES:.c=.o)
-
-all: run
-
-$(EXEC): $(OBJECTS)
-	$(CC) $(OBJECTS) $(CC_FLAGS) -o $(EXEC)
-
-%.o: %.c
-	$(CC) -c $(CC_FLAGS) $< -o $@
-
-clean:
-	rm -f $(EXEC) $(OBJECTS)
-
diff --git a/prototypes/glfw/README b/prototypes/glfw/README
deleted file mode 100644
index 0cc36a2a..00000000
--- a/prototypes/glfw/README
+++ /dev/null
@@ -1 +0,0 @@
-sudo yum install -y SOIL-devel glfw-devel
diff --git a/prototypes/glfw/example.png b/prototypes/glfw/example.png
deleted file mode 100644
index ffb8a2c1664e7ea2a0b61fce458c9c555c71638c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13385
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
b3RF0eGJ`!~>AC$EA;9dc)tU0s?$Q4P3fSHz

diff --git a/prototypes/glfw/main.c b/prototypes/glfw/main.c
deleted file mode 100644
index a77e18ae..00000000
--- a/prototypes/glfw/main.c
+++ /dev/null
@@ -1,257 +0,0 @@
-//========================================================================
-// Simple GLFW example
-// Copyright (c) Camilla Berglund <elmindreda@elmindreda.org>
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would
-//    be appreciated but is not required.  //
-// 2. Altered source versions must be plainly marked as such, and must not
-//    be misrepresented as being the original software.
-//
-// 3. This notice may not be removed or altered from any source
-//    distribution.
-//
-//========================================================================
-//! [code]
-
-#include <GL/glfw3.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <SOIL/SOIL.h>
-
-typedef struct _Quad
-{
-  int x1;
-  int x2;
-  int x3;
-  int x4;
-  int y1;
-  int y2;
-  int y3;
-  int y4;
-} Quad;
-
-static Quad src;
-static Quad dst;
-
-static void error_callback(int error, const char* description)
-{
-    fputs(description, stderr);
-}
-
-// static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
-// {
-//     if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS)
-//         glfwSetWindowShouldClose(window, GL_TRUE);
-// }
-//
-
-static void
-move_point (int index, int x, int y)
-{
-  printf ("move_point (index=%d, x=%d, y=%d)\n", index, x, y);
-  switch (index)
-  {
-    case 1:
-      src.x1 += x;
-      src.y1 += y;
-      break;
-    case 2:
-      src.x2 += x;
-      src.y2 += y;
-      break;
-    case 3:
-      src.x3 += x;
-      src.y3 += y;
-      break;
-    case 4:
-      src.x4 += x;
-      src.y4 += y;
-      break;
-    case 5:
-      dst.x1 += x;
-      dst.y1 += y;
-      break;
-    case 6:
-      dst.x2 += x;
-      dst.y2 += y;
-      break;
-    case 7:
-      dst.x3 += x;
-      dst.y3 += y;
-      break;
-    case 8:
-      dst.x4 += x;
-      dst.y4 += y;
-      break;
-  }
-}
-
-static void 
-key_callback (GLFWwindow *window, int key, int scancode, int action, int mods)
-{
-  static int current = 0;
-
-  //printf ("key_callback (window=%p, key=%d, scancode=%d, action=%d, mods=%d)\n",
-  //  window, key, scancode, action, mods);
-
-  if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS)
-    glfwSetWindowShouldClose(window, GL_TRUE);
-  else if (key == GLFW_KEY_TAB && action == GLFW_PRESS)
-  {
-    current = (current + 1) % 8;
-    printf ("Current = %d\n", current);
-  }
-  else if (action == GLFW_PRESS || action == GLFW_REPEAT)
-  {
-    if (key == GLFW_KEY_UP)
-      move_point (current + 1, 0, 1);
-    else if (key == GLFW_KEY_DOWN)
-      move_point (current + 1, 0, -1);
-    else if (key == GLFW_KEY_LEFT)
-      move_point (current + 1, -1, 0);
-    else if (key == GLFW_KEY_RIGHT)
-      move_point (current + 1, 1, 0);
-    else
-      printf ("Unhandled key = %d\n", key);
-  }
-}
-
-GLuint load_image (const char *imagepath)
-{
-  int width, height;
-  GLuint textureID = 0;
-
-  unsigned char * data =
-    SOIL_load_image(imagepath, &width, &height, 0, SOIL_LOAD_RGB );
-  textureID = SOIL_create_OGL_texture (
-    data, width, height, 3, textureID, 0);
-
-  // TODO: free data?
-
-  return textureID;
-}
-
-int main(void)
-{
-    GLFWwindow* window;
-    GLuint texture;
-    const int wrap = 1;
-
-    const float image_width = 320;
-    const float image_height = 240;
-
-    //source
-    src.x1 = 0;
-    src.y1 = 0;
-
-    src.x2 = 320;
-    src.y2 = 0;
-
-    src.x3 = 320;
-    src.y3 = 240;
-
-    src.x4 = 0;
-    src.y4 = 240;
-
-    //destination
-    dst.x1 = 0;
-    dst.y1 = 0;
-
-    dst.x2 = 320;
-    dst.y2 = 0;
-
-    dst.x3 = 320;
-    dst.y3 = 240;
-
-    dst.x4 = 0;
-    dst.y4 = 240;
-
-    glfwSetErrorCallback (error_callback);
-
-    if (! glfwInit ())
-      exit(EXIT_FAILURE);
-
-    window = glfwCreateWindow (640, 480, "MapMap prototype", NULL, NULL);
-    if (! window)
-    {
-        glfwTerminate ();
-        exit (EXIT_FAILURE);
-    }
-
-    glfwMakeContextCurrent (window);
-
-    texture = load_image ("example.png");
-
-    glfwSetKeyCallback (window, (GLFWkeyfun) key_callback);
-
-    while (! glfwWindowShouldClose (window))
-    {
-        float ratio;
-        int width, height;
-
-        //glfwGetFramebufferSize(window, &width, &height);
-        // XXX aalex I commented the line above and added the two lines below
-        width = 640;
-        height = 480;
-
-        ratio = width / (float) height;
-
-        glViewport (0, 0, width, height);
-        glClear (GL_COLOR_BUFFER_BIT);
-
-        glMatrixMode (GL_PROJECTION);
-        glLoadIdentity ();
-        glOrtho (-ratio, ratio, -1.f, 1.f, 1.f, -1.f);
-        glMatrixMode (GL_MODELVIEW);
-
-        glLoadIdentity ();
-
-        // DRAW THE TEXTURE
-        glPushMatrix ();
-        glDisable (GL_LIGHTING);
-        glColor3f (1, 1, 1);
-        glEnable (GL_TEXTURE_2D);
-        glBindTexture (GL_TEXTURE_2D, texture);
-
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-        glBegin (GL_QUADS);
-
-        glTexCoord2f (src.x1 / image_width, src.y1 / image_height);
-        glVertex3f (dst.x1 / image_width, dst.y1 / image_height, 0);
-
-        glTexCoord2f (src.x2 / image_width, src.y2 / image_height);
-        glVertex3f (dst.x2 / image_width, dst.y2 / image_height, 0);
-
-        glTexCoord2f (src.x3 / image_width, src.y3 / image_height);
-        glVertex3f (dst.x3 / image_width, dst.y3 / image_height, 0);
-
-        glTexCoord2f (src.x4 / image_width, src.y4 / image_height);
-        glVertex3f (dst.x4 / image_width, dst.y4 / image_height, 0);
-
-        glEnd ();
-        glDisable (GL_TEXTURE_2D);
-        glPopMatrix ();
-
-        glfwSwapBuffers (window);
-        glfwPollEvents ();
-    }
-
-    glfwDestroyWindow (window);
-
-    glfwTerminate ();
-    exit (EXIT_SUCCESS);
-}
diff --git a/prototypes/gst/color-balance.sh b/prototypes/gst/color-balance.sh
deleted file mode 100755
index c21d02ed..00000000
--- a/prototypes/gst/color-balance.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-# default:
-CONTRAST=1.5
-BRIGHTNESS=0.25
-SATURATION=1.25
-HUE=0.0
-
-# blasted
-# CONTRAST=2.0
-# BRIGHTNESS=1.0
-# SATURATION=2.0
-# HUE=0.0
-
-gst-launch-1.0 videotestsrc ! videobalance contrast=${CONTRAST} brightness=${BRIGHTNESS} saturation=${SATURATION} hue=${HUE} ! videoconvert ! autovideosink
-
-# Valid value for each setting:
-# 
-# contrast: [ 0 ~ 2 ] (default = 1)
-# brightness: [ -1~ 1] (default = 0)
-# saturation: [ 0 ~ 2 ] (default = 1)
-# hue: [ -1 ~ 1 ] (default = 0)
diff --git a/prototypes/gtk/Makefile b/prototypes/gtk/Makefile
deleted file mode 100644
index ce7e8159..00000000
--- a/prototypes/gtk/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-DEPS=gtk+-2.0 gtkglext-1.0
-CC=gcc
-CC_FLAGS=-O0 -g `pkg-config --cflags --libs $(DEPS)`
-EXEC=run
-SOURCES=$(wildcard *.c)
-OBJECTS=$(SOURCES:.c=.o)
-
-all: run
-
-$(EXEC): $(OBJECTS)
-	$(CC) $(OBJECTS) $(CC_FLAGS) -o $(EXEC)
-
-%.o: %.c
-	$(CC) -c $(CC_FLAGS) $< -o $@
-
-clean:
-	rm -f $(EXEC) $(OBJECTS)
-
diff --git a/prototypes/gtk/main.c b/prototypes/gtk/main.c
deleted file mode 100644
index 36442112..00000000
--- a/prototypes/gtk/main.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * pixmap.c:
- * Simple off-screen OpenGL rendering example.
- *
- * written by Naofumi Yasufuku  <naofumi@users.sourceforge.net>
- */
-
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
-
-#include <gtk/gtkgl.h>
-
-#ifdef G_OS_WIN32
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifdef GDK_WINDOWING_QUARTZ
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif
-
-static GdkGLConfig *glconfig = NULL;
-static GdkGLContext *glcontext = NULL;
-static GdkPixmap *pixmap = NULL;
-
-static void
-init (void)
-{
-  GLUquadricObj *qobj;
-  static GLfloat light_diffuse[] = {1.0, 0.0, 0.0, 1.0};
-  static GLfloat light_position[] = {1.0, 1.0, 1.0, 0.0};
-
-  qobj = gluNewQuadric ();
-  gluQuadricDrawStyle (qobj, GLU_FILL);
-  glNewList (1, GL_COMPILE);
-  gluSphere (qobj, 1.0, 20, 20);
-  glEndList ();
-
-  glLightfv (GL_LIGHT0, GL_DIFFUSE, light_diffuse);
-  glLightfv (GL_LIGHT0, GL_POSITION, light_position);
-  glEnable (GL_LIGHTING);
-  glEnable (GL_LIGHT0);
-  glEnable (GL_DEPTH_TEST);
-
-  glClearColor (1.0, 1.0, 1.0, 1.0);
-  glClearDepth (1.0);
-
-  glMatrixMode (GL_PROJECTION);
-  glLoadIdentity ();
-  gluPerspective (40.0, 1.0, 1.0, 10.0);
-
-  glMatrixMode (GL_MODELVIEW);
-  glLoadIdentity ();
-  gluLookAt (0.0, 0.0, 3.0,
-             0.0, 0.0, 0.0,
-             0.0, 1.0, 0.0);
-  glTranslatef (0.0, 0.0, -3.0);
-}
-
-static gboolean
-configure_event (GtkWidget         *widget,
-                 GdkEventConfigure *event,
-                 gpointer           data)
-{
-  GtkAllocation allocation;
-  GdkGLDrawable *gldrawable;
-  static gboolean is_initialized = FALSE;
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  /*
-   * Create an OpenGL off-screen rendering area.
-   */
-
-  if (pixmap != NULL)
-    g_object_unref (G_OBJECT (pixmap));
-
-  pixmap = gdk_pixmap_new (gtk_widget_get_window (widget),
-			   allocation.width,
-			   allocation.height,
-                           -1);
-
-  /*
-   * Set OpenGL-capability to the pixmap
-   */
-
-  gldrawable = GDK_GL_DRAWABLE (gdk_pixmap_set_gl_capability (pixmap,
-                                                              glconfig,
-                                                              NULL));
-
-  /*
-   * Create OpenGL rendering context (not direct).
-   */
-
-  if (glcontext == NULL)
-    {
-      glcontext = gdk_gl_context_new (gldrawable,
-                                      NULL,
-                                      FALSE,
-                                      GDK_GL_RGBA_TYPE);
-      if (glcontext == NULL)
-        {
-          g_print ("Connot create the OpenGL rendering context\n");
-          if (gtk_main_level () != 0)
-            gtk_main_quit ();
-          return TRUE;
-        }
-
-      g_print ("The OpenGL rendering context is created\n");
-    }
-
-  /*** OpenGL BEGIN ***/
-  if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext))
-    return FALSE;
-
-  if (!is_initialized)
-    {
-      init ();
-      is_initialized = TRUE;
-    }
-
-  glViewport (0, 0,
-              allocation.width, allocation.height);
-
-  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  glCallList (1);
-
-  glFlush ();
-
-  gdk_gl_drawable_gl_end (gldrawable);
-  /*** OpenGL END ***/
-
-  return TRUE;
-}
-
-static gboolean
-expose_event (GtkWidget      *widget,
-              GdkEventExpose *event,
-              gpointer        data)
-{
-  gdk_draw_drawable (gtk_widget_get_window (widget),
-		     gtk_widget_get_style (widget)->fg_gc[gtk_widget_get_state (widget)],
-		     pixmap,
-		     event->area.x, event->area.y,
-		     event->area.x, event->area.y,
-		     event->area.width, event->area.height);
-
-  return FALSE;
-}
-
-static gboolean
-destroy_gl_context (gpointer data)
-{
-  if (glconfig != NULL)
-    g_object_unref (G_OBJECT (glconfig));
-
-  if (glcontext != NULL)
-    g_object_unref (G_OBJECT (glcontext));
-
-  return FALSE;
-}
-
-static void
-print_gl_config_attrib (GdkGLConfig *glconfig,
-                        const gchar *attrib_str,
-                        int          attrib,
-                        gboolean     is_boolean)
-{
-  int value;
-
-  g_print ("%s = ", attrib_str);
-  if (gdk_gl_config_get_attrib (glconfig, attrib, &value))
-    {
-      if (is_boolean)
-        g_print ("%s\n", value == TRUE ? "TRUE" : "FALSE");
-      else
-        g_print ("%d\n", value);
-    }
-  else
-    g_print ("*** Cannot get %s attribute value\n", attrib_str);
-}
-
-static void
-examine_gl_config_attrib (GdkGLConfig *glconfig)
-{
-  g_print ("\nOpenGL visual configurations :\n\n");
-
-  g_print ("gdk_gl_config_is_rgba (glconfig) = %s\n",
-           gdk_gl_config_is_rgba (glconfig) ? "TRUE" : "FALSE");
-  g_print ("gdk_gl_config_is_double_buffered (glconfig) = %s\n",
-           gdk_gl_config_is_double_buffered (glconfig) ? "TRUE" : "FALSE");
-  g_print ("gdk_gl_config_is_stereo (glconfig) = %s\n",
-           gdk_gl_config_is_stereo (glconfig) ? "TRUE" : "FALSE");
-  g_print ("gdk_gl_config_has_alpha (glconfig) = %s\n",
-           gdk_gl_config_has_alpha (glconfig) ? "TRUE" : "FALSE");
-  g_print ("gdk_gl_config_has_depth_buffer (glconfig) = %s\n",
-           gdk_gl_config_has_depth_buffer (glconfig) ? "TRUE" : "FALSE");
-  g_print ("gdk_gl_config_has_stencil_buffer (glconfig) = %s\n",
-           gdk_gl_config_has_stencil_buffer (glconfig) ? "TRUE" : "FALSE");
-  g_print ("gdk_gl_config_has_accum_buffer (glconfig) = %s\n",
-           gdk_gl_config_has_accum_buffer (glconfig) ? "TRUE" : "FALSE");
-
-  g_print ("\n");
-
-  print_gl_config_attrib (glconfig, "GDK_GL_USE_GL",           GDK_GL_USE_GL,           TRUE);
-  print_gl_config_attrib (glconfig, "GDK_GL_BUFFER_SIZE",      GDK_GL_BUFFER_SIZE,      FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_LEVEL",            GDK_GL_LEVEL,            FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_RGBA",             GDK_GL_RGBA,             TRUE);
-  print_gl_config_attrib (glconfig, "GDK_GL_DOUBLEBUFFER",     GDK_GL_DOUBLEBUFFER,     TRUE);
-  print_gl_config_attrib (glconfig, "GDK_GL_STEREO",           GDK_GL_STEREO,           TRUE);
-  print_gl_config_attrib (glconfig, "GDK_GL_AUX_BUFFERS",      GDK_GL_AUX_BUFFERS,      FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_RED_SIZE",         GDK_GL_RED_SIZE,         FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_GREEN_SIZE",       GDK_GL_GREEN_SIZE,       FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_BLUE_SIZE",        GDK_GL_BLUE_SIZE,        FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_ALPHA_SIZE",       GDK_GL_ALPHA_SIZE,       FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_DEPTH_SIZE",       GDK_GL_DEPTH_SIZE,       FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_STENCIL_SIZE",     GDK_GL_STENCIL_SIZE,     FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_ACCUM_RED_SIZE",   GDK_GL_ACCUM_RED_SIZE,   FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_ACCUM_GREEN_SIZE", GDK_GL_ACCUM_GREEN_SIZE, FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_ACCUM_BLUE_SIZE",  GDK_GL_ACCUM_BLUE_SIZE,  FALSE);
-  print_gl_config_attrib (glconfig, "GDK_GL_ACCUM_ALPHA_SIZE", GDK_GL_ACCUM_ALPHA_SIZE, FALSE);
-
-  g_print ("\n");
-}
-
-int
-main (int   argc,
-      char *argv[])
-{
-  gint major, minor;
-
-  GtkWidget *window;
-  GtkWidget *vbox;
-  GtkWidget *drawing_area;
-  GtkWidget *button;
-
-  /*
-   * Init GTK.
-   */
-
-  gtk_init (&argc, &argv);
-
-  /*
-   * Init GtkGLExt.
-   */
-
-  gtk_gl_init (&argc, &argv);
-
-  /*
-   * Query OpenGL extension version.
-   */
-
-  gdk_gl_query_version (&major, &minor);
-  g_print ("\nOpenGL extension version - %d.%d\n",
-           major, minor);
-
-  /*
-   * Configure OpenGL-capable visual.
-   */
-
-  /* Try single-buffered visual */
-  glconfig = gdk_gl_config_new_by_mode (GDK_GL_MODE_RGB    |
-                                        GDK_GL_MODE_DEPTH  |
-                                        GDK_GL_MODE_SINGLE);
-  if (glconfig == NULL)
-    {
-      g_print ("*** No appropriate OpenGL-capable visual found.\n");
-      exit (1);
-    }
-
-  examine_gl_config_attrib (glconfig);
-
-  /*
-   * Top-level window.
-   */
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "pixmap");
-
-  /*
-   * If window manager doesn't watch the WM_COLORMAP_WINDOWS property on
-   * the top-level window, we have to set OpenGL window's colormap to the
-   * top-level window.
-   */
-  gtk_widget_set_colormap (window,
-                           gdk_gl_config_get_colormap (glconfig));
-
-  g_signal_connect (G_OBJECT (window), "delete_event",
-                    G_CALLBACK (gtk_main_quit), NULL);
-
-  /*
-   * VBox.
-   */
-
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-  gtk_widget_show (vbox);
-
-  /*
-   * Drawing area for drawing OpenGL scene.
-   */
-
-  drawing_area = gtk_drawing_area_new ();
-  gtk_widget_set_size_request (drawing_area, 200, 200);
-
-  /* Set OpenGL-capable colormap. */
-  gtk_widget_set_colormap (drawing_area,
-                           gdk_gl_config_get_colormap (glconfig));
-
-  g_signal_connect (G_OBJECT (drawing_area), "configure_event",
-		    G_CALLBACK (configure_event), NULL);
-  g_signal_connect (G_OBJECT (drawing_area), "expose_event",
-		    G_CALLBACK (expose_event), NULL);
-
-  gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
-
-  gtk_widget_show (drawing_area);
-
-  /*
-   * Simple quit button.
-   */
-
-  button = gtk_button_new_with_label ("Quit");
-
-  g_signal_connect (G_OBJECT (button), "clicked",
-                    G_CALLBACK (gtk_main_quit), NULL);
-
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-  gtk_widget_show (button);
-
-  /*
-   * Show window.
-   */
-
-  gtk_widget_show (window);
-
-  /*
-   * Main loop.
-   */
-
-  /* Destroy the GLX context explicitly when application is terminated. */
-  gtk_quit_add (0, (GtkFunction) destroy_gl_context, NULL);
-
-  gtk_main ();
-
-  return 0;
-}
diff --git a/prototypes/properties/README b/prototypes/properties/README
deleted file mode 100644
index 18e16616..00000000
--- a/prototypes/properties/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Doesn't work yet, but that is how properties work in Qt4.
-
diff --git a/prototypes/properties/build.sh b/prototypes/properties/build.sh
deleted file mode 100755
index c8d77916..00000000
--- a/prototypes/properties/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-# qt4-default qt4-qmake
-qmake-qt4
-make
diff --git a/prototypes/properties/hello.pro b/prototypes/properties/hello.pro
deleted file mode 100644
index 31f56c8a..00000000
--- a/prototypes/properties/hello.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG  += qt debug
-TEMPLATE = app
-HEADERS  = 
-SOURCES  = main.cpp
-QT      += gui
-RESOURCES = 
-
-docs.depends = $(HEADERS) $(SOURCES)
-docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen -
-QMAKE_EXTRA_TARGETS += docs
-
diff --git a/prototypes/properties/main.cpp b/prototypes/properties/main.cpp
deleted file mode 100644
index 433871d0..00000000
--- a/prototypes/properties/main.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <iostream>
-#include <QObject>
-#include <QVariant>
-#include <QMetaProperty>
-
-class MyClass : public QObject
- {
-     Q_OBJECT
-     Q_PROPERTY(Priority priority READ priority WRITE setPriority NOTIFY priorityChanged)
-     Q_ENUMS(Priority)
-     Q_CLASSINFO("Version", "3.0.0")
- public:
-     MyClass() {}
-     //MyClass(QObject *parent = 0);
-     ~MyClass();
-
-     enum Priority { High, Low, VeryHigh, VeryLow };
-
-     void setPriority(Priority priority)
-     {
-         m_priority = priority;
-         emit priorityChanged(priority);
-     }
-     Priority priority() const
-     { return m_priority; }
-
- signals:
-     void priorityChanged(Priority);
-
- private:
-     Priority m_priority;
- };
-
-
-void MyClass::priorityChanged(Priority)
-{
-    // pass
-}
-void dump (QObject *object)
-{
-    std::cout << "object: " << std::endl;
-    const QMetaObject *metaobject = object->metaObject();
-    int count = metaobject->propertyCount();
-    for (int i=0; i<count; ++i)
-    {
-      QMetaProperty metaproperty = metaobject->property(i);
-      const char *name = metaproperty.name();
-      QVariant value = object->property(name);
-      std::cout << " * " << name << " = " << value.toString().toStdString() << std::endl;
-    }
-}
-
-int main(int /* argc */, char ** /* argv */)
-{
-  MyClass *myinstance = new MyClass();
-  //QObject *object = myinstance;
-
-  myinstance->setPriority(MyClass::VeryHigh);
-  //object->setProperty("priority", "VeryHigh");
-
-  dump ((QObject *) myinstance);
-
-  delete myinstance;
-
-  return 0;
-}
diff --git a/prototypes/sdl/Makefile b/prototypes/sdl/Makefile
deleted file mode 100644
index 65bae740..00000000
--- a/prototypes/sdl/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-DEPS=sdl gl glu SDL_image
-CC=gcc
-CC_FLAGS=-O0 -g `pkg-config --cflags --libs $(DEPS)`
-EXEC=run
-SOURCES=$(wildcard *.c)
-OBJECTS=$(SOURCES:.c=.o)
-
-all: run
-
-$(EXEC): $(OBJECTS)
-	$(CC) $(OBJECTS) $(CC_FLAGS) -o $(EXEC)
-
-%.o: %.c
-	$(CC) -c $(CC_FLAGS) $< -o $@
-
-clean:
-	rm -f $(EXEC) $(OBJECTS)
-
diff --git a/prototypes/sdl/README b/prototypes/sdl/README
deleted file mode 100644
index 6a3fe519..00000000
--- a/prototypes/sdl/README
+++ /dev/null
@@ -1 +0,0 @@
-sudo yum install -y SDL_image-devel
diff --git a/prototypes/sdl/example.png b/prototypes/sdl/example.png
deleted file mode 100644
index ffb8a2c1664e7ea2a0b61fce458c9c555c71638c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13385
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
b3RF0eGJ`!~>AC$EA;9dc)tU0s?$Q4P3fSHz

diff --git a/prototypes/sdl/main.c b/prototypes/sdl/main.c
deleted file mode 100644
index 8d13bfa4..00000000
--- a/prototypes/sdl/main.c
+++ /dev/null
@@ -1,370 +0,0 @@
-#include "SDL.h"
-#include "SDL_opengl.h"
-#include "SDL_image.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#define WIDTH  640
-#define HEIGHT 480
-
-static const char * IMAGE_FILE = "example.png";
-
-GLfloat yaw;
-GLfloat pitch;
-int level;
-
-static void
-subdivide (GLfloat point0[3], GLfloat point1[3], GLfloat point2[3], int level)
-{
-  int coord;
-  GLfloat midpoint[3][3];
-  
-  /* Don't subdivide any further; just draw the triangle */
-  if (level==0)
-  {
-    glColor3fv (point0);
-    glVertex3fv (point0);
-    glColor3fv (point1);
-    glVertex3fv (point1);
-    glColor3fv (point2);
-    glVertex3fv (point2);
-    return;
-  }
-
-  /* Calculate a midpoint on each edge of the triangle */
-  for (coord = 0; coord<3; coord++)
-  {
-    midpoint[0][coord] = (point0[coord] + point1[coord])*0.5;
-    midpoint[1][coord] = (point1[coord] + point2[coord])*0.5;
-    midpoint[2][coord] = (point2[coord] + point0[coord])*0.5;
-  }
-
-  /* Subdivide each triangle into three more */  /*   .    */
-  level--;                     /*  /X\   */
-  subdivide (point0,midpoint[0],midpoint[2],level); /*   /xxx\  */
-  subdivide (point1,midpoint[1],midpoint[0],level); /*  /X\ /X\   */
-  subdivide (point2,midpoint[2],midpoint[1],level); /* /XXXVXXX\  */
-}
-
-static void
-paint_triangles ()
-{
-  int i;
-
-  /* Coordinates of the 6 vertices of the octahedron */
-  static GLfloat point[6][3] = { 
-    {1.0f,0.0f,0.0f},{-1.0f,0.0f,0.0f},
-    {0.0f,1.0f,0.0f},{0.0f,-1.0f,0.0f},
-    {0.0f,0.0f,1.0f},{0.0f,0.0f,-1.0f}
-  };
-
-  /* indices of the vertices of the triangles which make up each of 
-   * the 8 faces of the octahedron */
-  static int triangle[8][3] = { 
-    {2,4,0},{2,0,5},{2,5,1},{2,1,4},{3,0,4},{3,5,0},{3,1,5},{3,4,1}
-  };
-   
-  /* Rotate the object */
-  glRotatef (pitch, 1.0f, 0.0f, 0.0f);
-  glRotatef (yaw, 0.0f, 1.0f, 0.0f);
-
-  /* Draw the triangles which make up the object */
-  glBegin (GL_TRIANGLES);
-
-  for (i=0; i<8; i++)
-  {
-    subdivide (point[triangle[i][0]],point[triangle[i][1]],point[triangle[i][2]],level);
-  }
-  
-  glEnd ();
-
-  /* increment the rotation every frame */
-  yaw = yaw + 0.05;
-}
-
-static void
-paint_begin ()
-{
-  /* Clear the color plane and the z-buffer */
-  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  glLoadIdentity ();
-
-  /* Move the object 2 units away from the camera */
-  glTranslatef (0.0f, 0.0f, -2.0f);
-}
-
-
-static void
-paint_end ()
-{
-  /* finally, swap the back and front buffers */
-  SDL_GL_SwapBuffers ();
-}
-
-static void
-setup_sdl () 
-{
-  const SDL_VideoInfo* video;
-  int img_flags;
-  int img_initted;
-
-  if (SDL_Init (SDL_INIT_VIDEO) < 0 )
-  {
-    fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
-    exit (1);
-  }
-    
-  /* Quit SDL properly on exit */
-  atexit (SDL_Quit);
-
-  /* Get the current video information */
-  video = SDL_GetVideoInfo ( );
-  if ( video == NULL )
-  {
-    fprintf (stderr, "Couldn't get video information: %s\n", SDL_GetError ());
-    exit (1);
-  }
-
-  /* Set the minimum requirements for the OpenGL window */
-  SDL_GL_SetAttribute ( SDL_GL_RED_SIZE, 5 );
-  SDL_GL_SetAttribute ( SDL_GL_GREEN_SIZE, 5 );
-  SDL_GL_SetAttribute ( SDL_GL_BLUE_SIZE, 5 );
-  SDL_GL_SetAttribute ( SDL_GL_DEPTH_SIZE, 16 );
-  SDL_GL_SetAttribute ( SDL_GL_DOUBLEBUFFER, 1 );
-
-  /* Note the SDL_DOUBLEBUF flag is not required to enable double 
-   * buffering when setting an OpenGL video mode. 
-   * Double buffering is enabled or disabled using the 
-   * SDL_GL_DOUBLEBUFFER attribute.
-   */
-  if ( SDL_SetVideoMode ( WIDTH, HEIGHT, video->vfmt->BitsPerPixel, SDL_OPENGL ) == 0 )
-  {
-    fprintf (stderr, "Couldn't set video mode: %s\n", SDL_GetError ());
-    exit (1);
-  }
-
-  img_flags = IMG_INIT_JPG | IMG_INIT_PNG;
-  img_initted = IMG_Init (img_flags);
-  if (img_initted & img_flags != img_flags)
-  {
-    printf ("IMG_Init: Failed to init required jpg and png support!\n");
-    printf ("IMG_Init: %s\n", IMG_GetError ());
-    exit (1);
-  }
-}
-
-static void
-setup_opengl ()
-{
-  float aspect = (float)WIDTH / (float)HEIGHT;
-
-  /* Make the viewport cover the whole window */
-  glViewport (0, 0, WIDTH, HEIGHT);
-
-  /* Set the camera projection matrix:
-   * field of view: 90 degrees
-   * near clipping plane at 0.1
-   * far clipping plane at 100.0
-   */
-  glMatrixMode (GL_PROJECTION);
-  glLoadIdentity ();
-  
-  gluPerspective (60.0, aspect, 0.1, 100.0);
-  /* We're done with the camera, now matrix operations 
-   * will affect the modelview matrix
-   * */
-  glMatrixMode (GL_MODELVIEW);
-
-  /* set the clear color to gray */
-  glClearColor (0.5, 0.5 ,0.5, 0);
-  
-  /* We want z-buffer tests enabled*/
-  glEnable (GL_DEPTH_TEST);
-
-  /* Do draw back-facing polygons*/
-  glDisable (GL_CULL_FACE);
-}
-
-static void
-EnableTransparency ()
-{
-  glEnable (GL_BLEND);
-  glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-}
-
-static GLuint
-LoadTexture(const char *filename, int *textw, int *texth)
-{
-  SDL_Surface *surface;
-  GLuint textureid;
-  int mode;
-
-  surface = IMG_Load (filename);
-
-  // Or if you don't use SDL_image you can use SDL_LoadBMP here instead:
-  // surface = SDL_LoadBMP(filename);
-
-  // could not load filename
-  if (! surface)
-  {
-    return 0;
-  }
-
-  // work out what format to tell glTexImage2D to use...
-  if (surface->format->BytesPerPixel == 3)
-  { // RGB 24bit
-    mode = GL_RGB;
-  }
-  else if (surface->format->BytesPerPixel == 4)
-  { // RGBA 32bit
-    mode = GL_RGBA;
-  }
-  else
-  {
-    SDL_FreeSurface (surface);
-    return 0;
-  }
-
-  *textw = surface->w;
-  *texth = surface->h;
-  // create one texture name
-  glGenTextures (1, &textureid);
-
-  // tell opengl to use the generated texture name
-  glBindTexture (GL_TEXTURE_2D, textureid);
-
-  // this reads from the sdl surface and puts it into an opengl texture
-  glTexImage2D (GL_TEXTURE_2D, 0, mode, surface->w, surface->h, 0, mode, GL_UNSIGNED_BYTE, surface->pixels);
-
-  // these affect how this texture is drawn later on...
-  glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-  // clean up
-  SDL_FreeSurface (surface);
-
-  printf ("Loaded image %s %dx%d\n", filename, *textw, *texth);
-
-  return textureid;
-}
-
-static void
-DrawTexture(int x, int y, GLuint textureid, int textw, int texth)
-{
-  // tell opengl to use the generated texture name
-  glBindTexture (GL_TEXTURE_2D, textureid);
-  glEnable (GL_TEXTURE_2D);
-
-  // make a rectangle
-  glBegin (GL_QUADS);
-
-  // top left
-  glTexCoord2i (0, 0);
-  glVertex3f (x, y, 0);
-
-  // top right
-  glTexCoord2i (1, 0);
-  glVertex3f (x + textw, y, 0);
-
-  // bottom right
-  glTexCoord2i (1, 1);
-  glVertex3f (x + textw, y + texth, 0);
-
-  // bottom left
-  glTexCoord2i (0, 1);
-  glVertex3f (x, y + texth, 0);
-
-  glEnd ();
-  
-  glDisable (GL_TEXTURE_2D );
-}
-
-static void
-main_loop () 
-{
-  SDL_Event event;
-
-  GLuint texture;
-  int textw, texth;
-
-  printf ("Loading texture %s\n", IMAGE_FILE);
-  texture = LoadTexture (IMAGE_FILE, &textw, &texth);
-
-  while (1)
-  {
-    /* process pending events */
-    while (SDL_PollEvent (&event))
-    {
-      switch (event.type)
-      {
-      case SDL_KEYDOWN:
-        switch (event.key.keysym.sym)
-        {
-        case SDLK_ESCAPE:
-          exit (0);
-          break;
-
-        case SDLK_KP_PLUS:
-          level++;
-          if (level > 5)
-            level=5;
-          break;
-      
-        case SDLK_KP_MINUS:
-          level--;
-          if (level < 0)
-            level=0;
-          break;
-
-        default:
-           //no default key processing
-           // (stops compiler warnings for unhandled SDL keydefs
-           break;
-        }
-      break;
-
-      case SDL_MOUSEMOTION:
-        pitch += event.motion.yrel;
-        if (pitch < -70)
-          pitch = -70;
-        if (pitch > 70)
-          pitch = 70;
-        break;
-
-       case SDL_QUIT:
-        exit (0);
-        break;
-      }
-    }
-
-    /* update the screen */  
-    paint_begin ();
-    paint_triangles ();
-    glColor3f (1.0, 1.0, 1.0);
-    DrawTexture (0, 0, texture, textw, texth);
-    paint_end ();
-
-    /* Wait 50ms to avoid using up all the CPU time */
-    SDL_Delay (50);
-  }
-}
-
-
-int
-main (int argc, char* argv[])
-{
-  setup_sdl ();
-  
-  setup_opengl ();
-
-  yaw = 45;
-  pitch = 0;
-  level = 2;
-  
-  main_loop ();
-    
-  return 0;
-}
diff --git a/prototypes/sh-osx-gst-test.sh b/prototypes/sh-osx-gst-test.sh
deleted file mode 100755
index 9405310b..00000000
--- a/prototypes/sh-osx-gst-test.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o verbose
-#export GST_PLUGIN_PATH=/Library/Frameworks/GStreamer.framework/Libraries
-export LANG=C
-# export GST_DEBUG=3
-#FILEPATH=/Users/aalex/Desktop/mapmap-videos/BonneFete.mov
-FILEPATH=/Users/aalex/Downloads/sintel_trailer-480p.ogv
-
-gst-launch-0.10 uridecodebin uri=file://${FILEPATH} ! ffmpegcolorspace ! autovideosink
-
diff --git a/prototypes/shm/read.sh b/prototypes/shm/read.sh
deleted file mode 100755
index 46806fb3..00000000
--- a/prototypes/shm/read.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gst-launch-0.10 -e shmsrc socket-path=/tmp/test is-live=1 ! \
-    video/x-raw-yuv,format=\(fourcc\)I420,framerate=30/1,width=640,height=480 ! \
-    xvimagesink 
-
-
diff --git a/prototypes/shm/write.sh b/prototypes/shm/write.sh
deleted file mode 100755
index 14b1f667..00000000
--- a/prototypes/shm/write.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-gst-launch-0.10 -v videotestsrc ! \
-   'video/x-raw-yuv, width=640, height=480, framerate=30/1, format=(fourcc)I420' ! \
-   shmsink socket-path=/tmp/test shm-size=10000000 wait-for-connection=0
-
-
diff --git a/prototypes/wx/wx-01-simple/build.sh b/prototypes/wx/wx-01-simple/build.sh
deleted file mode 100755
index 91a8fec9..00000000
--- a/prototypes/wx/wx-01-simple/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# libwxgtk2.8-dev
-g++ main.cpp -o run `wx-config --libs --cxxflags --gl-libs` -lglut -lGL -lSOIL -I/usr/include
diff --git a/prototypes/wx/wx-01-simple/example.png b/prototypes/wx/wx-01-simple/example.png
deleted file mode 100644
index ffb8a2c1664e7ea2a0b61fce458c9c555c71638c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13385
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
b3RF0eGJ`!~>AC$EA;9dc)tU0s?$Q4P3fSHz

diff --git a/prototypes/wx/wx-01-simple/main.cpp b/prototypes/wx/wx-01-simple/main.cpp
deleted file mode 100644
index 7de3b8bc..00000000
--- a/prototypes/wx/wx-01-simple/main.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-// NOTE: To run, it is recommended not to be in Compiz or Beryl, they have shown some instability.
-// Needs:  libwxgtk2.8-dev libsoil-dev
-// g++ main.cpp -o run `wx-config --libs --cxxflags --gl-libs` -lSOIL
- 
-#include <wx/wx.h>
-#include <wx/glcanvas.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <SOIL/SOIL.h>
- 
-#ifndef WIN32
-#include <unistd.h> // FIXME: ¿This work/necessary in Windows?
-                    //Not necessary, but if it was, it needs to be replaced by process.h AND io.h
-#endif
-
-typedef struct _Quad
-{
-  int x1;
-  int x2;
-  int x3;
-  int x4;
-  int y1;
-  int y2;
-  int y3;
-  int y4;
-} Quad;
-
-static void
-move_point (Quad *src, Quad *dst, int index, int x, int y)
-{
-  printf ("move_point (index=%d, x=%d, y=%d)\n", index, x, y);
-  switch (index)
-  {
-    case 1:
-      src->x1 += x;
-      src->y1 += y;
-      break;
-    case 2:
-      src->x2 += x;
-      src->y2 += y;
-      break;
-    case 3:
-      src->x3 += x;
-      src->y3 += y;
-      break;
-    case 4:
-      src->x4 += x;
-      src->y4 += y;
-      break;
-    case 5:
-      dst->x1 += x;
-      dst->y1 += y;
-      break;
-    case 6:
-      dst->x2 += x;
-      dst->y2 += y;
-      break;
-    case 7:
-      dst->x3 += x;
-      dst->y3 += y;
-      break;
-    case 8:
-      dst->x4 += x;
-      dst->y4 += y;
-      break;
-  }
-}
-
-GLuint load_image (const char *imagepath, float *image_width, float *image_height)
-{
-  int width, height;
-  GLuint textureID = 0;
-
-  unsigned char * data =
-    SOIL_load_image(imagepath, &width, &height, 0, SOIL_LOAD_RGB );
-  textureID = SOIL_create_OGL_texture (
-    data, width, height, 3, textureID, 0);
-
-  // TODO: free data?
-
-  (* image_width) = width;
-  (* image_height) = height;
-
-  return textureID;
-}
- 
-class wxGLCanvasSubClass: public wxGLCanvas
-{
-        void Render();
-    public:
-        wxGLCanvasSubClass(wxFrame* parent);
-        void Paintit(wxPaintEvent& event);
-        void movePoint(int index, int x, int y);
-    protected:
-        DECLARE_EVENT_TABLE()
-    private:
-        GLuint texture;
-        float image_width;
-        float image_height;
-        Quad src;
-        Quad dst;
-
-        void OnChar(wxKeyEvent & event);
-
-        void OnMouseEvent(wxMouseEvent& event);
-        void setup_texture();
-};
- 
-BEGIN_EVENT_TABLE(wxGLCanvasSubClass, wxGLCanvas)
-  EVT_PAINT    (wxGLCanvasSubClass::Paintit)
-  EVT_KEY_DOWN     (wxGLCanvasSubClass::OnChar)
-  EVT_MOUSE_EVENTS(wxGLCanvasSubClass::OnMouseEvent)
-//  EVT_ENTER_WINDOW(wxGLCanvasSubClass::OnMouseEnter)
-END_EVENT_TABLE()
- 
-wxGLCanvasSubClass::wxGLCanvasSubClass(wxFrame *parent)
-:wxGLCanvas(parent, wxID_ANY,  wxDefaultPosition, wxDefaultSize, 0, wxT("GLCanvas"))
-{
-    int argc = 1;
-    char* argv[1] = { wxString((wxTheApp->argv)[0]).char_str() };
-}
- 
-void wxGLCanvasSubClass::Paintit(wxPaintEvent& WXUNUSED(event))
-{
-    Render();
-}
-
-void wxGLCanvasSubClass::OnChar(wxKeyEvent & event)
-{
-    static int current = 0;
-    printf("hello");
-    switch (event.GetKeyCode())
-    {
-        case WXK_TAB:
-          current = (current + 1) % 8;
-          printf ("Current = %d\n", current);
-          break;
-        case WXK_UP:
-          move_point (&src, &dst, current + 1, 0, 1);
-          break;
-        case WXK_DOWN:
-          move_point (&src, &dst, current + 1, 0, -1);
-          break;
-        case WXK_LEFT:
-          move_point (&src, &dst, current + 1, -1, 0);
-          break;
-        case WXK_RIGHT:
-          move_point (&src, &dst, current + 1, 1, 0);
-          break;
-        default:
-          printf ("Unhandled key");
-          break;
-    }
-    Render();
-}
-
-void wxGLCanvasSubClass::OnMouseEvent(wxMouseEvent& event)
-{
-    printf("x=%d y=%d LeftIsDown=%d\n", event.GetX(), event.GetY(), (int)event.LeftIsDown());
-    SetFocus();
-}
-
-void wxGLCanvasSubClass::setup_texture()
-{
-    texture = load_image ("example.png", &image_width, &image_height);
-
-    //source
-    src.x1 = 0;
-    src.y1 = 0;
-
-    src.x2 = 320;
-    src.y2 = 0;
-
-    src.x3 = 320;
-    src.y3 = 240;
-
-    src.x4 = 0;
-    src.y4 = 240;
-
-    //destination
-    dst.x1 = -320;
-    dst.y1 = -240;
-
-    dst.x2 = 0;
-    dst.y2 = -240;
-
-    dst.x3 = 0;
-    dst.y3 = 0;
-
-    dst.x4 = -320;
-    dst.y4 = 0; // 240;
-}
- 
-void wxGLCanvasSubClass::Render()
-{
-    static bool texture_is_set = false;
-    float ratio;
-
-    SetCurrent();
-    wxPaintDC dc(this);
-
-    if (! texture_is_set)
-    {
-        this->setup_texture();
-        texture_is_set = true;
-    }
-    ratio = (float) GetSize().x / (float) GetSize().y;
-
-    glClearColor(0, 0, 0, 0);
-    glClear(GL_COLOR_BUFFER_BIT);
-//    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glViewport(0, 0, (GLint) GetSize().x, (GLint) GetSize().y);
-
-    glMatrixMode (GL_PROJECTION);
-    glLoadIdentity ();
-    glOrtho (-ratio, ratio, -1.f, 1.f, 1.f, -1.f);
-    glMatrixMode (GL_MODELVIEW);
-
-    glLoadIdentity ();
-
-    // Now, draw
-    // DRAW THE TEXTURE
-    glPushMatrix ();
-
-    // Enable blending mode (for alphas).
-    glEnable (GL_BLEND);
-    glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-
-    glDisable (GL_LIGHTING);
-    glEnable (GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, texture);
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-
-    // Draw source texture (not moving).
-    glColor4f (1, 1, 1, 0.5f);
-    glBegin (GL_QUADS);
-    {
-      glTexCoord2f (0, 0);
-      glVertex3f (0, 0, 0);
-
-      glTexCoord2f (1, 0);
-      glVertex3f (1, 0, 0);
-
-      glTexCoord2f (1, 1);
-      glVertex3f (1, 1, 0);
-
-      glTexCoord2f (0, 1);
-      glVertex3f (0, 1, 0);
-    }
-    glEnd ();
-
-    // Project source texture and sent it to destination.
-    glColor4f (1, 1, 1, 1.0f);
-    glBegin (GL_QUADS);
-    {
-      glTexCoord2f (src.x1 / image_width, src.y1 / image_height);
-      glVertex3f (dst.x1 / image_width, dst.y1 / image_height, 0);
-
-      glTexCoord2f (src.x2 / image_width, src.y2 / image_height);
-      glVertex3f (dst.x2 / image_width, dst.y2 / image_height, 0);
-
-      glTexCoord2f (src.x3 / image_width, src.y3 / image_height);
-      glVertex3f (dst.x3 / image_width, dst.y3 / image_height, 0);
-
-      glTexCoord2f (src.x4 / image_width, src.y4 / image_height);
-      glVertex3f (dst.x4 / image_width, dst.y4 / image_height, 0);
-    }
-    glEnd ();
-
-    glDisable(GL_TEXTURE_2D);
-
-    glColor4f (1, 1, 1, 1);
-
-    // Source quad.
-    glLineWidth(5);
-    glBegin (GL_LINE_STRIP);
-    {
-      glVertex3f(src.x1 / image_width, src.y1 / image_height, 0);
-      glVertex3f(src.x2 / image_width, src.y2 / image_height, 0);
-      glVertex3f(src.x3 / image_width, src.y3 / image_height, 0);
-      glVertex3f(src.x4 / image_width, src.y4 / image_height, 0);
-      glVertex3f(src.x1 / image_width, src.y1 / image_height, 0);
-    }
-    glEnd ();
-
-    glColor4f (1, 0, 0, 1);
-
-    // Destination quad.
-    glBegin (GL_LINE_STRIP);
-    {
-      glVertex3f(dst.x1 / image_width, dst.y1 / image_height, 0);
-      glVertex3f(dst.x2 / image_width, dst.y2 / image_height, 0);
-      glVertex3f(dst.x3 / image_width, dst.y3 / image_height, 0);
-      glVertex3f(dst.x4 / image_width, dst.y4 / image_height, 0);
-      glVertex3f(dst.x1 / image_width, dst.y1 / image_height, 0);
-    }
-    glEnd ();
-
-    glDisable (GL_TEXTURE_2D);
-    glPopMatrix ();
-
-    // Done drawing
-
-    glFlush();
-    SwapBuffers();
-}
-
-void wxGLCanvasSubClass::movePoint(int index, int x, int y)
-{
-    move_point (&src, &dst, index, x, y);
-}
- 
-class MyApp: public wxApp
-{
-    private:
-        virtual bool OnInit();
-        wxGLCanvasSubClass * MyGLCanvas;
-        int FilterEvent(wxEvent& event);
-};
-
-int MyApp::FilterEvent(wxEvent& event)
-{
-    static int current = 0;
-    if ((event.GetEventType() == wxEVT_KEY_DOWN))
-    {
-        switch (((wxKeyEvent&)event).GetKeyCode())
-        {
-            case WXK_TAB:
-              current = (current + 1) % 8;
-              printf ("Current = %d\n", current);
-              return true;
-              break;
-            case WXK_UP:
-              MyGLCanvas->movePoint(current + 1, 0, 1);
-              return true;
-              break;
-            case WXK_DOWN:
-              MyGLCanvas->movePoint(current + 1, 0, -1);
-              return true;
-              break;
-            case WXK_LEFT:
-              MyGLCanvas->movePoint(current + 1, -1, 0);
-              return true;
-              break;
-            case WXK_RIGHT:
-              MyGLCanvas->movePoint(current + 1, 1, 0);
-              return true;
-              break;
-            default:
-              printf ("Unhandled key");
-              break;
-        }
-    }
-    return -1;
-}
- 
-IMPLEMENT_APP(MyApp)
- 
-bool MyApp::OnInit()
-{
-    wxFrame *frame = new wxFrame((wxFrame *) NULL, -1,  wxT("Hello GL World"), wxPoint(50, 50), wxSize(640, 480));
-    MyGLCanvas = new wxGLCanvasSubClass(frame);
- 
-//    frame->SetWindowStyle(wxWANTS_CHARS);
-    frame->Show(TRUE);
-    return TRUE;
-}
diff --git a/prototypes/wx/wx-02-input-output/Common.cpp b/prototypes/wx/wx-02-input-output/Common.cpp
deleted file mode 100644
index 8f6ee49f..00000000
--- a/prototypes/wx/wx-02-input-output/Common.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Common.cpp
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "Common.h"
-
-std::tr1::shared_ptr<Mapping> Common::currentMapping;
-std::tr1::shared_ptr<Mapper>  Common::currentMapper;
-
-void Common::initializeLibremapper(int frameWidth, int frameHeight) {
-  Image* img = new Image("example.png");
-
-  float centerX = frameWidth / 2;
-  float centerY = frameHeight / 2;
-  float textureHalfWidth  = img->getWidth()  / 2;
-  float textureHalfHeight = img->getHeight() / 2;
-//  printf("Common: %f %f %f %f\n", centerX, centerY, textureHalfWidth, textureHalfHeight);
-
-  TextureMapping* tm = new TextureMapping(
-      img,
-
-      // Destination.
-      new Quad(Point(centerX-textureHalfWidth, centerY-textureHalfHeight),
-               Point(centerX+textureHalfWidth, centerY-textureHalfHeight),
-               Point(centerX+textureHalfWidth, centerY+textureHalfHeight),
-               Point(centerX-textureHalfWidth, centerY+textureHalfHeight)),
-
-      // Input.
-      new Quad(Point(centerX-textureHalfWidth, centerY-textureHalfHeight),
-               Point(centerX+textureHalfWidth, centerY-textureHalfHeight),
-               Point(centerX+textureHalfWidth, centerY+textureHalfHeight),
-               Point(centerX-textureHalfWidth, centerY+textureHalfHeight))
-            );
-  Common::currentMapping.reset( tm );
-  Common::currentMapper.reset( new QuadTextureMapper( tm ) );
-}
-
diff --git a/prototypes/wx/wx-02-input-output/Common.h b/prototypes/wx/wx-02-input-output/Common.h
deleted file mode 100644
index ede3e08d..00000000
--- a/prototypes/wx/wx-02-input-output/Common.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Common.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef COMMON_H_
-#define COMMON_H_
-
-#include <tr1/memory>
-
-#include "Paint.h"
-#include "Shape.h"
-#include "Mapper.h"
-
-class Common {
-public:
-  static std::tr1::shared_ptr<Mapping> currentMapping;
-  static std::tr1::shared_ptr<Mapper>  currentMapper;
-
-  static void initializeLibremapper(int frameWidth, int frameHeight);
-};
-
-#endif /* COMMON_H_ */
diff --git a/prototypes/wx/wx-02-input-output/DestinationGLCanvas.cpp b/prototypes/wx/wx-02-input-output/DestinationGLCanvas.cpp
deleted file mode 100644
index 5b32167a..00000000
--- a/prototypes/wx/wx-02-input-output/DestinationGLCanvas.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * DestinationGLCanvas.cpp
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "DestinationGLCanvas.h"
-
-DestinationGLCanvas::DestinationGLCanvas(wxFrame *parent) :
-    MapperGLCanvas(parent) {
-//  int argc = 1;
-//  char* argv[1] = { wxString((wxTheApp ->argv)[0]).char_str() };
-}
-
-void DestinationGLCanvas::doRender() {
-  // TODO: Ceci est un hack necessaire car tout est en fonction de la width/height de la texture.
-  // Il faut changer ca.
-  std::tr1::shared_ptr<TextureMapping> textureMapping = std::tr1::static_pointer_cast<TextureMapping>(Common::currentMapping);
-  wxASSERT(textureMapping != NULL);
-
-  std::tr1::shared_ptr<Texture> texture = std::tr1::static_pointer_cast<Texture>(textureMapping->getPaint());
-  wxASSERT(texture != NULL);
-
-  if (texture->getTextureId() == 0)
-  {
-    texture->loadTexture();
-    texture->setPosition( (GetClientSize().x - texture->getWidth()) / 2,
-                          (GetClientSize().y - texture->getHeight()) / 2 );
-  }
-
-  // Now, draw
-  // DRAW THE TEXTURE
-  glPushMatrix();
-
-  // Draw the mapping.
-  Common::currentMapper->draw();
-
-  // Draw the quad.
-  Quad& quad = getQuad();
-
-  glColor4f(1, 0, 0, 1);
-
-  // Destination quad.
-  // Source quad.
-  glLineWidth(5);
-  glBegin (GL_LINE_STRIP);
-  {
-    for (int i=0; i<5; i++) {
-      glVertex3f(quad.getVertex(i % 4).x,
-                 quad.getVertex(i % 4).y,
-                 0);
-    }
-  }
-  glEnd ();
-
-  glPopMatrix();
-}
-
diff --git a/prototypes/wx/wx-02-input-output/DestinationGLCanvas.h b/prototypes/wx/wx-02-input-output/DestinationGLCanvas.h
deleted file mode 100644
index e6681767..00000000
--- a/prototypes/wx/wx-02-input-output/DestinationGLCanvas.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * DestinationGLCanvas.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DESTINATIONGLCANVAS_H_
-#define DESTINATIONGLCANVAS_H_
-
-#include <wx/wx.h>
-#include <wx/glcanvas.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <SOIL/SOIL.h>
-
-#include "MapperGLCanvas.h"
-
-class DestinationGLCanvas: public MapperGLCanvas {
-public:
-  DestinationGLCanvas(wxFrame* parent);
-
-  virtual Quad& getQuad() {
-    std::tr1::shared_ptr<TextureMapping> textureMapping = std::tr1::static_pointer_cast<TextureMapping>(Common::currentMapping);
-    wxASSERT(textureMapping != NULL);
-
-    std::tr1::shared_ptr<Quad> quad = std::tr1::static_pointer_cast<Quad>(Common::currentMapping->getShape());
-    wxASSERT(quad != NULL);
-
-    return (*quad);
-  }
-
-private:
-  virtual void doRender();
-};
-
-#endif /* DESTINATIONGLCANVAS_H_ */
diff --git a/prototypes/wx/wx-02-input-output/Mapper.h b/prototypes/wx/wx-02-input-output/Mapper.h
deleted file mode 100644
index a4fb31d1..00000000
--- a/prototypes/wx/wx-02-input-output/Mapper.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Mapper.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef MAPPER_H_
-#define MAPPER_H_
-
-#include "Shape.h"
-#include "Paint.h"
-
-#include <tr1/memory>
-
-#include <wx/wx.h>
-#include <GL/gl.h>
-#include <SOIL/SOIL.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-class Mapping
-{
-protected:
-  std::tr1::shared_ptr<Paint> _paint;
-  std::tr1::shared_ptr<Shape> _shape;
-
-public:
-  Mapping(Paint* paint, Shape* shape)
-    : _paint(paint), _shape(shape)
-  {}
-
-  virtual void build() {
-    _paint->build();
-    _shape->build();
-  }
-
-public:
-  std::tr1::shared_ptr<Paint> getPaint() const { return _paint; }
-  std::tr1::shared_ptr<Shape> getShape() const { return _shape; }
-};
-
-class TextureMapping : public Mapping
-{
-private:
-  std::tr1::shared_ptr<Shape> _inputShape;
-
-public:
-  TextureMapping(Paint* paint,
-                 Shape* shape,
-                 Shape* inputShape)
-    : Mapping(paint, shape),
-      _inputShape(inputShape)
-  {}
-
-  virtual void build() {
-    Mapping::build();
-    _inputShape->build();
-  }
-public:
-  std::tr1::shared_ptr<Shape> getInputShape() const { return _inputShape; }
-};
-
-class Mapper
-{
-protected:
-  std::tr1::shared_ptr<Mapping> _mapping;
-  Mapper(Mapping* mapping) : _mapping(mapping) {}
-  virtual ~Mapper() {}
-
-public:
-  virtual void draw() = 0;
-};
-
-//class ShapeDrawer
-//{
-//protected:
-//  std:tr1::shared_ptr<Shape> _shape;
-//
-//public:
-//  ShapeDrawer(const std:tr1::shared_ptr<Shape>& shape) : _shape(shape) {}
-//  virtual ~ShapeDrawer() {}
-//
-//  virtual void draw() = 0;
-//};
-//
-//class QuadDrawer
-//{
-//public:
-//  QuadDrawer(const std:tr1::shared_ptr<Quad>& quad) : ShapeDrawer(quad) {}
-//
-//  virtual void draw() {
-//    std::tr1::shared_ptr<Quad> quad = std::tr1::static_pointer_cast<Quad>(_shape);
-//    wxASSERT(quad != NULL);
-//
-//    glColor4f (1, 1, 1, 1);
-//
-//    // Source quad.
-//    glLineWidth(5);
-//    glBegin (GL_LINE_STRIP);
-//    {
-//      for (int i=0; i<5; i++) {
-//        glVertex3f(quad->getVertex(i % 4).x / (GLfloat)texture->getWidth(),
-//                   quad->getVertex(i % 4).y / (GLfloat)texture->getHeight(),
-//                   0);
-//      }
-//    }
-//    glEnd ();
-//  }
-//};
-
-class QuadTextureMapper : public Mapper
-{
-public:
-  QuadTextureMapper(TextureMapping* mapping) : Mapper(mapping) {}
-  virtual ~QuadTextureMapper() {}
-
-  virtual void draw() {
-    std::tr1::shared_ptr<TextureMapping> textureMapping = std::tr1::static_pointer_cast<TextureMapping>(_mapping);
-    wxASSERT(textureMapping != NULL);
-
-    std::tr1::shared_ptr<Texture> texture = std::tr1::static_pointer_cast<Texture>(textureMapping->getPaint());
-    wxASSERT(texture != NULL);
-
-    std::tr1::shared_ptr<Quad> quad = std::tr1::static_pointer_cast<Quad>(textureMapping->getShape());
-    wxASSERT(quad != NULL);
-
-    std::tr1::shared_ptr<Quad> inputQuad = std::tr1::static_pointer_cast<Quad>(textureMapping->getInputShape());
-    wxASSERT(inputQuad != NULL);
-
-    printf("Texid: %d\n", texture->getTextureId());
-    // Project source texture and sent it to destination.
-
-    glEnable (GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, texture->getTextureId());
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-    glColor4f(1, 1, 1, 1.0f);
-    glBegin(GL_QUADS);
-    {
-      for (int i=0; i<4; i++)
-      {
-        glTexCoord2f( ( inputQuad->getVertex(i).x - texture->getX() ) / (GLfloat) texture->getWidth(),
-                      ( inputQuad->getVertex(i).y - texture->getY() ) / (GLfloat) texture->getHeight());
-        glVertex3f( quad->getVertex(i).x,
-                    quad->getVertex(i).y,
-                    0);
-      }
-    }
-    glEnd();
-
-    glDisable(GL_TEXTURE_2D);
-  }
-};
-
-
-#endif /* MAPPER_H_ */
diff --git a/prototypes/wx/wx-02-input-output/MapperGLCanvas.cpp b/prototypes/wx/wx-02-input-output/MapperGLCanvas.cpp
deleted file mode 100644
index 5142d69f..00000000
--- a/prototypes/wx/wx-02-input-output/MapperGLCanvas.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * MapperGLCanvas.cpp
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "MapperGLCanvas.h"
-
-wxGLContext* MapperGLCanvas::sharedContext = 0;
-
-BEGIN_EVENT_TABLE (MapperGLCanvas, wxGLCanvas)
-  EVT_PAINT       (MapperGLCanvas::Paintit)
-  EVT_KEY_DOWN    (MapperGLCanvas::OnChar)
-  EVT_MOUSE_EVENTS(MapperGLCanvas::OnMouseEvent)
-//  EVT_ENTER_WINDOW(MapperGLCanvas::OnMouseEnter)
-END_EVENT_TABLE()
-
-
-MapperGLCanvas::MapperGLCanvas(wxFrame *parent) :
-    wxGLCanvas(parent, sharedContext, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0,
-        wxT("GLCanvas")) {
-  if (!sharedContext) {
-    sharedContext = GetContext();
-  }
-  //  int argc = 1;
-  //  char* argv[1] = { wxString((wxTheApp ->argv)[0]).char_str() };
-}
-
-void MapperGLCanvas::Paintit(wxPaintEvent& WXUNUSED(event)) {
-  GetParent()->Refresh();
-  Render();
-}
-
-void MapperGLCanvas::OnChar(wxKeyEvent & event) {
-  static int current = 0;
-  int xMove = 0;
-  int yMove = 0;
-  switch (event.GetKeyCode()) {
-  case WXK_TAB:
-    current = (current + 1) % 4;
-    break;
-  case WXK_UP:
-    yMove = -1;
-    break;
-  case WXK_DOWN:
-    yMove = +1;
-    break;
-  case WXK_LEFT:
-    xMove = -1;
-    break;
-  case WXK_RIGHT:
-    xMove = +1;
-    break;
-  default:
-    printf("Unhandled key");
-    break;
-  }
-
-  Quad& quad = getQuad();
-  Point p = quad.getVertex(current);
-  p.x += xMove;
-  p.y += yMove;
-  quad.setVertex(current, p);
-
-  Render();
-}
-
-void MapperGLCanvas::OnMouseEvent(wxMouseEvent& event) {
-  printf("x=%d y=%d LeftIsDown=%d\n", event.GetX(), event.GetY(),
-      (int) event.LeftIsDown());
-  SetFocus();
-}
-
-void MapperGLCanvas::Render() {
-  if (!sharedContext) {
-    sharedContext = GetContext();
-  }
-  SetCurrent(*sharedContext);
-  wxPaintDC dc(this);
-
-  enterRender();
-  doRender();
-  exitRender();
-}
-
-void MapperGLCanvas::enterRender() {
-
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-  glClear(GL_COLOR_BUFFER_BIT);
-  glViewport(0, 0, (GLint) GetSize().x, (GLint) GetSize().y);
-
-  glMatrixMode (GL_PROJECTION);
-  glLoadIdentity ();
-  glOrtho (
-    0.0f, (float) GetSize().x, // left, right
-    (float) GetSize().y, 0.0f, // bottom, top
-    -1.0, 1.0f);
-  glMatrixMode (GL_MODELVIEW);
-//  glLoadIdentity (); // FIXME? is this needed here?
-}
-
-void MapperGLCanvas::exitRender() {
-  glFlush();
-  SwapBuffers();
-}
-
-
diff --git a/prototypes/wx/wx-02-input-output/MapperGLCanvas.h b/prototypes/wx/wx-02-input-output/MapperGLCanvas.h
deleted file mode 100644
index 46351f55..00000000
--- a/prototypes/wx/wx-02-input-output/MapperGLCanvas.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * MapperGLCanvas.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef MAPPERGLCANVAS_H_
-#define MAPPERGLCANVAS_H_
-
-#include <wx/wx.h>
-#include <wx/glcanvas.h>
-
-#include "Common.h"
-#include "Shape.h"
-
-class MapperGLCanvas: public wxGLCanvas {
-private:
-  static wxGLContext* sharedContext;
-
-public:
-  MapperGLCanvas(wxFrame* parent);
-  virtual ~MapperGLCanvas() {}
-
-  virtual void Paintit(wxPaintEvent& event);
-
-  virtual Quad& getQuad() = 0;
-
-protected:
-  DECLARE_EVENT_TABLE()
-
-  virtual void Render();
-  virtual void enterRender();
-  virtual void doRender() = 0;
-  virtual void exitRender();
-
-private:
-  virtual void OnChar(wxKeyEvent& event);
-  virtual void OnMouseEvent(wxMouseEvent& event);
-
-};
-
-#endif /* MAPPERGLCANVAS_H_ */
diff --git a/prototypes/wx/wx-02-input-output/Paint.h b/prototypes/wx/wx-02-input-output/Paint.h
deleted file mode 100644
index 377cde11..00000000
--- a/prototypes/wx/wx-02-input-output/Paint.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Paint.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef PAINT_H_
-#define PAINT_H_
-
-#include <wx/wx.h>
-#include <GL/gl.h>
-#include <SOIL/SOIL.h>
-
-class Paint
-{
-protected:
-  Paint() {}
-public:
-  virtual ~Paint() {}
-  virtual void build() {}
-};
-
-class Texture : public Paint
-{
-protected:
-  GLuint textureId;
-  int x;
-  int y;
-
-  Texture(GLuint textureId_=0) : textureId(textureId_) {}
-  virtual ~Texture() {}
-
-public:
-  GLuint getTextureId() const { return textureId; }
-  virtual void loadTexture() = 0;
-  virtual int getWidth() const = 0;
-  virtual int getHeight() const = 0;
-
-  virtual void setPosition(int xPos, int yPos) {
-    x = xPos;
-    y = yPos;
-  }
-  virtual int getX() const { return x; }
-  virtual int getY() const { return y; }
-};
-
-class Image : public Texture
-{
-protected:
-  std::string imagePath;
-  int width;
-  int height;
-  int x;
-  int y;
-  unsigned char* imageData;
-
-public:
-  Image(const std::string imagePath_) : Texture(), imagePath(imagePath_), width(-1), height(-1), x(-1), y(-1) {
-    imageData = SOIL_load_image(imagePath.c_str(), &width, &height, 0, SOIL_LOAD_RGB );
-    wxASSERT(imageData);
-  }
-  virtual ~Image() {}
-
-  virtual void loadTexture() {
-    textureId = SOIL_create_OGL_texture ( imageData, width, height, 3, textureId, 0);
-    // TODO: free data?
-  }
-
-  virtual void build() {
-  }
-
-  virtual int getWidth() const { return width; }
-  virtual int getHeight() const { return height; }
-
-
-};
-
-#endif /* PAINT_H_ */
diff --git a/prototypes/wx/wx-02-input-output/Shape.h b/prototypes/wx/wx-02-input-output/Shape.h
deleted file mode 100644
index 279e2352..00000000
--- a/prototypes/wx/wx-02-input-output/Shape.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Shape.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef SHAPE_H_
-#define SHAPE_H_
-
-#include <vector>
-#include <SOIL/SOIL.h>
-
-struct Point
-{
-  double x;
-  double y;
-  Point(double x_, double y_) : x(x_), y(y_) {}
-};
-
-class Shape
-{
-public:
-  std::vector<Point> vertices;
-  Shape() {}
-  Shape(std::vector<Point> vertices_) : vertices(vertices_) {}
-  virtual ~Shape() {}
-
-  virtual void build() {}
-
-  const Point& getVertex(int i) { return vertices[i]; }
-  void setVertex(int i, Point v) { vertices[i] = v; }
-  void setVertex(int i, double x, double y)
-  {
-    vertices[i].x = x;
-    vertices[i].y = y;
-  }
-};
-
-class Quad : public Shape
-{
-public:
-  Quad() {}
-  Quad(Point p1, Point p2, Point p3, Point p4) {
-    vertices.push_back(p1);
-    vertices.push_back(p2);
-    vertices.push_back(p3);
-    vertices.push_back(p4);
-  }
-  virtual ~Quad() {}
-};
-
-#endif /* SHAPE_H_ */
diff --git a/prototypes/wx/wx-02-input-output/SourceGLCanvas.cpp b/prototypes/wx/wx-02-input-output/SourceGLCanvas.cpp
deleted file mode 100644
index 6ccd03a8..00000000
--- a/prototypes/wx/wx-02-input-output/SourceGLCanvas.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * SourceGLCanvas.cpp
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "SourceGLCanvas.h"
-
-SourceGLCanvas::SourceGLCanvas(wxFrame *parent) :
-    MapperGLCanvas(parent) {
-//  int argc = 1;
-//  char* argv[1] = { wxString((wxTheApp ->argv)[0]).char_str() };
-}
-
-void SourceGLCanvas::doRender() {
-  // TODO: Ceci est un hack necessaire car tout est en fonction de la width/height de la texture.
-  // Il faut changer ca.
-  std::tr1::shared_ptr<TextureMapping> textureMapping = std::tr1::static_pointer_cast<TextureMapping>(Common::currentMapping);
-  wxASSERT(textureMapping != NULL);
-
-  std::tr1::shared_ptr<Texture> texture = std::tr1::static_pointer_cast<Texture>(textureMapping->getPaint());
-  wxASSERT(texture != NULL);
-
-  if (texture->getTextureId() == 0) {
-    texture->loadTexture();
-    texture->setPosition( (GetClientSize().x - texture->getWidth()) / 2,
-                          (GetClientSize().y - texture->getHeight()) / 2 );
-  }
-  // Now, draw
-  // DRAW THE TEXTURE
-  glPushMatrix();
-
-  // Enable blending mode (for alphas).
-  glEnable (GL_BLEND);
-  glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-  glDisable (GL_LIGHTING);
-  glEnable (GL_TEXTURE_2D);
-  glBindTexture(GL_TEXTURE_2D, texture->getTextureId());
-
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-  // TODO: Exact projection of texture
-  // see http://stackoverflow.com/questions/15242507/perspective-correct-texturing-of-trapezoid-in-opengl-es-2-0
-
-  // Draw source texture (not moving) in the center of the area.
-
-  float centerX = GetClientSize().x / 2;
-  float centerY = GetClientSize().y / 2;
-  float textureHalfWidth  = texture->getWidth()  / 2;
-  float textureHalfHeight = texture->getHeight() / 2;
-
-  //printf("SRC: %f %f %f %f\n", centerX, centerY, textureHalfWidth, textureHalfHeight);
-  glColor4f (1, 1, 1, 1.0f);
-  glBegin (GL_QUADS);
-  {
-    glTexCoord2f (0, 0);
-    glVertex3f (texture->getX(), texture->getY(), 0);
-
-    glTexCoord2f (1, 0);
-    glVertex3f (texture->getX()+texture->getWidth(), texture->getY(), 0);
-
-    glTexCoord2f (1, 1);
-    glVertex3f (texture->getX()+texture->getWidth(), texture->getY()+texture->getHeight(), 0);
-
-    glTexCoord2f (0, 1);
-    glVertex3f (texture->getX(), texture->getY()+texture->getHeight(), 0);
-  }
-  glEnd ();
-
-  glDisable(GL_TEXTURE_2D);
-
-  // Draw the quad.
-  Quad& quad = getQuad();
-
-  glColor4f(1, 0, 0, 1);
-
-  // Source quad.
-  // Source quad.
-  glLineWidth(5);
-  glBegin (GL_LINE_STRIP);
-  {
-    for (int i=0; i<5; i++) {
-      glVertex3f(quad.getVertex(i % 4).x,
-                 quad.getVertex(i % 4).y,
-                 0);
-    }
-  }
-  glEnd ();
-
-  glPopMatrix();
-}
-
diff --git a/prototypes/wx/wx-02-input-output/SourceGLCanvas.h b/prototypes/wx/wx-02-input-output/SourceGLCanvas.h
deleted file mode 100644
index 270bec03..00000000
--- a/prototypes/wx/wx-02-input-output/SourceGLCanvas.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * SourceGLCanvas.h
- *
- * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SOURCEGLCANVAS_H_
-#define SOURCEGLCANVAS_H_
-
-#include <wx/wx.h>
-#include <wx/glcanvas.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <SOIL/SOIL.h>
-
-#include "MapperGLCanvas.h"
-
-class SourceGLCanvas: public MapperGLCanvas {
-public:
-  SourceGLCanvas(wxFrame* parent);
-
-  virtual Quad& getQuad() {
-    std::tr1::shared_ptr<TextureMapping> textureMapping = std::tr1::static_pointer_cast<TextureMapping>(Common::currentMapping);
-    wxASSERT(textureMapping != NULL);
-
-    std::tr1::shared_ptr<Quad> inputQuad = std::tr1::static_pointer_cast<Quad>(textureMapping->getInputShape());
-    wxASSERT(inputQuad != NULL);
-
-    return (*inputQuad);
-  }
-
-private:
-  virtual void doRender();
-};
-
-
-#endif /* DESTINATIONGLCANVAS_H_ */
diff --git a/prototypes/wx/wx-02-input-output/build.sh b/prototypes/wx/wx-02-input-output/build.sh
deleted file mode 100755
index 1f32ba81..00000000
--- a/prototypes/wx/wx-02-input-output/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# libwxgtk2.8-dev
-g++ main.cpp Common.cpp DestinationGLCanvas.cpp SourceGLCanvas.cpp MapperGLCanvas.cpp -o run `wx-config --libs --cxxflags --gl-libs` -lglut -lGL -lSOIL -I/usr/include
diff --git a/prototypes/wx/wx-02-input-output/example.png b/prototypes/wx/wx-02-input-output/example.png
deleted file mode 100644
index ffb8a2c1664e7ea2a0b61fce458c9c555c71638c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13385
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
b3RF0eGJ`!~>AC$EA;9dc)tU0s?$Q4P3fSHz

diff --git a/prototypes/wx/wx-02-input-output/main.cpp b/prototypes/wx/wx-02-input-output/main.cpp
deleted file mode 100644
index 10c89b40..00000000
--- a/prototypes/wx/wx-02-input-output/main.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// NOTE: To run, it is recommended not to be in Compiz or Beryl, they have shown some instability.
- 
-#include <wx/wx.h>
-#include "Common.h"
-#include "DestinationGLCanvas.h"
-#include "SourceGLCanvas.h"
-
-#include <stdlib.h>
-#include <stdio.h>
- 
-#ifndef WIN32
-#include <unistd.h> // FIXME: ¿This work/necessary in Windows?
-                    //Not necessary, but if it was, it needs to be replaced by process.h AND io.h
-#endif
- 
-class MyApp: public wxApp
-{
-    virtual bool OnInit();
-    SourceGLCanvas * sourceCanvas;
-    DestinationGLCanvas * destinationCanvas;
-//public:
-//    int FilterEvent(wxEvent& event);
-};
- 
-IMPLEMENT_APP(MyApp)
- 
-bool MyApp::OnInit()
-{
-  wxFrame *frame = new wxFrame((wxFrame *) NULL, -1,  wxT("Libremapping"), wxPoint(50, 50), wxSize(640, 480));
-
-  wxBoxSizer* topSizer = new wxBoxSizer( wxHORIZONTAL );
-  sourceCanvas = new SourceGLCanvas(frame);
-  destinationCanvas = new DestinationGLCanvas(frame);
-
-  topSizer->Add(sourceCanvas, 1, wxEXPAND);
-  topSizer->AddSpacer(10);
-  topSizer->Add(destinationCanvas, 1, wxEXPAND);
-
-//    frame->SetWindowStyle(wxWANTS_CHARS);
-  frame->SetSizer(topSizer);
-
-  // HACK: values 320x480 should be retrieved automatically
-  Common::initializeLibremapper(320,  480);
-
-  frame->Show(TRUE);
-
-
-
-  return TRUE;
-}
-//
-//int MyApp::FilterEvent(wxEvent& event) {
-//  printf("Event: %d %d\n", event.GetEventType(), wxEVT_KEY_DOWN);
-//
-//  if (event.GetEventType() == wxEVT_CHAR) {
-//    printf("Char: %d\n", ((wxKeyEvent&)event).GetKeyCode());
-//    return true;
-//  }
-//
-//  return -1;
-//}
-//
-
diff --git a/prototypes/wx/wx-03-polyline/build.sh b/prototypes/wx/wx-03-polyline/build.sh
deleted file mode 100755
index e778f155..00000000
--- a/prototypes/wx/wx-03-polyline/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -o verbose
-
-# libwxgtk2.8-dev
-g++ main.cpp -o run `wx-config --libs --cxxflags --gl-libs`  -lGL -lGLU -lglut
-
-# g++ main.cpp -o run -I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread -lwx_gtk2u_gl-2.8 -L/usr/lib/x86_64-linux-gnu -pthread -Wl,-Bsymbolic-functions -Wl,-z,relro  -L/usr/lib/x86_64-linux-gnu   -lwx_gtk2u_richtext-2.8 -lwx_gtk2u_aui-2.8 -lwx_gtk2u_xrc-2.8 -lwx_gtk2u_qa-2.8 -lwx_gtk2u_html-2.8 -lwx_gtk2u_adv-2.8 -lwx_gtk2u_core-2.8 -lwx_baseu_xml-2.8 -lwx_baseu_net-2.8 -lwx_baseu-2.8 
diff --git a/prototypes/wx/wx-03-polyline/main.cpp b/prototypes/wx/wx-03-polyline/main.cpp
deleted file mode 100644
index 424c0940..00000000
--- a/prototypes/wx/wx-03-polyline/main.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-// NOTE: To run, it is recommended not to be in Compiz or Beryl, they have shown some instability.
-// Needs:  libwxgtk2.8-dev
-// g++ main.cpp -o run `wx-config --libs --cxxflags --gl-libs`
- 
-#include <wx/wx.h>
-#include <wx/glcanvas.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <vector>
- 
-#ifndef WIN32
-#include <unistd.h> // FIXME: ¿This work/necessary in Windows?
-          //Not necessary, but if it was, it needs to be replaced by process.h AND io.h
-#endif
-
-typedef enum
-{
-  LINES = 0,
-  POLYGON = 1
-} Style;
-
-/*
- * Left: place point
- * Right: remove previous point
- * Middle: invisible line. (no line)
- */
-class Point
-{
-  public:
-    Point(float x, float y)
-    {
-      this->x = x;
-      this->y = y;
-    }
-    float x;
-    float y;
-};
-
-class PolyLine
-{
-  public:
-    void addPoint(Point point);
-    void removeLastPoint();
-    void clear();
-    void draw();
-    unsigned int size();
-    void setStyle(Style style);
-  private:
-    std::vector<Point> points;
-    Style style;
-};
-
-void PolyLine::setStyle(Style style)
-{
-  this->style = style;
-}
-
-unsigned int PolyLine::size()
-{
-  return points.size();
-}
-
-void PolyLine::addPoint(Point point)
-{
-  points.push_back(point);
-}
-
-void PolyLine::removeLastPoint()
-{
-  if (points.size() >= 1)
-    points.erase(points.end());
-}
-void PolyLine::clear()
-{
-  points.clear();
-}
-
-void PolyLine::draw()
-{
-  std::vector<Point>::const_iterator iter;
-
-  glPushMatrix ();
-  if (style == LINES)
-    glBegin (GL_LINE_STRIP);
-  else if (style == POLYGON)
-    glBegin (GL_POLYGON);
-  for (iter = points.begin(); iter != points.end(); iter++)
-    glVertex3f ((*iter).x, (*iter).y, 0.0f);
-  glEnd ();
-  glPopMatrix ();
-}
-
-class Manager
-{
-  public:
-    void addPoint(Point point);
-    void addPolyLine(Point point);
-    void removeLastPoint();
-    void draw();
-    void clear();
-    void setStyle(Style style);
-    Style getStyle();
-  private:
-    std::vector<PolyLine> lines;
-    unsigned int current;
-    Style style;
-};
-
-void Manager::setStyle(Style style)
-{
-  this->style = style;
-}
-
-Style Manager::getStyle()
-{
-  return style;
-}
-
-void Manager::addPoint(Point point)
-{
-  if (lines.size() == 0)
-  {
-    lines.push_back(PolyLine());
-    current = 0;
-  }
-  lines[current].addPoint(point);
-}
-
-void Manager::addPolyLine(Point point)
-{
-  lines.push_back(PolyLine());
-  current++;
-  lines[current].addPoint(point);
-}
-
-void Manager::removeLastPoint()
-{
-  // TODO: return bool
-  if (lines.size() > 0)
-  {
-    if (lines[current].size() == 0)
-      if (current == 0)
-        lines.clear();
-      else
-      {
-        lines.erase(lines.end());
-        current--;
-      }
-    else
-      lines[current].removeLastPoint();
-  }
-}
-
-void Manager::draw()
-{
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  glEnable(GL_BLEND);
-  glDisable (GL_TEXTURE_2D);
-  glEnable(GL_LINE_SMOOTH);
-  glLineWidth(3.0f);
-  glDisable (GL_LIGHTING);
-  glColor3f (0.2f, 1.0f, 0.2f);
-
-  std::vector<PolyLine>::iterator iter;
-  for (iter = lines.begin(); iter != lines.end(); iter++)
-  {
-    (*iter).setStyle(style);
-    (*iter).draw();
-  }
-}
-
-void Manager::clear()
-{
-  lines.clear();
-}
-
-void draw_marquee(float x, float y)
-{
-  const int length = 30;
-  const int distance = 10;
-
-  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-  glEnable(GL_BLEND);
-  glDisable (GL_TEXTURE_2D);
-  glEnable(GL_LINE_SMOOTH);
-  glLineWidth(3.0f);
-  glDisable (GL_LIGHTING);
-  glColor3f (1.0f, 0.0f, 0.0f);
-
-  glBegin(GL_LINES);
-  glVertex3f(x - (length + distance), y, 0.0f);
-  glVertex3f(x - distance, y, 0.0f);
-  glEnd();
-
-  glBegin(GL_LINES);
-  glVertex3f(x + (length + distance), y, 0.0f);
-  glVertex3f(x + distance, y, 0.0f);
-  glEnd();
-
-  glBegin(GL_LINES);
-  glVertex3f(x, y - (length + distance), 0.0f);
-  glVertex3f(x, y - distance, 0.0f);
-  glEnd();
-
-  glBegin(GL_LINES);
-  glVertex3f(x, y + (length + distance), 0.0f);
-  glVertex3f(x, y + distance, 0.0f);
-  glEnd();
-}
-
-class MyCanvas: public wxGLCanvas
-{
-    void Render();
-  public:
-    MyCanvas(wxFrame* parent);
-    void evt_paint_cb(wxPaintEvent& event);
-  protected:
-    DECLARE_EVENT_TABLE()
-  private:
-    void evt_mouse_events_cb (wxMouseEvent& event);
-    void evt_key_down_cb (wxKeyEvent& event);
-    void setup_polyline ();
-    Manager manager;
-    float mousex;
-    float mousey;
-};
- 
-BEGIN_EVENT_TABLE(MyCanvas, wxGLCanvas)
-  EVT_PAINT  (MyCanvas::evt_paint_cb)
-  EVT_KEY_DOWN    (MyCanvas::evt_key_down_cb)
-  EVT_MOUSE_EVENTS(MyCanvas::evt_mouse_events_cb)
-END_EVENT_TABLE()
- 
-MyCanvas::MyCanvas(wxFrame *parent)
-:wxGLCanvas(parent, wxID_ANY,  wxDefaultPosition, wxDefaultSize, 0, wxT("GLCanvas"))
-{
-  int argc = 1;
-  char* argv[1] = { wxString((wxTheApp->argv)[0]).char_str() };
-}
- 
-void MyCanvas::evt_paint_cb(wxPaintEvent& WXUNUSED(event))
-{
-  Render();
-}
-
-void MyCanvas::evt_mouse_events_cb(wxMouseEvent& event)
-{
-  //printf("x=%d y=%d LeftIsDown=%d\n", event.GetX(), event.GetY(), (int) event.LeftIsDown());
-  bool should_render = false;
-  Point point = Point(mousex, mousey);
-  mousex = (float) event.GetX();
-  mousey = (float) event.GetY();
-
-  should_render = true;
-  if (event.LeftIsDown())
-  {
-    manager.addPoint(point);
-    should_render = true;
-  }
-  else if (event.RightIsDown())
-  {
-    // FIXME
-    manager.removeLastPoint();
-    manager.removeLastPoint();
-    should_render = true;
-  }
-  else if (event.MiddleIsDown())
-  {
-    manager.addPolyLine(point);
-    should_render = true;
-  }
-  else
-  {
-    manager.removeLastPoint();
-    manager.addPoint(point);
-    should_render = true;
-  }
-  // if (event.Leaving()) { }
-  // else if (event.Entering()) { }
-
-  if (should_render)
-    Render();
-  // To catch keyboard events
-  SetFocus();
-}
-
-void MyCanvas::evt_key_down_cb(wxKeyEvent & event)
-{
-  bool should_render = false;
-  switch (event.GetKeyCode())
-  {
-    case WXK_TAB:
-      if (manager.getStyle() == POLYGON)
-        manager.setStyle(LINES);
-      else
-        manager.setStyle(POLYGON);
-      should_render = true;
-      break;
-    case WXK_UP:
-      break;
-    case WXK_DOWN:
-      break;
-    case WXK_LEFT:
-      break;
-    case WXK_RIGHT:
-      break;
-    default:
-      break;
-  }
-  if (should_render)
-    Render();
-}
-
-void MyCanvas::setup_polyline()
-{
-  manager.clear();
-}
-
-void MyCanvas::Render()
-{
-  static bool polyline_is_set = false;
-
-  SetCurrent();
-  wxPaintDC(this);
-
-  if (! polyline_is_set)
-  {
-    setup_polyline();
-    polyline_is_set = true;
-  }
-
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-  glClear(GL_COLOR_BUFFER_BIT);
-  glViewport(0, 0, (GLint) GetSize().x, (GLint) GetSize().y);
-
-  glMatrixMode (GL_PROJECTION);
-  glLoadIdentity ();
-  glOrtho (
-    0.0f, (float) GetSize().x, // left, right
-    (float) GetSize().y, 0.0f, // bottom, top
-    -1.0, 1.0f);
-  glMatrixMode (GL_MODELVIEW);
-  glLoadIdentity (); // FIXME? is this needed here?
-
-  manager.draw();
-  draw_marquee(mousex, mousey);
-
-  glFlush();
-  SwapBuffers();
-}
-
-class MyApp: public wxApp
-{
-  private:
-    virtual bool OnInit();
-    MyCanvas * MyGLCanvas;
-};
- 
-IMPLEMENT_APP(MyApp)
- 
-bool MyApp::OnInit()
-{
-  wxFrame *frame = new wxFrame((wxFrame *) NULL, -1,  wxT("LibreMapping - PolyLine Prototype"), wxPoint(50, 50), wxSize(640, 480));
-  //frame->SetWindowStyle(wxWANTS_CHARS);
-  MyGLCanvas = new MyCanvas(frame);
- 
-  frame->Show(TRUE);
-  return TRUE;
-}

From aca315e3477ff708ba8f96752fe490bb2274a576 Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Fri, 22 May 2026 21:07:18 -0400
Subject: [PATCH 6/7] Rename Paint to Source and Mapping to Layer throughout
 codebase

Aligns C++ class names with the terminology already used in the GUI,
project file format, and OSC interface. MappingManager class keeps
its name. Old project files with TextureMapping/ColorMapping class
names are supported via MetaObjectRegistry aliases. OSC paths change
from /paint/ and /mapping/ to /source/ and /layer/.
---
 src/app/main.cpp                              |   12 +-
 src/control/OscInterface.cpp                  |   50 +-
 src/core/Commands.cpp                         |  128 +-
 src/core/Commands.h                           |   46 +-
 src/core/{Mapping.cpp => Layer.cpp}           |   64 +-
 src/core/{Mapping.h => Layer.h}               |  100 +-
 src/core/MappingManager.cpp                   |  210 +-
 src/core/MappingManager.h                     |  100 +-
 src/core/MetaObjectRegistry.h                 |    5 +
 src/core/ProjectReader.cpp                    |   60 +-
 src/core/ProjectReader.h                      |    8 +-
 src/core/ProjectWriter.cpp                    |    8 +-
 src/core/ProjectWriter.h                      |    4 +-
 src/core/{Paint.cpp => Source.cpp}            |   14 +-
 src/core/{Paint.h => Source.h}                |   40 +-
 src/core/Util.h                               |    2 +-
 src/core/core.pri                             |    8 +-
 src/gui/{MappingGui.cpp => LayerGui.cpp}      |  190 +-
 src/gui/{MappingGui.h => LayerGui.h}          |   86 +-
 ...ItemDelegate.cpp => LayerItemDelegate.cpp} |   16 +-
 ...pingItemDelegate.h => LayerItemDelegate.h} |   10 +-
 ...appingListModel.cpp => LayerListModel.cpp} |   96 +-
 .../{MappingListModel.h => LayerListModel.h}  |   20 +-
 src/gui/MainWindow.cpp                        | 1732 ++++++++---------
 src/gui/MainWindow.h                          |  250 +--
 src/gui/MapperGLCanvas.cpp                    |   38 +-
 src/gui/MapperGLCanvas.h                      |    6 +-
 src/gui/ShapeGraphicsItem.cpp                 |   56 +-
 src/gui/ShapeGraphicsItem.h                   |   34 +-
 src/gui/{PaintGui.cpp => SourceGui.cpp}       |   66 +-
 src/gui/{PaintGui.h => SourceGui.h}           |   42 +-
 src/gui/gui.pri                               |   16 +-
 32 files changed, 1762 insertions(+), 1755 deletions(-)
 rename src/core/{Mapping.cpp => Layer.cpp} (66%)
 rename src/core/{Mapping.h => Layer.h} (68%)
 rename src/core/{Paint.cpp => Source.cpp} (98%)
 rename src/core/{Paint.h => Source.h} (89%)
 rename src/gui/{MappingGui.cpp => LayerGui.cpp} (65%)
 rename src/gui/{MappingGui.h => LayerGui.h} (68%)
 rename src/gui/{MappingItemDelegate.cpp => LayerItemDelegate.cpp} (93%)
 rename src/gui/{MappingItemDelegate.h => LayerItemDelegate.h} (90%)
 rename src/gui/{MappingListModel.cpp => LayerListModel.cpp} (61%)
 rename src/gui/{MappingListModel.h => LayerListModel.h} (84%)
 rename src/gui/{PaintGui.cpp => SourceGui.cpp} (83%)
 rename src/gui/{PaintGui.h => SourceGui.h} (78%)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index b3a481ec..ca8b2994 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -37,14 +37,18 @@ void initRegistry()
 {
   MetaObjectRegistry& registry = MetaObjectRegistry::instance();
 
-  // Paints.
+  // Sources.
   registry.add<Video>();
   registry.add<Image>();
   registry.add<Color>();
 
-  // Mappings.
-  registry.add<TextureMapping>();
-  registry.add<ColorMapping>();
+  // Layers (formerly Mappings).
+  registry.add<TextureLayer>();
+  registry.add<ColorLayer>();
+
+  // Backward compatibility for old project files.
+  registry.addAlias("mmp::TextureMapping", &TextureLayer::staticMetaObject);
+  registry.addAlias("mmp::ColorMapping", &ColorLayer::staticMetaObject);
 
   // Shapes.
   registry.add<Quad>();
diff --git a/src/control/OscInterface.cpp b/src/control/OscInterface.cpp
index bfe1a3b5..9400008e 100644
--- a/src/control/OscInterface.cpp
+++ b/src/control/OscInterface.cpp
@@ -28,15 +28,15 @@
 namespace mmp {
 
 static const QString OSC_ROOT("mapmap");
-static const QString OSC_PAINT("paint");
-static const QString OSC_MAPPING("mapping");
+static const QString OSC_SOURCE("source");
+static const QString OSC_LAYER("layer");
 static const QString OSC_QUIT("quit");
 static const QString OSC_PLAY("play");
 static const QString OSC_PAUSE("pause");
 static const QString OSC_REWIND("rewind");
 
-static const QString OSC_PAINT_MEDIA("media");
-static const QString OSC_PAINT_COLOR("color");
+static const QString OSC_SOURCE_MEDIA("media");
+static const QString OSC_SOURCE_COLOR("color");
 
 OscInterface::OscInterface(
     int listen_port) :
@@ -174,7 +174,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
   QString typetags = command.at(1).toString();
 
   bool pathIsValid = false;
-  // Walks through each token in the form /mapmap/paint/color - The first token is "mapmap", and then "paint"
+  // Walks through each token in the form /mapmap/source/color - The first token is "mapmap", and then "source"
   QPair<QString,QString> iterator = next(path);
 
   if (iterator.first.isEmpty()) {
@@ -185,24 +185,23 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
       // Check type.
       iterator = next(iterator.second);
 
-      // Paint.
-      if (iterator.first == OSC_PAINT)
+      // Source.
+      if (iterator.first == OSC_SOURCE)
       {
-        // Find paint (or paints).
+        // Find source (or sources).
         if (command.size() >= 3)
         {
-          // Find paint (or paints).
-          QVector<Paint::ptr> paints;
+          QVector<Source::ptr> sources;
           if (command.at(2).type() == QVariant::String)
-            paints = main_window.getMappingManager().getPaintsByNameRegExp(command.at(2).toString());
+            sources = main_window.getMappingManager().getSourcesByNameRegExp(command.at(2).toString());
           else
           {
             int id = command.at(2).toInt();
-            paints.push_back(main_window.getMappingManager().getPaintById(id));
+            sources.push_back(main_window.getMappingManager().getSourceById(id));
           }
-          // Process all paints.
+          // Process all sources.
           iterator = next(iterator.second);
-          for (Paint::ptr elem: paints)
+          for (Source::ptr elem: sources)
           {
             // Rewind.
             if (iterator.first == OSC_REWIND)
@@ -212,35 +211,34 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
             }
             // Property setting (eg. opacity)
             else if (command.size() >= 4) {
-              qDebug() << "Attempt to set a paint property" << iterator.first << command.at(3);
+              qDebug() << "Attempt to set a source property" << iterator.first << command.at(3);
               pathIsValid |= setElementProperty(elem, iterator.first, command.at(3));
             }
           }
         }
       }
 
-      // Mapping.
-      else if (iterator.first == OSC_MAPPING)
+      // Layer.
+      else if (iterator.first == OSC_LAYER)
       {
-        // Find mapping (or mappings).
+        // Find layer (or layers).
         if (command.size() >= 3)
         {
-          QVector<Mapping::ptr> mappings;
+          QVector<Layer::ptr> layers;
           if (command.at(2).type() == QVariant::String)
-            mappings = main_window.getMappingManager().getMappingsByNameRegExp(command.at(2).toString());
+            layers = main_window.getMappingManager().getLayersByNameRegExp(command.at(2).toString());
           else
           {
             int id = command.at(2).toInt();
-            main_window.getMappingManager().getMappingById(id);
-            Mapping::ptr mapping = main_window.getMappingManager().getMappingById(id);
-            if (!mapping.isNull())
-              mappings.push_back(mapping);
+            Layer::ptr layer = main_window.getMappingManager().getLayerById(id);
+            if (!layer.isNull())
+              layers.push_back(layer);
           }
-          // Process all mappings (set property).
+          // Process all layers (set property).
           if (command.size() >= 4)
           {
             iterator = next(iterator.second);
-            for (Mapping::ptr elem: mappings)
+            for (Layer::ptr elem: layers)
             {
               pathIsValid |= setElementProperty(elem, iterator.first, command.at(3));
             }
diff --git a/src/core/Commands.cpp b/src/core/Commands.cpp
index 9d33087b..4d3df57f 100644
--- a/src/core/Commands.cpp
+++ b/src/core/Commands.cpp
@@ -26,63 +26,63 @@
 
 namespace mmp {
 
-AddPaintCommand::AddPaintCommand(MainWindow *mainWindow, uid paintId, const QIcon &icon, const QString &name, QUndoCommand *parent) :
+AddSourceCommand::AddSourceCommand(MainWindow *mainWindow, uid sourceId, const QIcon &icon, const QString &name, QUndoCommand *parent) :
   QUndoCommand(parent),
   _mainWindow(mainWindow),
-  _paintId(paintId),
+  _sourceId(sourceId),
   _icon(icon),
   _name(name)
 {
   setText(QObject::tr("Add source"));
 }
 
-void AddPaintCommand::undo()
+void AddSourceCommand::undo()
 {
-  _paint = _mainWindow->getMappingManager().getPaintById(_paintId);
-  _mainWindow->removePaintItem(_paintId);
+  _source = _mainWindow->getMappingManager().getSourceById(_sourceId);
+  _mainWindow->removeSourceItem(_sourceId);
 }
 
-void AddPaintCommand::redo()
+void AddSourceCommand::redo()
 {
-  if (!_paint.isNull())
+  if (!_source.isNull())
   {
-    uid lastId = _mainWindow->getMappingManager().addPaint(_paint);
-    _mainWindow->addPaintItem(lastId, _icon, _name);
+    uid lastId = _mainWindow->getMappingManager().addSource(_source);
+    _mainWindow->addSourceItem(lastId, _icon, _name);
   }
   else {
-    _mainWindow->addPaintItem(_paintId, _icon, _name);
+    _mainWindow->addSourceItem(_sourceId, _icon, _name);
   }
 }
 
-AddMappingCommand::AddMappingCommand(MainWindow *mainWindow, uid mappingId, QUndoCommand *parent):
+AddLayerCommand::AddLayerCommand(MainWindow *mainWindow, uid layerId, QUndoCommand *parent):
   QUndoCommand(parent),
   _mainWindow(mainWindow),
-  _mappingId(mappingId)
+  _layerId(layerId)
 {
   setText(QObject::tr("Add layer"));
 }
 
-void AddMappingCommand::undo()
+void AddLayerCommand::undo()
 {
-  _mapping = _mainWindow->getMappingManager().getMappingById(_mappingId);
-  _mainWindow->deleteMapping(_mappingId);
+  _layer = _mainWindow->getMappingManager().getLayerById(_layerId);
+  _mainWindow->deleteLayer(_layerId);
 }
 
-void AddMappingCommand::redo()
+void AddLayerCommand::redo()
 {
-  if (!_mapping.isNull())
+  if (!_layer.isNull())
   {
-    uid storedId = _mainWindow->getMappingManager().addMapping(_mapping);
-    _mainWindow->addMappingItem(storedId);
+    uid storedId = _mainWindow->getMappingManager().addLayer(_layer);
+    _mainWindow->addLayerItem(storedId);
   }
   else
   {
-    _mainWindow->addMappingItem(_mappingId);
+    _mainWindow->addLayerItem(_layerId);
   }
 }
 
-DuplicateMappingCommand::DuplicateMappingCommand(MainWindow *mainWindow, uid cloneId, QUndoCommand *parent):
-  AddMappingCommand(mainWindow, cloneId, parent)
+DuplicateLayerCommand::DuplicateLayerCommand(MainWindow *mainWindow, uid cloneId, QUndoCommand *parent):
+  AddLayerCommand(mainWindow, cloneId, parent)
 {
   setText(QObject::tr("Duplicate layer"));
 }
@@ -252,73 +252,73 @@ void TranslateShapeCommand::_doTransform(MShape::ptr shape)
   shape->translate(_translation);
 }
 
-RemovePaintCommand::RemovePaintCommand(MainWindow *mainWindow, uid paintId, QUndoCommand *parent):
+RemoveSourceCommand::RemoveSourceCommand(MainWindow *mainWindow, uid sourceId, QUndoCommand *parent):
   QUndoCommand(parent),
   _mainWindow(mainWindow),
-  _paintId(paintId),
-  _paintMappings()
+  _sourceId(sourceId),
+  _sourceLayers()
 {
   setText(QObject::tr("Remove media"));
 }
 
-void RemovePaintCommand::undo()
+void RemoveSourceCommand::undo()
 {
-  if (!_paint.isNull())
+  if (!_source.isNull())
   {
-    MappingManager& mappingManager = _mainWindow->getMappingManager();
-    uid lastId = mappingManager.addPaint(_paint);
-    _mainWindow->addPaintItem(lastId, _paint->getIcon(), _paint->getName());
-
-    // Add all mappings associated with paint.
-    QMap<uid, Mapping::ptr> paintMappings = mappingManager.getPaintMappings(_paint);
-    for (QMap<uid, Mapping::ptr>::const_iterator it = _paintMappings.constBegin();
-         it != _paintMappings.constEnd(); ++it) {
-      uid mid = mappingManager.addMapping( it.value() );
+    MappingManager& manager = _mainWindow->getMappingManager();
+    uid lastId = manager.addSource(_source);
+    _mainWindow->addSourceItem(lastId, _source->getIcon(), _source->getName());
+
+    // Add all mappings associated with source.
+    QMap<uid, Layer::ptr> sourceLayers = manager.getSourceLayers(_source);
+    for (QMap<uid, Layer::ptr>::const_iterator it = _sourceLayers.constBegin();
+         it != _sourceLayers.constEnd(); ++it) {
+      uid mid = manager.addLayer( it.value() );
       Q_ASSERT( mid == it.key() );
-      _mainWindow->addMappingItem(mid);
+      _mainWindow->addLayerItem(mid);
     }
   }
 }
 
-void RemovePaintCommand::redo()
+void RemoveSourceCommand::redo()
 {
-   MappingManager& mappingManager = _mainWindow->getMappingManager();
-   bool deleteWithoutPrompt = (!_paint.isNull()); // to avoid the pop-up window when redoing after undoing
-  _paint = mappingManager.getPaintById(_paintId);
-  _paintMappings = mappingManager.getPaintMappings(_paint);
-  _mainWindow->deletePaint(_paintId, deleteWithoutPrompt);
+   MappingManager& manager = _mainWindow->getMappingManager();
+   bool deleteWithoutPrompt = (!_source.isNull()); // to avoid the pop-up window when redoing after undoing
+  _source = manager.getSourceById(_sourceId);
+  _sourceLayers = manager.getSourceLayers(_source);
+  _mainWindow->deleteSource(_sourceId, deleteWithoutPrompt);
 }
 
 
 
-DeleteMappingCommand::DeleteMappingCommand(MainWindow *mainWindow, uid mappingId, QUndoCommand *parent) :
+DeleteLayerCommand::DeleteLayerCommand(MainWindow *mainWindow, uid layerId, QUndoCommand *parent) :
   QUndoCommand(parent),
   _mainWindow(mainWindow),
-  _mappingId(mappingId)
+  _layerId(layerId)
 {
   setText(QObject::tr("Delete layer"));
 }
 
-void DeleteMappingCommand::undo()
+void DeleteLayerCommand::undo()
 {
-  if (!_mapping.isNull())
+  if (!_layer.isNull())
   {
-    uid storedId = _mainWindow->getMappingManager().addMapping(_mapping);
-    _mainWindow->addMappingItem(storedId);
+    uid storedId = _mainWindow->getMappingManager().addLayer(_layer);
+    _mainWindow->addLayerItem(storedId);
   }
 }
 
-void DeleteMappingCommand::redo()
+void DeleteLayerCommand::redo()
 {
   // Store mapping pointer before delete it
-  _mapping = _mainWindow->getMappingManager().getMappingById(_mappingId);
-  _mainWindow->deleteMapping(_mappingId);
+  _layer = _mainWindow->getMappingManager().getLayerById(_layerId);
+  _mainWindow->deleteLayer(_layerId);
 }
 
-MoveMappingCommand::MoveMappingCommand(MainWindow *mainWindow, uid mappingId,  MM::MoveElement moveType, QUndoCommand *parent) :
+MoveLayerCommand::MoveLayerCommand(MainWindow *mainWindow, uid layerId,  MM::MoveElement moveType, QUndoCommand *parent) :
   QUndoCommand(parent),
   _mainWindow(mainWindow),
-  _mappingId(mappingId),
+  _layerId(layerId),
   _moveType(moveType)
 {
   switch (moveType) {
@@ -330,32 +330,32 @@ MoveMappingCommand::MoveMappingCommand(MainWindow *mainWindow, uid mappingId,  M
   }
 }
 
-void MoveMappingCommand::undo()
+void MoveLayerCommand::undo()
 {
-  if (!_mapping.isNull())
+  if (!_layer.isNull())
   {
     // Do the inverse move.
-    _mainWindow->moveMapping(_mappingId, _fromIdx);
+    _mainWindow->moveLayer(_layerId, _fromIdx);
   }
 }
 
-void MoveMappingCommand::redo()
+void MoveLayerCommand::redo()
 {
   // Store mapping pointer before delete it
-  _mapping = _mainWindow->getMappingManager().getMappingById(_mappingId);
-  _fromIdx = _mainWindow->getMappingManager().getMappingIndex(_mapping);
-  int maxMappingIdx = _mainWindow->getMappingManager().nMappings()-1;
+  _layer = _mainWindow->getMappingManager().getLayerById(_layerId);
+  _fromIdx = _mainWindow->getMappingManager().getLayerIndex(_layer);
+  int maxLayerIdx = _mainWindow->getMappingManager().nLayers()-1;
 
   switch (_moveType) {
     case MM::Raise:  _toIdx = qMax(_fromIdx - 1, 0); break;
-    case MM::Lower:  _toIdx = qMin(_fromIdx + 1, maxMappingIdx); break;
+    case MM::Lower:  _toIdx = qMin(_fromIdx + 1, maxLayerIdx); break;
     case MM::Top:    _toIdx = 0; break;
-    case MM::Bottom: _toIdx = maxMappingIdx; break;
+    case MM::Bottom: _toIdx = maxLayerIdx; break;
     default:; // should not happen
   }
 
   // Do the move.
-  _mainWindow->moveMapping(_mappingId, _toIdx);
+  _mainWindow->moveLayer(_layerId, _toIdx);
 }
 
 FlipShapeCommand::FlipShapeCommand(MapperGLCanvas *canvas, TransformShapeCommand::TransformShapeOption option, const MShape::ptr &initialShape, MShape::FlipDirection direction, QUndoCommand *parent)
diff --git a/src/core/Commands.h b/src/core/Commands.h
index 0dab6cee..caa55697 100644
--- a/src/core/Commands.h
+++ b/src/core/Commands.h
@@ -43,40 +43,40 @@ enum CommandId {
 class MainWindow;
 class MapperGLCanvas;
 
-class AddPaintCommand : public QUndoCommand
+class AddSourceCommand : public QUndoCommand
 {
 public:
-  explicit AddPaintCommand(MainWindow *mainWindow, uid paintId, const QIcon &icon, const QString &name, QUndoCommand *parent = 0);
+  explicit AddSourceCommand(MainWindow *mainWindow, uid sourceId, const QIcon &icon, const QString &name, QUndoCommand *parent = 0);
 
   void undo() Q_DECL_OVERRIDE;
   void redo() Q_DECL_OVERRIDE;
 
 private:
   MainWindow *_mainWindow;
-  Paint::ptr _paint;
-  uid _paintId;
+  Source::ptr _source;
+  uid _sourceId;
   QIcon _icon;
   QString _name;
 };
 
-class AddMappingCommand : public QUndoCommand
+class AddLayerCommand : public QUndoCommand
 {
 public:
-  explicit AddMappingCommand(MainWindow *mainWindow, uid mappingId, QUndoCommand *parent = 0);
+  explicit AddLayerCommand(MainWindow *mainWindow, uid layerId, QUndoCommand *parent = 0);
 
   void undo() Q_DECL_OVERRIDE;
   void redo() Q_DECL_OVERRIDE;
 
 private:
   MainWindow *_mainWindow;
-  Mapping::ptr _mapping;
-  uid _mappingId;
+  Layer::ptr _layer;
+  uid _layerId;
 };
 
-class DuplicateMappingCommand : public AddMappingCommand
+class DuplicateLayerCommand : public AddLayerCommand
 {
 public:
-  explicit DuplicateMappingCommand(MainWindow *mainWindow, uid cloneId, QUndoCommand *parent = 0);
+  explicit DuplicateLayerCommand(MainWindow *mainWindow, uid cloneId, QUndoCommand *parent = 0);
 
 };
 
@@ -194,47 +194,47 @@ class RotateShapeCommand : public TransformShapeCommand
   MShape::ptr _initialShape;
 };
 
-class RemovePaintCommand : public QUndoCommand
+class RemoveSourceCommand : public QUndoCommand
 {
 public:
-  explicit RemovePaintCommand(MainWindow *mainWindow, uid paintId, QUndoCommand *parent = 0);
+  explicit RemoveSourceCommand(MainWindow *mainWindow, uid sourceId, QUndoCommand *parent = 0);
 
   void undo() Q_DECL_OVERRIDE;
   void redo() Q_DECL_OVERRIDE;
 
 private:
   MainWindow *_mainWindow;
-  Paint::ptr _paint;
-  uid _paintId;
-  QMap<uid, Mapping::ptr> _paintMappings; // saves mappings associated with paint
+  Source::ptr _source;
+  uid _sourceId;
+  QMap<uid, Layer::ptr> _sourceLayers; // saves mappings associated with source
 };
 
-class DeleteMappingCommand : public QUndoCommand
+class DeleteLayerCommand : public QUndoCommand
 {
 public:
-  explicit DeleteMappingCommand(MainWindow *mainWindow, uid mappingId, QUndoCommand *parent = 0);
+  explicit DeleteLayerCommand(MainWindow *mainWindow, uid layerId, QUndoCommand *parent = 0);
 
   void undo() Q_DECL_OVERRIDE;
   void redo() Q_DECL_OVERRIDE;
 
 private:
   MainWindow *_mainWindow;
-  Mapping::ptr _mapping;
-  uid _mappingId;
+  Layer::ptr _layer;
+  uid _layerId;
 };
 
-class MoveMappingCommand : public QUndoCommand
+class MoveLayerCommand : public QUndoCommand
 {
 public:
-  explicit MoveMappingCommand(MainWindow *mainWindow, uid mappingId, MM::MoveElement moveType, QUndoCommand *parent = 0);
+  explicit MoveLayerCommand(MainWindow *mainWindow, uid layerId, MM::MoveElement moveType, QUndoCommand *parent = 0);
 
   void undo() Q_DECL_OVERRIDE;
   void redo() Q_DECL_OVERRIDE;
 
 private:
   MainWindow *_mainWindow;
-  Mapping::ptr _mapping;
-  uid _mappingId;
+  Layer::ptr _layer;
+  uid _layerId;
   MM::MoveElement _moveType;
   int _fromIdx;
   int _toIdx;
diff --git a/src/core/Mapping.cpp b/src/core/Layer.cpp
similarity index 66%
rename from src/core/Mapping.cpp
rename to src/core/Layer.cpp
index 68f2cf11..ee1916fa 100644
--- a/src/core/Mapping.cpp
+++ b/src/core/Layer.cpp
@@ -19,36 +19,36 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Mapping.h"
+#include "Layer.h"
 #include "MainWindow.h"
 
 namespace mmp {
 
-UidAllocator Mapping::allocator;
+UidAllocator Layer::allocator;
 
-Mapping::Mapping(uid id)
-: Mapping(Paint::ptr(), MShape::ptr(), MShape::ptr(), id) {}
+Layer::Layer(uid id)
+: Layer(Source::ptr(), MShape::ptr(), MShape::ptr(), id) {}
 
-Mapping::Mapping(Paint::ptr paint, uid id)
-: Mapping(paint, MShape::ptr(), MShape::ptr(), id) {}
+Layer::Layer(Source::ptr source, uid id)
+: Layer(source, MShape::ptr(), MShape::ptr(), id) {}
 
-Mapping::Mapping(Paint::ptr paint, MShape::ptr shape, uid id)
-: Mapping(paint, shape, MShape::ptr(), id) {}
+Layer::Layer(Source::ptr source, MShape::ptr shape, uid id)
+: Layer(source, shape, MShape::ptr(), id) {}
 
-Mapping::Mapping(Paint::ptr paint, MShape::ptr shape, MShape::ptr inputShape, uid id)
+Layer::Layer(Source::ptr source, MShape::ptr shape, MShape::ptr inputShape, uid id)
   : Element(id, &allocator),
-    _paint(paint), _shape(shape), _inputShape(inputShape),
+    _source(source), _shape(shape), _inputShape(inputShape),
     _isSolo(false), _isVisible(true)
 {
   // Default.
   _depth = getId();
 }
 
-Mapping::~Mapping() {
+Layer::~Layer() {
   allocator.free(getId());
 }
 
-void Mapping::setSolo(bool solo)
+void Layer::setSolo(bool solo)
 {
   if (solo != _isSolo)
   {
@@ -57,7 +57,7 @@ void Mapping::setSolo(bool solo)
   }
 }
 
-void Mapping::setVisible(bool visible)
+void Layer::setVisible(bool visible)
 {
   if (visible != _isVisible)
   {
@@ -66,7 +66,7 @@ void Mapping::setVisible(bool visible)
   }
 }
 
-void Mapping::setDepth(int depth)
+void Layer::setDepth(int depth)
 {
   if (depth != _depth)
   {
@@ -75,7 +75,7 @@ void Mapping::setDepth(int depth)
   }
 }
 
-void Mapping::setLocked(bool locked)
+void Layer::setLocked(bool locked)
 {
   if (!_shape.isNull())
     _shape->setLocked(locked);
@@ -84,26 +84,26 @@ void Mapping::setLocked(bool locked)
   Element::setLocked(locked);
 }
 
-void Mapping::setPaint(Paint::ptr paint)
+void Layer::setSource(Source::ptr source)
 {
-	if (paintIsCompatible(paint))
+	if (sourceIsCompatible(source))
 	{
-		_paint = paint;
-	  _emitPropertyChanged("paintId");
+		_source = source;
+	  _emitPropertyChanged("sourceId");
 	}
 }
 
-void Mapping::setPaintById(uid paintId)
+void Layer::setSourceById(uid sourceId)
 {
-  setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId));
+  setSource(MainWindow::window()->getMappingManager().getSourceById(sourceId));
 }
 
-void Mapping::read(const QJsonObject& obj)
+void Layer::read(const QJsonObject& obj)
 {
   Element::read(obj);
 
-  int paintId = obj[ProjectLabels::SOURCE_ID].toInt();
-  setPaintById(paintId);
+  int sourceId = obj[ProjectLabels::SOURCE_ID].toInt();
+  setSourceById(sourceId);
 
   // Read output shape.
   _readShape(obj, true);
@@ -115,11 +115,11 @@ void Mapping::read(const QJsonObject& obj)
   }
 }
 
-void Mapping::write(QJsonObject& obj)
+void Layer::write(QJsonObject& obj)
 {
   Element::write(obj);
 
-  obj[ProjectLabels::SOURCE_ID] = getPaintId();
+  obj[ProjectLabels::SOURCE_ID] = getSourceId();
 
   // Write output shape.
   _writeShape(obj, true);
@@ -131,7 +131,7 @@ void Mapping::write(QJsonObject& obj)
   }
 }
 
-void Mapping::_readShape(const QJsonObject& obj, bool isOutput)
+void Layer::_readShape(const QJsonObject& obj, bool isOutput)
 {
   QString tag = isOutput ? ProjectLabels::DESTINATION : ProjectLabels::SOURCE;
 
@@ -161,7 +161,7 @@ void Mapping::_readShape(const QJsonObject& obj, bool isOutput)
   }
 }
 
-void Mapping::_writeShape(QJsonObject& obj, bool isOutput)
+void Layer::_writeShape(QJsonObject& obj, bool isOutput)
 {
   QString tag = isOutput ? ProjectLabels::DESTINATION : ProjectLabels::SOURCE;
   MShape::ptr shape = isOutput ? getShape() : getInputShape();
@@ -170,14 +170,14 @@ void Mapping::_writeShape(QJsonObject& obj, bool isOutput)
   obj[tag] = shapeObj;
 }
 
-bool ColorMapping::paintIsCompatible(Paint::ptr paint) const
+bool ColorLayer::sourceIsCompatible(Source::ptr source) const
 {
-	return paint->inherits("mmp::Color");
+	return source->inherits("mmp::Color");
 }
 
-bool TextureMapping::paintIsCompatible(Paint::ptr paint) const
+bool TextureLayer::sourceIsCompatible(Source::ptr source) const
 {
-	return paint->inherits("mmp::Texture");
+	return source->inherits("mmp::Texture");
 }
 
 }
diff --git a/src/core/Mapping.h b/src/core/Layer.h
similarity index 68%
rename from src/core/Mapping.h
rename to src/core/Layer.h
index 194aec80..c497a8ae 100644
--- a/src/core/Mapping.h
+++ b/src/core/Layer.h
@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPPING_H_
-#define MAPPING_H_
+#ifndef LAYER_H_
+#define LAYER_H_
 
 #include <QtGlobal>
 
 #include "Shape.h"
-#include "Paint.h"
+#include "Source.h"
 
 #include "Element.h"
 
@@ -43,8 +43,8 @@ namespace mmp {
 /**
  * Mapping is the central concept of this software.
  *
- * A Mapping represents a relationship between an input Paint and
- * and output Shape where the paint (possibly modified by some other
+ * A Mapping represents a relationship between an input Source and
+ * and output Shape where the source (possibly modified by some other
  * attributes or an input Shape in the case of TextureMapping) is
  * projected on the output shape.
  *
@@ -52,7 +52,7 @@ namespace mmp {
  * can thus change their opacity level, toggle their visibility, set
  * them in "solo" mode and lock them.
  */
-class Mapping : public Element
+class Layer : public Element
 {
   Q_OBJECT
 
@@ -64,12 +64,12 @@ class Mapping : public Element
 //  Q_PROPERTY(MShape::ptr inputShape READ getInputShape)
 
   Q_PROPERTY(bool hasInputShape READ hasInputShape STORED false)
-  Q_PROPERTY(uid  paintId  READ getPaintId WRITE setPaintById STORED false)
-//  Q_PROPERTY(Paint::ptr paint READ getPaint WRITE setPaint)
+  Q_PROPERTY(uid  sourceId  READ getSourceId WRITE setSourceById STORED false)
+//  Q_PROPERTY(Source::ptr source READ getSource WRITE setSource)
 
 protected:
-  /// The input Paint instance.
-  Paint::ptr _paint;
+  /// The input Source instance.
+  Source::ptr _source;
 
   /// The output Shape instance.
   MShape::ptr _shape;
@@ -85,24 +85,24 @@ class Mapping : public Element
   int _depth; // depth of the layer
 
 protected:
-  Mapping(int id=NULL_UID);
-  Mapping(Paint::ptr paint, uid id=NULL_UID);
-  Mapping(Paint::ptr paint, MShape::ptr shape, uid id=NULL_UID);
-  Mapping(Paint::ptr paint, MShape::ptr shape, MShape::ptr inputShape, uid id=NULL_UID);
+  Layer(int id=NULL_UID);
+  Layer(Source::ptr source, uid id=NULL_UID);
+  Layer(Source::ptr source, MShape::ptr shape, uid id=NULL_UID);
+  Layer(Source::ptr source, MShape::ptr shape, MShape::ptr inputShape, uid id=NULL_UID);
 
 public:
-  typedef QSharedPointer<Mapping> ptr;
+  typedef QSharedPointer<Layer> ptr;
 
-  virtual ~Mapping();
+  virtual ~Layer();
 
   static const UidAllocator& getUidAllocator() { return allocator; }
 
   /**
-   * Sets up this Mapping: its Paint and its Shape.
-   * Calls the build() method of its Paint and Shape.
+   * Sets up this Mapping: its Source and its Shape.
+   * Calls the build() method of its Source and Shape.
    */
   virtual void build() {
-    _paint->build();
+    _source->build();
     _shape->build();
     if (hasInputShape())
       _inputShape->build();
@@ -112,16 +112,16 @@ class Mapping : public Element
   virtual MShape::ShapeType getType() const = 0;
 
   // Return copy of this mapping.
-  virtual Mapping* clone() const = 0;
+  virtual Layer* clone() const = 0;
 
-	/// Returns true iff paint is compatible with mapping.
-	virtual bool paintIsCompatible(Paint::ptr paint) const = 0;
+	/// Returns true iff source is compatible with mapping.
+	virtual bool sourceIsCompatible(Source::ptr source) const = 0;
 
-  /// Returns the paint.
-  Paint::ptr getPaint() const { return _paint; }
+  /// Returns the source.
+  Source::ptr getSource() const { return _source; }
 
-	/// Returns paint id.
-	uid getPaintId() const { return _paint->getId(); }
+	/// Returns source id.
+	uid getSourceId() const { return _source->getId(); }
 
   /// Returns the (output) shape.
   MShape::ptr getShape() const { return _shape; }
@@ -145,10 +145,10 @@ class Mapping : public Element
   virtual void toggleSolo()    { setSolo(!isSolo()); }
   virtual void toggleVisible() { setVisible(!isVisible()); }
 
-  virtual float getComputedOpacity() const { return getOpacity() * _paint->getOpacity(); }
+  virtual float getComputedOpacity() const { return getOpacity() * _source->getOpacity(); }
 
-  virtual void setPaint(Paint::ptr paint);
-	virtual void setPaintById(uid paintId);
+  virtual void setSource(Source::ptr source);
+	virtual void setSourceById(uid sourceId);
   virtual void setShape(MShape::ptr s) { _shape = s; }
   virtual void setInputShape(MShape::ptr s) { _inputShape = s; }
 
@@ -161,30 +161,30 @@ class Mapping : public Element
 };
 
 /**
- * Mapping of a Color paint into a shape.
+ * Mapping of a Color source into a shape.
  */
-class ColorMapping : public Mapping
+class ColorLayer : public Layer
 {
   Q_OBJECT
 public:
-  Q_INVOKABLE ColorMapping(int id=NULL_UID)
-    : Mapping(id) {}
+  Q_INVOKABLE ColorLayer(int id=NULL_UID)
+    : Layer(id) {}
 
-  ColorMapping(Paint::ptr paint, MShape::ptr shape,
+  ColorLayer(Source::ptr source, MShape::ptr shape,
                uid id=NULL_UID)
-    : Mapping(paint, shape, id) {}
+    : Layer(source, shape, id) {}
 
   // Return copy of this mapping.
-  virtual Mapping* clone() const {
+  virtual Layer* clone() const {
     MShape::ptr shape(_shape->clone());
-    return new ColorMapping(_paint, shape);
+    return new ColorLayer(_source, shape);
   }
 
   /// Returns true iff the mapping possesses an input (source) shape.
   virtual bool hasInputShape() const { return false; }
 
-	/// Returns true iff paint is compatible with mapping.
-	virtual bool paintIsCompatible(Paint::ptr paint) const;
+	/// Returns true iff source is compatible with mapping.
+	virtual bool sourceIsCompatible(Source::ptr source) const;
 
   virtual MShape::ShapeType getType() const {
     return getShape()->getType();
@@ -193,37 +193,37 @@ class ColorMapping : public Mapping
 };
 
 /**
- * Object whose paint is an image texture. In the case of a texture mapping we require
+ * Object whose source is an image texture. In the case of a texture mapping we require
  * an additional input shape to specify the area on the image where we pick the pixels.
  */
-class TextureMapping : public Mapping
+class TextureLayer : public Layer
 {
   Q_OBJECT
 public:
-  Q_INVOKABLE TextureMapping(int id=NULL_UID)
-    : Mapping(id) {}
+  Q_INVOKABLE TextureLayer(int id=NULL_UID)
+    : Layer(id) {}
 
-  TextureMapping(Paint::ptr paint,
+  TextureLayer(Source::ptr source,
                  MShape::ptr shape,
                  MShape::ptr inputShape, uid id=NULL_UID)
-    : Mapping(paint, shape, inputShape, id)
+    : Layer(source, shape, inputShape, id)
   {
     // Only supports shape of the same type (for now).
     Q_ASSERT(shape->getType() == inputShape->getType());
   }
 
   // Return copy of this mapping.
-  virtual Mapping* clone() const {
+  virtual Layer* clone() const {
     MShape::ptr shape(_shape->clone());
     MShape::ptr inputShape(_inputShape->clone());
-    return new TextureMapping(_paint, shape, inputShape);
+    return new TextureLayer(_source, shape, inputShape);
   }
 
   /// Returns true iff the mapping possesses an input (source) shape.
   virtual bool hasInputShape() const { return true; }
 
-	/// Returns true iff paint is compatible with mapping.
-	virtual bool paintIsCompatible(Paint::ptr paint) const;
+	/// Returns true iff source is compatible with mapping.
+	virtual bool sourceIsCompatible(Source::ptr source) const;
 
   virtual MShape::ShapeType getType() const {
     return getShape()->getType();
@@ -232,4 +232,4 @@ class TextureMapping : public Mapping
 
 }
 
-#endif /* MAPPING_H_ */
+#endif /* LAYER_H_ */
diff --git a/src/core/MappingManager.cpp b/src/core/MappingManager.cpp
index 2bb12855..6aa25118 100644
--- a/src/core/MappingManager.cpp
+++ b/src/core/MappingManager.cpp
@@ -29,82 +29,82 @@ MappingManager::MappingManager()
 
 }
 
-QMap<uid, Mapping::ptr> MappingManager::getPaintMappings(const Paint::ptr paint) const
+QMap<uid, Layer::ptr> MappingManager::getSourceLayers(const Source::ptr source) const
 {
-  QMap<uid, Mapping::ptr> paintMappings;
-  for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin(); it != mappingVector.end(); ++it)
+  QMap<uid, Layer::ptr> sourceLayers;
+  for (QVector<Layer::ptr>::const_iterator it = layerVector.begin(); it != layerVector.end(); ++it)
   {
-    if ((*it)->getPaint() == paint)
+    if ((*it)->getSource() == source)
     {
-      paintMappings[(*it)->getId()] = *it;
+      sourceLayers[(*it)->getId()] = *it;
     }
   }
-  return paintMappings;
+  return sourceLayers;
 }
 
 
-Paint::ptr MappingManager::getPaintByName(QString name)
+Source::ptr MappingManager::getSourceByName(QString name)
 {
-  return _getElementByName(paintVector, name);
+  return _getElementByName(sourceVector, name);
 }
 
-QVector<Paint::ptr> MappingManager::getPaintsByNameRegExp(QString namePattern)
+QVector<Source::ptr> MappingManager::getSourcesByNameRegExp(QString namePattern)
 {
-  return _getElementsByNameRegExp(paintVector, namePattern);
+  return _getElementsByNameRegExp(sourceVector, namePattern);
 }
 
-QVector<Paint::ptr> MappingManager::getPaintsCompatibleWith(Mapping::ptr mapping)
+QVector<Source::ptr> MappingManager::getSourcesCompatibleWith(Layer::ptr layer)
 {
-	QVector<Paint::ptr> paints;
-	for (QVector<Paint::ptr>::const_iterator it = paintVector.constBegin();
-	     it != paintVector.constEnd(); ++it)
-		if (mapping->paintIsCompatible(*it))
+	QVector<Source::ptr> paints;
+	for (QVector<Source::ptr>::const_iterator it = sourceVector.constBegin();
+	     it != sourceVector.constEnd(); ++it)
+		if (layer->sourceIsCompatible(*it))
 			paints.append(*it);
 	return paints;
 }
 
-Mapping::ptr MappingManager::getMappingByName(QString name)
+Layer::ptr MappingManager::getLayerByName(QString name)
 {
-  return _getElementByName(mappingVector, name);
+  return _getElementByName(layerVector, name);
 }
 
-QVector<Mapping::ptr> MappingManager::getMappingsByNameRegExp(QString namePattern)
+QVector<Layer::ptr> MappingManager::getLayersByNameRegExp(QString namePattern)
 {
-  return _getElementsByNameRegExp(mappingVector, namePattern);
+  return _getElementsByNameRegExp(layerVector, namePattern);
 }
 
-QMap<uid, Mapping::ptr> MappingManager::getPaintMappingsById(uid paintId) const
+QMap<uid, Layer::ptr> MappingManager::getSourceLayersById(uid sourceId) const
 {
-  return getPaintMappings(paintMap[paintId]);
+  return getSourceLayers(sourceMap[sourceId]);
 }
 
-uid MappingManager::addPaint(Paint::ptr paint)
+uid MappingManager::addSource(Source::ptr source)
 {
-  paintVector.push_back(paint);
-  paintMap[paint->getId()] = paint;
-  return paint->getId();
+  sourceVector.push_back(source);
+  sourceMap[source->getId()] = source;
+  return source->getId();
 }
 
-bool MappingManager::removePaint(uid paintId)
+bool MappingManager::removeSource(uid sourceId)
 {
-  // Make sure the paint to which this paint refers to exists in the manager.
-  Paint::ptr paint = getPaintById(paintId);
-  if (paint)
+  // Make sure the source to which this source refers to exists in the manager.
+  Source::ptr source = getSourceById(sourceId);
+  if (source)
   {
-    // Remove all mappings associated with paint.
-    QMap<uid, Mapping::ptr> paintMappings = getPaintMappings(paint);
-    for (QMap<uid, Mapping::ptr>::const_iterator it = paintMappings.constBegin();
-         it != paintMappings.constEnd(); ++it)
+    // Remove all mappings associated with source.
+    QMap<uid, Layer::ptr> sourceLayers = getSourceLayers(source);
+    for (QMap<uid, Layer::ptr>::const_iterator it = sourceLayers.constBegin();
+         it != sourceLayers.constEnd(); ++it)
     {
-      removeMapping(it.key());
+      removeLayer(it.key());
     }
 
-    // Remove paint.
-    int idx = paintVector.lastIndexOf(paint);
+    // Remove source.
+    int idx = sourceVector.lastIndexOf(source);
     Q_ASSERT(idx != -1);
-    paintVector.remove(idx);
-    paintMap.remove(paintId);
-    paint->~Paint(); // FIX ME: Explicit call of paint destructor in order add Camera more than once
+    sourceVector.remove(idx);
+    sourceMap.remove(sourceId);
+    source->~Source(); // FIX ME: Explicit call of source destructor in order add Camera more than once
     return true;
   }
   else
@@ -113,18 +113,18 @@ bool MappingManager::removePaint(uid paintId)
   }
 }
 
-bool MappingManager::replacePaintMappings(Paint::ptr oldpaint,
-        Paint::ptr newpaint)
+bool MappingManager::replaceSourceLayers(Source::ptr oldSource,
+        Source::ptr newSource)
 {
-  // Make sure the paint to which this paint refers to exists in the manager.
-  if (oldpaint && newpaint)
+  // Make sure the source to which this source refers to exists in the manager.
+  if (oldSource && newSource)
   {
-    QMap<uid, Mapping::ptr> paintMappings = getPaintMappings(oldpaint);
-    for (QMap<uid, Mapping::ptr>::const_iterator it = paintMappings.constBegin();
-         it != paintMappings.constEnd(); ++it)
+    QMap<uid, Layer::ptr> sourceLayers = getSourceLayers(oldSource);
+    for (QMap<uid, Layer::ptr>::const_iterator it = sourceLayers.constBegin();
+         it != sourceLayers.constEnd(); ++it)
     {
-      Mapping::ptr mapping = it.value();
-      mapping->setPaint(newpaint);
+      Layer::ptr layer = it.value();
+      layer->setSource(newSource);
     }
     return true;
   }
@@ -134,28 +134,28 @@ bool MappingManager::replacePaintMappings(Paint::ptr oldpaint,
   }
 }
 
-uid MappingManager::addMapping(Mapping::ptr mapping)
+uid MappingManager::addLayer(Layer::ptr layer)
 {
-  // Make sure the paint to which this mapping refers to exists in the manager.
-  Q_ASSERT ( paintVector.contains(mapping->getPaint()) );
+  // Make sure the source to which this mapping refers to exists in the manager.
+  Q_ASSERT ( sourceVector.contains(layer->getSource()) );
 
-  mappingVector.insert(0, mapping);
-  mappingMap[mapping->getId()] = mapping;
+  layerVector.insert(0, layer);
+  layerMap[layer->getId()] = layer;
 
-  return mapping->getId();
+  return layer->getId();
 }
 
-bool MappingManager::removeMapping(uid mappingId)
+bool MappingManager::removeLayer(uid mappingId)
 {
-  // Make sure the paint to which this mapping refers to exists in the manager.
-  Mapping::ptr mapping = getMappingById(mappingId);
-  if (mapping)
+  // Make sure the source to which this mapping refers to exists in the manager.
+  Layer::ptr layer = getLayerById(mappingId);
+  if (layer)
   {
-    int idx = mappingVector.lastIndexOf(mapping);
-    Q_ASSERT( idx != -1 ); // Q_ASSERT(mappingVector.contains(mapping));
-    mappingVector.remove(idx);
-    mappingMap.remove(mappingId);
-    updateMappingsDepths();
+    int idx = layerVector.lastIndexOf(layer);
+    Q_ASSERT( idx != -1 ); // Q_ASSERT(layerVector.contains(layer));
+    layerVector.remove(idx);
+    layerMap.remove(mappingId);
+    updateLayerDepths();
 
     return true;
   }
@@ -166,14 +166,14 @@ bool MappingManager::removeMapping(uid mappingId)
 }
 
 /// Moves a mapping of given uid by a certain number of steps up or down.
-bool MappingManager::moveMapping(uid mappingId, int toIndex)
+bool MappingManager::moveLayer(uid mappingId, int toIndex)
 {
-  // Make sure the paint to which this mapping refers to exists in the manager.
-  int idx = getMappingIndex(mappingId);
+  // Make sure the source to which this mapping refers to exists in the manager.
+  int idx = getLayerIndex(mappingId);
   if (idx >= 0)
   {
-    mappingVector.move(idx, toIndex);
-    updateMappingsDepths();
+    layerVector.move(idx, toIndex);
+    updateLayerDepths();
     return true;
   }
   else
@@ -182,14 +182,14 @@ bool MappingManager::moveMapping(uid mappingId, int toIndex)
   }
 }
 
-QVector<Mapping::ptr> MappingManager::getVisibleMappings() const
+QVector<Layer::ptr> MappingManager::getVisibleLayers() const
 {
-  QVector<Mapping::ptr> visible;
+  QVector<Layer::ptr> visible;
 
   // First pass: check if one of the mappings is in solo mode.
   bool hasSolo = false;
-  for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin();
-          it != mappingVector.end(); ++it)
+  for (QVector<Layer::ptr>::const_iterator it = layerVector.begin();
+          it != layerVector.end(); ++it)
   {
     if ((*it)->isSolo())
     {
@@ -199,8 +199,8 @@ QVector<Mapping::ptr> MappingManager::getVisibleMappings() const
   }
 
   // Second pass: fill the visible vector.
-  for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin();
-          it != mappingVector.end(); ++it)
+  for (QVector<Layer::ptr>::const_iterator it = layerVector.begin();
+          it != layerVector.end(); ++it)
   {
     // Solo has priority over invisible (mute)
     if ( (hasSolo && (*it)->isSolo()) ||
@@ -214,16 +214,16 @@ QVector<Mapping::ptr> MappingManager::getVisibleMappings() const
 }
 
 /// Returns true iff the mapping is visible.
-bool MappingManager::mappingIsVisible(Mapping::ptr mapping) const
+bool MappingManager::layerIsVisible(Layer::ptr layer) const
 {
   // Solo mappings are always visible.
-  if (mapping->isSolo())
+  if (layer->isSolo())
   {
     return true;
   }
 
   // Non-solo invisible mappings are always invisible.
-  else if (! mapping->isVisible())
+  else if (! layer->isVisible())
   {
     return false;
   }
@@ -232,8 +232,8 @@ bool MappingManager::mappingIsVisible(Mapping::ptr mapping) const
   // (which would thus make it invisible).
   else
   {
-    for (QVector<Mapping::ptr>::const_iterator it = mappingVector.begin();
-            it != mappingVector.end(); ++it)
+    for (QVector<Layer::ptr>::const_iterator it = layerVector.begin();
+            it != layerVector.end(); ++it)
     {
       if ((*it)->isSolo())
       {
@@ -247,63 +247,63 @@ bool MappingManager::mappingIsVisible(Mapping::ptr mapping) const
 }
 
 /// Returns the list of visible paints (ie. paints for which at least one mapping is visible).
-QVector<Paint::ptr> MappingManager::getVisiblePaints() const
+QVector<Source::ptr> MappingManager::getVisibleSources() const
 {
-  QVector<Paint::ptr> visiblePaints;
-  QVector<Mapping::ptr> visibleMappings = getVisibleMappings();
-  for (QVector<Mapping::ptr>::const_iterator it = visibleMappings.begin();
-          it != visibleMappings.end(); ++it)
+  QVector<Source::ptr> visibleSources;
+  QVector<Layer::ptr> visibleLayers = getVisibleLayers();
+  for (QVector<Layer::ptr>::const_iterator it = visibleLayers.begin();
+          it != visibleLayers.end(); ++it)
   {
-    Paint::ptr paint((*it)->getPaint());
-    if (!visiblePaints.contains(paint))
-      visiblePaints.push_back(paint);
+    Source::ptr source((*it)->getSource());
+    if (!visibleSources.contains(source))
+      visibleSources.push_back(source);
   }
-  return visiblePaints;
+  return visibleSources;
 }
 
-void MappingManager::reorderMappings(QVector<uid> mappingIds)
+void MappingManager::reorderLayers(QVector<uid> mappingIds)
 {
   // Both vector needs to have the same size.
-  Q_ASSERT( mappingIds.size() == mappingVector.size() );
-  mappingVector.clear();
+  Q_ASSERT( mappingIds.size() == layerVector.size() );
+  layerVector.clear();
   int depth = 0;
   for (QVector<uid>::iterator it = mappingIds.begin();
           it != mappingIds.end(); ++it)
   {
-    // Uid should be a key of the mappingMap.
-    Q_ASSERT( mappingMap.contains(*it) );
+    // Uid should be a key of the layerMap.
+    Q_ASSERT( layerMap.contains(*it) );
     // Makes sure the uids are not repeated.
-    Q_ASSERT( ! mappingVector.contains(mappingMap[*it]) );
+    Q_ASSERT( ! layerVector.contains(layerMap[*it]) );
     // Adds the mapping at the right place in the vector.
-    Mapping::ptr mapping = mappingMap[*it];
-    mapping->setDepth(depth);
-    mappingVector.push_back( mapping );
+    Layer::ptr layer = layerMap[*it];
+    layer->setDepth(depth);
+    layerVector.push_back( layer );
 
     depth++;
   }
 }
 
-void MappingManager::updateMappingsDepths()
+void MappingManager::updateLayerDepths()
 {
   int depth = 0;
-  for (QVector<Mapping::ptr>::iterator it = mappingVector.begin();
-          it != mappingVector.end(); ++it)
+  for (QVector<Layer::ptr>::iterator it = layerVector.begin();
+          it != layerVector.end(); ++it)
   {
     (*it)->setDepth(depth);
     depth++;
   }
 }
 
-//bool MappingManager::removeMapping(Mapping::ptr mapping)
+//bool MappingManager::removeLayer(Layer::ptr layer)
 //{
 //}
 
 void MappingManager::clearAll()
 {
-  paintVector.clear();
-  mappingVector.clear();
-  paintMap.clear();
-  mappingMap.clear();
+  sourceVector.clear();
+  layerVector.clear();
+  sourceMap.clear();
+  layerMap.clear();
 }
 
 }
diff --git a/src/core/MappingManager.h b/src/core/MappingManager.h
index c8ec6414..92f0a261 100644
--- a/src/core/MappingManager.h
+++ b/src/core/MappingManager.h
@@ -25,14 +25,14 @@
 #include <QMap>
 #include <QRegularExpression>
 
-#include "Paint.h"
-#include "Mapping.h"
+#include "Source.h"
+#include "Layer.h"
 
 namespace mmp {
 
 /**
- * This is a container class for all the paints and mappings ie. the main model object that allows
- * CRUD over paints and mappings.
+ * This is a container class for all the sources and mappings ie. the main model object that allows
+ * CRUD over sources and mappings.
  */
 class MappingManager
 {
@@ -42,106 +42,106 @@ class MappingManager
 
 private:
   // Model elements.
-  /// Container for all paints.
-  QVector<Paint::ptr> paintVector;
+  /// Container for all sources.
+  QVector<Source::ptr> sourceVector;
 
-  /// Maps from uids to paints.
-  QMap<uid, Paint::ptr> paintMap;
+  /// Maps from uids to sources.
+  QMap<uid, Source::ptr> sourceMap;
 
   /// Container for all mappings (ordered from bottom layer to top layer).
-  QVector<Mapping::ptr> mappingVector;
+  QVector<Layer::ptr> layerVector;
 
   /// Maps from uids to mappings.
-  QMap<uid, Mapping::ptr> mappingMap;
+  QMap<uid, Layer::ptr> layerMap;
 
 public:
-  /// Returns the list of mappings associated with given paint.
-  QMap<uid, Mapping::ptr> getPaintMappings(const Paint::ptr paint) const;
+  /// Returns the list of mappings associated with given source.
+  QMap<uid, Layer::ptr> getSourceLayers(const Source::ptr source) const;
 
-  /// Returns the list of mappings associated with given paint uid.
-  QMap<uid, Mapping::ptr> getPaintMappingsById(uid paintId) const;
+  /// Returns the list of mappings associated with given source uid.
+  QMap<uid, Layer::ptr> getSourceLayersById(uid sourceId) const;
 
-  /// Adds a paint and returns its uid.
-  uid addPaint(Paint::ptr paint);
+  /// Adds a source and returns its uid.
+  uid addSource(Source::ptr source);
 
-  /// Returns the uid of a paint.
-  uid getPaintId(Paint::ptr paint) const { return paintMap.key(paint); }
+  /// Returns the uid of a source.
+  uid getSourceId(Source::ptr source) const { return sourceMap.key(source); }
 
-  /// Returns indices of paint or (-1) if not found.
-  int getPaintIndex(Paint::ptr paint) const { return paintVector.lastIndexOf(paint); }
-  int getPaintIndex(uint paintId) const { return getPaintIndex(paintMap[paintId]); }
+  /// Returns indices of source or (-1) if not found.
+  int getSourceIndex(Source::ptr source) const { return sourceVector.lastIndexOf(source); }
+  int getSourceIndex(uint sourceId) const { return getSourceIndex(sourceMap[sourceId]); }
 
-  /// Removes a paint of given uid.
-  bool removePaint(uid paintId);
+  /// Removes a source of given uid.
+  bool removeSource(uid sourceId);
 
   /// DEPRECATED.
-  bool replacePaintMappings(Paint::ptr oldpaint, Paint::ptr newpaint);
+  bool replaceSourceLayers(Source::ptr oldSource, Source::ptr newSource);
 
-  /// Returns the number of paints.
-  int nPaints() const { return paintVector.size(); }
+  /// Returns the number of sources.
+  int nSources() const { return sourceVector.size(); }
 
-  /// Returns the i-th paint in the vector. Good for iterating over all paints.
-  Paint::ptr getPaint(int i) { return paintVector[i]; }
+  /// Returns the i-th source in the vector. Good for iterating over all sources.
+  Source::ptr getSource(int i) { return sourceVector[i]; }
 
-  /// Returns paint with given uid.
-  Paint::ptr getPaintById(uid id) { return paintMap[id]; }
+  /// Returns source with given uid.
+  Source::ptr getSourceById(uid id) { return sourceMap[id]; }
 
   /// Returns mapping with given name (first match).
-  Paint::ptr getPaintByName(QString name);
+  Source::ptr getSourceByName(QString name);
 
   /// Returns all mappings with given regexp.
-  QVector<Paint::ptr> getPaintsByNameRegExp(QString namePattern);
+  QVector<Source::ptr> getSourcesByNameRegExp(QString namePattern);
 
 	/// Get paints compatible with given mapping.
-	QVector<Paint::ptr> getPaintsCompatibleWith(Mapping::ptr mapping);
+	QVector<Source::ptr> getSourcesCompatibleWith(Layer::ptr mapping);
 
   /// Adds a mapping and returns its uid.
-  uid addMapping(Mapping::ptr mapping);
+  uid addLayer(Layer::ptr mapping);
 
   /// Removes a mapping of given uid.
-  bool removeMapping(uid mappingId);
+  bool removeLayer(uid mappingId);
 
   /// Moves a mapping of given uid by a certain number of steps up or down.
-  bool moveMapping(uid mappingId, int toIndex);
+  bool moveLayer(uid mappingId, int toIndex);
 
   /// Returns the number of mappings.
-  int nMappings() const { return mappingVector.size(); }
+  int nLayers() const { return layerVector.size(); }
 
   /**
    * Returns the i-th mapping in the vector. Good for iterating over all mappings. Vector is
    * ordered from bottom (deepest) to top (shallowest) layer.
    */
-  Mapping::ptr getMapping(int i) { return mappingVector[i]; }
+  Layer::ptr getLayer(int i) { return layerVector[i]; }
 
   /// Returns mapping with given uid.
-  Mapping::ptr getMappingById(uid id) const { return mappingMap[id]; }
+  Layer::ptr getLayerById(uid id) const { return layerMap[id]; }
 
   /// Returns mapping with given name (first match).
-  Mapping::ptr getMappingByName(QString name);
+  Layer::ptr getLayerByName(QString name);
 
   /// Returns all mappings with given regexp.
-  QVector<Mapping::ptr> getMappingsByNameRegExp(QString namePattern);
+  QVector<Layer::ptr> getLayersByNameRegExp(QString namePattern);
 
   /// Returns indices of mapping or (-1) if not found.
-  int getMappingIndex(Mapping::ptr mapping) const { return mappingVector.lastIndexOf(mapping); }
-  int getMappingIndex(uint mappingId) const { return getMappingIndex(getMappingById(mappingId)); }
+  int getLayerIndex(Layer::ptr mapping) const { return layerVector.lastIndexOf(mapping); }
+  int getLayerIndex(uint mappingId) const { return getLayerIndex(getLayerById(mappingId)); }
 
-  int getMappingDepth(Mapping::ptr mapping) const { return -getMappingIndex(mapping); }
+  int getLayerDepth(Layer::ptr mapping) const { return -getLayerIndex(mapping); }
 
   /// Reorders the mappings according to given list of uids. QVector needs to
-  void reorderMappings(QVector<uid> mappingIds);
+  void reorderLayers(QVector<uid> mappingIds);
 
   /// Update mapping depths after a move.
-  void updateMappingsDepths();
+  void updateLayerDepths();
 
   /// Returns the ordered list of visible mappings, using both the "visible" and "solo" properties.
-  QVector<Mapping::ptr> getVisibleMappings() const;
+  QVector<Layer::ptr> getVisibleLayers() const;
 
   /// Returns true iff the mapping is visible.
-  bool mappingIsVisible(Mapping::ptr mapping) const;
+  bool layerIsVisible(Layer::ptr mapping) const;
 
-  /// Returns the list of visible paints (ie. paints for which at least one mapping is visible).
-  QVector<Paint::ptr> getVisiblePaints() const;
+  /// Returns the list of visible sources (ie. paints for which at least one mapping is visible).
+  QVector<Source::ptr> getVisibleSources() const;
 
   void clearAll();
 
diff --git a/src/core/MetaObjectRegistry.h b/src/core/MetaObjectRegistry.h
index 51d13515..82bbeddc 100644
--- a/src/core/MetaObjectRegistry.h
+++ b/src/core/MetaObjectRegistry.h
@@ -47,6 +47,11 @@ class MetaObjectRegistry {
     }
   }
 
+  void addAlias(const QString& aliasClassName, const QMetaObject* metaObj)
+  {
+    metaObjectLookup[aliasClassName] = metaObj;
+  }
+
   const QMetaObject* getMetaObject(QString className) const;
 
   static MetaObjectRegistry& instance();
diff --git a/src/core/ProjectReader.cpp b/src/core/ProjectReader.cpp
index d7810501..1b2a53a6 100644
--- a/src/core/ProjectReader.cpp
+++ b/src/core/ProjectReader.cpp
@@ -73,31 +73,31 @@ void ProjectReader::parseProject(const QJsonObject& project)
   QJsonArray sources = project[ProjectLabels::SOURCES].toArray();
   QJsonArray layers  = project[ProjectLabels::LAYERS].toArray();
 
-  // Parse sources (formerly paints).
+  // Parse sources (formerly sources).
   for (const auto& val : sources)
   {
-    Paint::ptr paint = parsePaint(val.toObject());
+    Source::ptr source = parseSource(val.toObject());
 
-    if (paint.isNull())
+    if (source.isNull())
     {
       qDebug() << "Problem creating source." << Qt::endl;
     }
     else
     {
-      manager.addPaint(paint);
-      _window->addPaintItem(paint->getId(), paint->getIcon(), paint->getName());
+      manager.addSource(source);
+      _window->addSourceItem(source->getId(), source->getIcon(), source->getName());
 
       // Locate media file if not found
-      if (paint->getSourceType() == Paint::SourceType::Video)
+      if (source->getSourceType() == Source::SourceType::Video)
       {
-        QSharedPointer<Video> media = qSharedPointerCast<Video>(paint);
+        QSharedPointer<Video> media = qSharedPointerCast<Video>(source);
         Q_CHECK_PTR(media);
         if (!_window->fileExists(media->getUri()))
           media->setUri(_window->locateMediaFile(media->getUri(), false));
       }
-      if (paint->getSourceType() == Paint::SourceType::Image)
+      if (source->getSourceType() == Source::SourceType::Image)
       {
-        QSharedPointer<Image> image = qSharedPointerCast<Image>(paint);
+        QSharedPointer<Image> image = qSharedPointerCast<Image>(source);
         Q_CHECK_PTR(image);
         if (!_window->fileExists(image->getUri()))
           image->setUri(_window->locateMediaFile(image->getUri(), true));
@@ -106,30 +106,30 @@ void ProjectReader::parseProject(const QJsonObject& project)
   }
 
   // Parse layers (formerly mappings).
-  QVector<Mapping::ptr> allMappings;
+  QVector<Layer::ptr> allLayers;
   for (const auto& val : layers)
   {
-    Mapping::ptr mapping = parseMapping(val.toObject());
-    if (mapping.isNull())
+    Layer::ptr layer = parseLayer(val.toObject());
+    if (layer.isNull())
     {
       qDebug() << "Problem creating layer." << Qt::endl;
     }
     else
     {
-      allMappings.push_back(mapping);
+      allLayers.push_back(layer);
     }
   }
 
   // Add all mappings in reverse order.
-  for (QVector<Mapping::ptr>::const_reverse_iterator it = allMappings.rbegin();
-          it != allMappings.rend(); ++it)
+  for (QVector<Layer::ptr>::const_reverse_iterator it = allLayers.rbegin();
+          it != allLayers.rend(); ++it)
   {
-    manager.addMapping(*it);
-    _window->addMappingItem((*it)->getId());
+    manager.addLayer(*it);
+    _window->addLayerItem((*it)->getId());
   }
 }
 
-Paint::ptr ProjectReader::parsePaint(const QJsonObject& obj)
+Source::ptr ProjectReader::parseSource(const QJsonObject& obj)
 {
   QString className = Serializable::classNameCleanToReal(obj[ProjectLabels::CLASS_NAME].toString());
   int id            = obj[ProjectLabels::ID].toInt(NULL_UID);
@@ -139,27 +139,27 @@ Paint::ptr ProjectReader::parsePaint(const QJsonObject& obj)
   const QMetaObject* metaObject = MetaObjectRegistry::instance().getMetaObject(className);
   if (metaObject)
   {
-    Paint::ptr paint(qobject_cast<Paint*>(metaObject->newInstance(Q_ARG(int, id))));
+    Source::ptr source(qobject_cast<Source*>(metaObject->newInstance(Q_ARG(int, id))));
 
-    if (paint.isNull())
+    if (source.isNull())
     {
       qDebug() << QObject::tr("Problem at creation of source.") << Qt::endl;
     }
     else
-      qDebug() << "Created new instance with id: " << paint->getId();
+      qDebug() << "Created new instance with id: " << source->getId();
 
-    paint->read(obj);
+    source->read(obj);
 
-    return paint;
+    return source;
   }
   else
   {
     _errorString = QObject::tr("Unable to create source of type '%1'.").arg(className);
-    return Paint::ptr();
+    return Source::ptr();
   }
 }
 
-Mapping::ptr ProjectReader::parseMapping(const QJsonObject& obj)
+Layer::ptr ProjectReader::parseLayer(const QJsonObject& obj)
 {
   QString className = Serializable::classNameCleanToReal(obj[ProjectLabels::CLASS_NAME].toString());
   int id            = obj[ProjectLabels::ID].toInt(NULL_UID);
@@ -167,20 +167,20 @@ Mapping::ptr ProjectReader::parseMapping(const QJsonObject& obj)
   const QMetaObject* metaObject = MetaObjectRegistry::instance().getMetaObject(className);
   if (metaObject)
   {
-    Mapping::ptr mapping(qobject_cast<Mapping*>(metaObject->newInstance(Q_ARG(int, id))));
-    if (mapping.isNull())
+    Layer::ptr layer(qobject_cast<Layer*>(metaObject->newInstance(Q_ARG(int, id))));
+    if (layer.isNull())
     {
       qDebug() << QObject::tr("Problem at creation of layer.") << Qt::endl;
     }
 
-    mapping->read(obj);
+    layer->read(obj);
 
-    return mapping;
+    return layer;
   }
   else
   {
     _errorString = QObject::tr("Unable to create layer of type '%1'.").arg(className);
-    return Mapping::ptr();
+    return Layer::ptr();
   }
 }
 
diff --git a/src/core/ProjectReader.h b/src/core/ProjectReader.h
index 7aa40757..a3107a2c 100644
--- a/src/core/ProjectReader.h
+++ b/src/core/ProjectReader.h
@@ -23,8 +23,8 @@
 #include <QJsonArray>
 #include <QJsonParseError>
 #include "MainWindow.h"
-#include "Mapping.h"
-#include "Paint.h"
+#include "Layer.h"
+#include "Source.h"
 
 #include "MetaObjectRegistry.h"
 #include "ProjectLabels.h"
@@ -40,8 +40,8 @@ class ProjectReader
 
 private:
     void parseProject(const QJsonObject& project);
-    Paint::ptr   parsePaint(const QJsonObject& obj);
-    Mapping::ptr parseMapping(const QJsonObject& obj);
+    Source::ptr   parseSource(const QJsonObject& obj);
+    Layer::ptr parseLayer(const QJsonObject& obj);
     /**
      * Checks if the version attribute of the project tag matches the regex of supported versions of MapMap.
      * Some older versions of MapMap might not be supported by this version.
diff --git a/src/core/ProjectWriter.cpp b/src/core/ProjectWriter.cpp
index 6eef7a1d..7917fb73 100644
--- a/src/core/ProjectWriter.cpp
+++ b/src/core/ProjectWriter.cpp
@@ -34,20 +34,20 @@ bool ProjectWriter::writeFile(QIODevice *device)
 
   // Sources (formerly paints).
   QJsonArray sources;
-  for (int i=0; i<manager.nPaints(); i++)
+  for (int i=0; i<manager.nSources(); i++)
   {
     QJsonObject source;
-    manager.getPaint(i)->write(source);
+    manager.getSource(i)->write(source);
     sources.append(source);
   }
   project[ProjectLabels::SOURCES] = sources;
 
   // Layers (formerly mappings).
   QJsonArray layers;
-  for (int i=0; i<manager.nMappings(); i++)
+  for (int i=0; i<manager.nLayers(); i++)
   {
     QJsonObject layer;
-    manager.getMapping(i)->write(layer);
+    manager.getLayer(i)->write(layer);
     layers.append(layer);
   }
   project[ProjectLabels::LAYERS] = layers;
diff --git a/src/core/ProjectWriter.h b/src/core/ProjectWriter.h
index af88fa76..b1748a17 100644
--- a/src/core/ProjectWriter.h
+++ b/src/core/ProjectWriter.h
@@ -24,8 +24,8 @@
 #include <QJsonObject>
 #include <QJsonArray>
 #include "MappingManager.h"
-#include "Mapping.h"
-#include "Paint.h"
+#include "Layer.h"
+#include "Source.h"
 #include "MainWindow.h"
 
 #include "ProjectLabels.h"
diff --git a/src/core/Paint.cpp b/src/core/Source.cpp
similarity index 98%
rename from src/core/Paint.cpp
rename to src/core/Source.cpp
index 4ad04313..315f9911 100644
--- a/src/core/Paint.cpp
+++ b/src/core/Source.cpp
@@ -1,5 +1,5 @@
 /*
- * Paint.cpp
+ * Source.cpp
  *
  * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
  * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Paint.h"
+#include "Source.h"
 #include "VideoImpl.h"
 #include "VideoPlayerImpl.h"
 #include "CameraImpl.h"
@@ -30,7 +30,7 @@
 
 namespace mmp {
 
-UidAllocator Paint::allocator;
+UidAllocator Source::allocator;
 
 void Texture::update()
 {
@@ -42,7 +42,7 @@ void Texture::update()
 
 void Texture::read(const QJsonObject& obj)
 {
-  Paint::read(obj);
+  Source::read(obj);
   if (obj.contains("x"))
     setX(obj["x"].toDouble());
   if (obj.contains("y"))
@@ -51,18 +51,18 @@ void Texture::read(const QJsonObject& obj)
 
 void Texture::write(QJsonObject& obj)
 {
-  Paint::write(obj);
+  Source::write(obj);
   obj["x"] = getX();
   obj["y"] = getY();
 }
 
-Paint::Paint(uid id)
+Source::Source(uid id)
   : Element(id, &allocator),
     _isPlaying(false)
 {
 }
 
-Paint::~Paint()
+Source::~Source()
 {
   allocator.free(getId());
 }
diff --git a/src/core/Paint.h b/src/core/Source.h
similarity index 89%
rename from src/core/Paint.h
rename to src/core/Source.h
index 60531033..50a60ca0 100644
--- a/src/core/Paint.h
+++ b/src/core/Source.h
@@ -1,5 +1,5 @@
 /*
- * Paint.h
+ * Source.h
  *
  * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
  * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef PAINT_H_
-#define PAINT_H_
+#ifndef SOURCE_H_
+#define SOURCE_H_
 
 #include <QtGlobal>
 
@@ -49,13 +49,13 @@ typedef enum {
 } VideoType;
 
 /**
- * A Paint is a style that can be applied when drawing potentially any shape.
+ * A Source is a style that can be applied when drawing potentially any shape.
  *
  * Defines the way to draw any shape.
- * There must be a MappingGui that implements this paint for every shape
+ * There must be a MappingGui that implements this source for every shape
  * so that this shape might be drawn with it.
  */
-class Paint : public Element
+class Source : public Element
 {
   Q_OBJECT
 
@@ -65,7 +65,7 @@ class Paint : public Element
   uid _id;
 
 protected:
-  Paint(uid id=NULL_UID);
+  Source(uid id=NULL_UID);
 
 public:
 
@@ -73,16 +73,16 @@ class Paint : public Element
     Video, Image, Color
   };
 
-  typedef QSharedPointer<Paint> ptr;
+  typedef QSharedPointer<Source> ptr;
 
-  virtual ~Paint();
+  virtual ~Source();
 
   static const UidAllocator& getUidAllocator() { return allocator; }
 
   /// This method should be called at each call of draw().
   virtual void update() {}
 
-  /// Is the paint currently playing?
+  /// Is the source currently playing?
   virtual bool isPlaying() const { return _isPlaying; }
 
   /// Starts playback.
@@ -116,7 +116,7 @@ class Paint : public Element
   bool _isPlaying;
 };
 
-class Color : public Paint
+class Color : public Source
 {
   Q_OBJECT
 
@@ -126,8 +126,8 @@ class Color : public Paint
   QColor color;
 
 public:
-  Q_INVOKABLE Color(int id=NULL_UID) : Paint(id) {}
-  Color(const QColor& color_, uid id=NULL_UID) : Paint(id), color(color_) {}
+  Q_INVOKABLE Color(int id=NULL_UID) : Source(id) {}
+  Color(const QColor& color_, uid id=NULL_UID) : Source(id), color(color_) {}
 
   QColor getColor() const { return color; }
   void setColor(const QColor& color_) { color = color_; }
@@ -142,11 +142,11 @@ class Color : public Paint
 };
 
 /**
- * Paint that uses an OpenGL texture to paint on potentially any MappingGui.
+ * Source that uses an OpenGL texture to render on potentially any MappingGui.
  *
  * This video texture is actually an OpenGL texture.
  */
-class Texture : public Paint
+class Texture : public Source
 {
   Q_OBJECT
 
@@ -160,7 +160,7 @@ class Texture : public Paint
   mutable bool bitsChanged;
 
   Texture(uid id=NULL_UID) :
-    Paint(id),
+    Source(id),
     textureId(0),
     x(0),
     y(0)
@@ -219,11 +219,11 @@ class Texture : public Paint
 
 protected:
   // Lists QProperties that should NOT be parsed automatically.
-  virtual QList<QString> _propertiesSpecial() const { return Paint::_propertiesSpecial() << "x" << "y"; }
+  virtual QList<QString> _propertiesSpecial() const { return Source::_propertiesSpecial() << "x" << "y"; }
 };
 
 /**
- * Paint that is a Texture loaded from an image file.
+ * Source that is a Texture loaded from an image file.
  */
 class Image : public Texture
 {
@@ -292,7 +292,7 @@ class Image : public Texture
 class VideoImpl; // forward declaration
 
 /**
- * Paint that is a Texture retrieved via a video file.
+ * Source that is a Texture retrieved via a video file.
  */
 class Video : public Texture
 {
@@ -375,4 +375,4 @@ class Video : public Texture
 
 }
 
-#endif /* PAINT_H_ */
+#endif /* SOURCE_H_ */
diff --git a/src/core/Util.h b/src/core/Util.h
index 6fd29ab5..651b617a 100644
--- a/src/core/Util.h
+++ b/src/core/Util.h
@@ -29,7 +29,7 @@
 #include "Shapes.h"
 
 #include "MM.h"
-#include "Paint.h"
+#include "Source.h"
 #include <QString>
 
 namespace mmp {
diff --git a/src/core/core.pri b/src/core/core.pri
index eecfdddc..8dd8355e 100644
--- a/src/core/core.pri
+++ b/src/core/core.pri
@@ -5,12 +5,12 @@ HEADERS += $$PWD/Commands.h \
     $$PWD/CameraImpl.h \
     $$PWD/CameraSurface.h \
     $$PWD/Element.h \
-    $$PWD/Mapping.h \
+    $$PWD/Layer.h \
     $$PWD/MappingManager.h \
     $$PWD/Maths.h \
     $$PWD/MetaObjectRegistry.h \
     $$PWD/MM.h \
-    $$PWD/Paint.h \
+    $$PWD/Source.h \
     $$PWD/ProjectLabels.h \
     $$PWD/ProjectReader.h \
     $$PWD/ProjectWriter.h \
@@ -24,11 +24,11 @@ SOURCES += $$PWD/Commands.cpp \
     $$PWD/CameraImpl.cpp \
     $$PWD/CameraSurface.cpp \
     $$PWD/Element.cpp \
-    $$PWD/Mapping.cpp \
+    $$PWD/Layer.cpp \
     $$PWD/MappingManager.cpp \
     $$PWD/MetaObjectRegistry.cpp \
     $$PWD/MM.cpp \
-    $$PWD/Paint.cpp \
+    $$PWD/Source.cpp \
     $$PWD/ProjectLabels.cpp \
     $$PWD/ProjectReader.cpp \
     $$PWD/ProjectWriter.cpp \
diff --git a/src/gui/MappingGui.cpp b/src/gui/LayerGui.cpp
similarity index 65%
rename from src/gui/MappingGui.cpp
rename to src/gui/LayerGui.cpp
index 249fb566..5f5f2d38 100644
--- a/src/gui/MappingGui.cpp
+++ b/src/gui/LayerGui.cpp
@@ -1,5 +1,5 @@
 /*
- * MappingGui.cpp
+ * LayerGui.cpp
  *
  * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
  * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net
@@ -18,17 +18,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "MappingGui.h"
+#include "LayerGui.h"
 #include "MainWindow.h"
 
 namespace mmp {
 
-MappingGui::MappingGui(Mapping::ptr mapping)
-  : _mapping(mapping),
+LayerGui::LayerGui(Layer::ptr layer)
+  : _layer(layer),
     _graphicsItem(NULL),
     _inputGraphicsItem(NULL)
 {
-  outputShape = mapping->getShape();
+  outputShape = layer->getShape();
   Q_CHECK_PTR(outputShape);
 
   // Create editor.
@@ -38,12 +38,12 @@ MappingGui::MappingGui(Mapping::ptr mapping)
 
   _propertyBrowser->setFactoryForManager(_variantManager, _variantFactory);
 
-  _paintEnumManager = new QtEnumPropertyManager(this);
+  _sourceEnumManager = new QtEnumPropertyManager(this);
 
   // Mapping UID.
   _idItem = _variantManager->addProperty(QVariant::Int, QObject::tr("ID"));
   _idItem->setEnabled(false);
-  _idItem->setValue(_mapping->getId());
+  _idItem->setValue(_layer->getId());
   _propertyBrowser->addProperty(_idItem);
 
   // Mapping basic properties.
@@ -51,18 +51,18 @@ MappingGui::MappingGui(Mapping::ptr mapping)
   _opacityItem->setAttribute("minimum", 0.0);
   _opacityItem->setAttribute("maximum", 100.0);
   _opacityItem->setAttribute("decimals", 1);
-  _opacityItem->setValue(_mapping->getOpacity()*100.0);
+  _opacityItem->setValue(_layer->getOpacity()*100.0);
   _propertyBrowser->addProperty(_opacityItem);
 
-  _paintItem = _variantManager->addProperty(QtVariantPropertyManager::enumTypeId(), "Source");
-  _propertyBrowser->addProperty(_paintItem);
-  updatePaints();
+  _sourceItem = _variantManager->addProperty(QtVariantPropertyManager::enumTypeId(), "Source");
+  _propertyBrowser->addProperty(_sourceItem);
+  updateSources();
 
   // Output shape.
   _outputItem = _variantManager->addProperty(QtVariantPropertyManager::groupTypeId(),
                                              QObject::tr("Output shape"));
 
-  _buildShapeProperty(_outputItem, mapping->getShape().data());
+  _buildShapeProperty(_outputItem, layer->getShape().data());
   _propertyBrowser->addProperty(_outputItem);
 
   // Collapse output shape.
@@ -74,25 +74,25 @@ MappingGui::MappingGui(Mapping::ptr mapping)
 }
 
 
-void MappingGui::setValue(QtProperty* property, const QVariant& value)
+void LayerGui::setValue(QtProperty* property, const QVariant& value)
 {
   if (property == _opacityItem)
   {
     double opacity = qBound(value.toDouble() / 100.0, 0.0, 1.0);
-    if (opacity != _mapping->getOpacity())
+    if (opacity != _layer->getOpacity())
     {
-      _mapping->setOpacity(opacity);
+      _layer->setOpacity(opacity);
       emit valueChanged();
     }
   }
-  else if (property == _paintItem)
+  else if (property == _sourceItem)
   {
-    int paintIndex = value.toInt();
-    Paint::ptr newPaint = MainWindow::window()->getMappingManager().getPaint(paintIndex);
-    if (newPaint != _mapping->getPaint() && _mapping->paintIsCompatible(newPaint)) {
-      _mapping->setPaint(newPaint);
+    int sourceIndex = value.toInt();
+    Source::ptr newSource = MainWindow::window()->getMappingManager().getSource(sourceIndex);
+    if (newSource != _layer->getSource() && _layer->sourceIsCompatible(newSource)) {
+      _layer->setSource(newSource);
       emit valueChanged();
-      emit paintChanged();
+      emit sourceChanged();
     }
   }
   else
@@ -112,37 +112,37 @@ void MappingGui::setValue(QtProperty* property, const QVariant& value)
   }
 }
 
-void MappingGui::setValue(QString propertyName, QVariant value)
+void LayerGui::setValue(QString propertyName, QVariant value)
 {
   if (propertyName == "opacity")
     _opacityItem->setValue(value.toDouble() * 100);
 }
 
-void MappingGui::updateShape(MShape* shape)
+void LayerGui::updateShape(MShape* shape)
 {
-  if (shape == _mapping->getShape().data())
+  if (shape == _layer->getShape().data())
   {
     _updateShapeProperty(_outputItem, shape);
   }
 }
 
-void MappingGui::updatePaints()
+void LayerGui::updateSources()
 {
-	int currentPaint = -1;
+	int currentSource = -1;
 	MappingManager& manager = MainWindow::window()->getMappingManager();
-	QStringList paintList;
-	QVector<Paint::ptr> paints = manager.getPaintsCompatibleWith(_mapping);
-	for (int i=0; i<paints.size(); i++)
+	QStringList sourceList;
+	QVector<Source::ptr> sources = manager.getSourcesCompatibleWith(_layer);
+	for (int i=0; i<sources.size(); i++)
 	{
-		paintList.append(paints[i]->getName());
-		if (paints[i] == _mapping->getPaint())
-			currentPaint = i;
+		sourceList.append(sources[i]->getName());
+		if (sources[i] == _layer->getSource())
+			currentSource = i;
 	}
-	_paintItem->setAttribute("enumNames", paintList);
-	_paintItem->setValue(currentPaint);
+	_sourceItem->setAttribute("enumNames", sourceList);
+	_sourceItem->setValue(currentSource);
 }
 
-void MappingGui::_buildShapeProperty(QtProperty* shapeItem, MShape* shape)
+void LayerGui::_buildShapeProperty(QtProperty* shapeItem, MShape* shape)
 {
   for (int i=0; i<shape->nVertices(); i++)
   {
@@ -159,7 +159,7 @@ void MappingGui::_buildShapeProperty(QtProperty* shapeItem, MShape* shape)
 
 }
 
-void MappingGui::_updateShapeProperty(QtProperty* shapeItem, MShape* shape)
+void LayerGui::_updateShapeProperty(QtProperty* shapeItem, MShape* shape)
 {
   QList<QtProperty*> pointItems = shapeItem->subProperties();
   for (int i=0; i<shape->nVertices(); i++)
@@ -174,35 +174,35 @@ void MappingGui::_updateShapeProperty(QtProperty* shapeItem, MShape* shape)
   }
 }
 
-ColorMappingGui::ColorMappingGui(Mapping::ptr mapping)
-  : MappingGui(mapping)
+ColorLayerGui::ColorLayerGui(Layer::ptr layer)
+  : LayerGui(layer)
 {
-  color = qSharedPointerCast<Color>(_mapping->getPaint());
+  color = qSharedPointerCast<Color>(_layer->getSource());
   Q_CHECK_PTR(color);
 }
 
-PolygonColorMappingGui::PolygonColorMappingGui(Mapping::ptr mapping) : ColorMappingGui(mapping) {
-  _graphicsItem.reset(new PolygonColorGraphicsItem(mapping, true));
+PolygonColorLayerGui::PolygonColorLayerGui(Layer::ptr layer) : ColorLayerGui(layer) {
+  _graphicsItem.reset(new PolygonColorGraphicsItem(_layer, true));
 }
 
-MeshColorMappingGui::MeshColorMappingGui(Mapping::ptr mapping)
-  : PolygonColorMappingGui(mapping)
+MeshColorLayerGui::MeshColorLayerGui(Layer::ptr layer)
+  : PolygonColorLayerGui(layer)
 {
-  _graphicsItem.reset(new MeshColorGraphicsItem(_mapping, true));
+  _graphicsItem.reset(new MeshColorGraphicsItem(_layer, true));
 
   // Add mesh sub property.
-  QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_mapping->getShape());
+  QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_layer->getShape());
   _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Mesh Subdivisions"));
   _meshItem->setValue(QSize(mesh->nColumns(), mesh->nRows()));
   _meshItem->setAttribute("minimum", QSize(2,2));
-  _propertyBrowser->insertProperty(_meshItem, _paintItem); // insert at the beginning
+  _propertyBrowser->insertProperty(_meshItem, _sourceItem); // insert at the beginning
 }
 
-void MeshColorMappingGui::setValue(QtProperty* property, const QVariant& value)
+void MeshColorLayerGui::setValue(QtProperty* property, const QVariant& value)
 {
   if (property == _meshItem)
   {
-    QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_mapping->getShape());
+    QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_layer->getShape());
     QSize size = (static_cast<QtVariantProperty*>(property))->value().toSize();
     if (mesh->nColumns() != size.width() || mesh->nRows() != size.height())
     {
@@ -217,23 +217,23 @@ void MeshColorMappingGui::setValue(QtProperty* property, const QVariant& value)
     }
   }
   else
-    PolygonColorMappingGui::setValue(property, value);
+    PolygonColorLayerGui::setValue(property, value);
 }
 
-EllipseColorMappingGui::EllipseColorMappingGui(Mapping::ptr mapping) : ColorMappingGui(mapping) {
-    _graphicsItem.reset(new EllipseColorGraphicsItem(mapping, true));
+EllipseColorLayerGui::EllipseColorLayerGui(Layer::ptr layer) : ColorLayerGui(layer) {
+    _graphicsItem.reset(new EllipseColorGraphicsItem(_layer, true));
 }
 
-//MeshColorMappingGui::MeshColorMappingGui(Mapping::ptr mapping)
-//  : ColorMappingGui(mapping) {
+//MeshColorLayerGui::MeshColorLayerGui(Layer::ptr layer)
+//  : ColorLayerGui(layer) {
 //  // Add mesh sub property.
-//  Mesh* mesh = (Mesh*)mapping->getShape().get();
+//  Mesh* mesh = (Mesh*)layer->getShape().get();
 //  _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Mesh Subdivisions"));
 //  _meshItem->setValue(QSize(mesh->nColumns(), mesh->nRows()));
 //  _topItem->insertSubProperty(_meshItem, 0); // insert at the beginning
 //}
 //
-//void MeshColorMappingGui::draw(QPainter* painter)
+//void MeshColorLayerGui::draw(QPainter* painter)
 //{
 //  painter->setPen(Qt::NoPen);
 //  painter->setBrush(color->getColor());
@@ -250,17 +250,17 @@ EllipseColorMappingGui::EllipseColorMappingGui(Mapping::ptr mapping) : ColorMapp
 //  }
 //}
 //
-//void MeshColorMappingGui::drawControls(QPainter* painter, const QList<int>* selectedVertices)
+//void MeshColorLayerGui::drawControls(QPainter* painter, const QList<int>* selectedVertices)
 //{
 //  QSharedPointer<Mesh> outputMesh = qSharedPointerCast<Mesh>(outputShape);
 //  Util::drawControlsMesh(painter, selectedVertices, *outputMesh);
 //}
 //
-//void MeshColorMappingGui::setValue(QtProperty* property, const QVariant& value)
+//void MeshColorLayerGui::setValue(QtProperty* property, const QVariant& value)
 //{
 //  if (property == _meshItem)
 //  {
-//    Mesh* outputMesh = static_cast<Mesh*>(_mapping->getShape().get());
+//    Mesh* outputMesh = static_cast<Mesh*>(_layer->getShape().get());
 //    QSize size = (static_cast<QtVariantProperty*>(property))->value().toSize();
 //    if (outputMesh->nColumns() != size.width() || outputMesh->nRows() != size.height())
 //    {
@@ -270,31 +270,31 @@ EllipseColorMappingGui::EllipseColorMappingGui(Mapping::ptr mapping) : ColorMapp
 //    }
 //  }
 //  else
-//    ColorMappingGui::setValue(property, value);
+//    ColorLayerGui::setValue(property, value);
 //}
 
-TextureMappingGui::TextureMappingGui(QSharedPointer<TextureMapping> mapping)
-  : MappingGui(mapping),
+TextureLayerGui::TextureLayerGui(QSharedPointer<TextureLayer> mapping)
+  : LayerGui(mapping),
     _meshItem(NULL)
 {
   // Assign members pointers.
-  textureMapping = qSharedPointerCast<TextureMapping>(_mapping);
-  Q_CHECK_PTR(textureMapping);
+  textureLayer = qSharedPointerCast<TextureLayer>(_layer);
+  Q_CHECK_PTR(textureLayer);
 
-  inputShape = textureMapping.toStrongRef()->getInputShape();
+  inputShape = textureLayer.toStrongRef()->getInputShape();
   Q_CHECK_PTR(inputShape);
 
   // Input shape.
   _inputItem = _variantManager->addProperty(QtVariantPropertyManager::groupTypeId(),
                                             QObject::tr("Input shape"));
   _buildShapeProperty(_inputItem, inputShape.toStrongRef().data());
-  _propertyBrowser->insertProperty(_inputItem, _paintItem); // insert
+  _propertyBrowser->insertProperty(_inputItem, _sourceItem); // insert
 
   // Collapse input shape.
   _propertyBrowser->setExpanded(_propertyBrowser->items(_inputItem).at(0), false);
 }
 //
-//void TextureMappingGui::drawInput(QPainter* painter)
+//void TextureLayerGui::drawInput(QPainter* painter)
 //{
 //  // Prepare drawing.
 //  _preDraw(painter);
@@ -320,16 +320,16 @@ TextureMappingGui::TextureMappingGui(QSharedPointer<TextureMapping> mapping)
 //  _postDraw(painter);
 //}
 
-void TextureMappingGui::updateShape(MShape* shape)
+void TextureLayerGui::updateShape(MShape* shape)
 {
-  QSharedPointer<TextureMapping> textureMapping = qSharedPointerCast<TextureMapping>(_mapping);
-  Q_CHECK_PTR(textureMapping);
+  QSharedPointer<TextureLayer> textureLayer = qSharedPointerCast<TextureLayer>(_layer);
+  Q_CHECK_PTR(textureLayer);
 
-  QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(textureMapping->getPaint());
+  QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(textureLayer->getSource());
   Q_CHECK_PTR(texture);
 
-  MShape* inputShape  = textureMapping->getInputShape().data();
-  MShape* outputShape = textureMapping->getShape().data();
+  MShape* inputShape  = textureLayer->getInputShape().data();
+  MShape* outputShape = textureLayer->getShape().data();
   if (shape == inputShape)
   {
     _updateShapeProperty(_inputItem, inputShape);
@@ -342,7 +342,7 @@ void TextureMappingGui::updateShape(MShape* shape)
 }
 
 //
-//void TextureMappingGui::_preDraw(QPainter* painter)
+//void TextureLayerGui::_preDraw(QPainter* painter)
 //{
 //  painter->beginNativePainting();
 //
@@ -373,33 +373,33 @@ void TextureMappingGui::updateShape(MShape* shape)
 //  glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 //}
 //
-//void TextureMappingGui::_postDraw(QPainter* painter)
+//void TextureLayerGui::_postDraw(QPainter* painter)
 //{
 //  glDisable(GL_TEXTURE_2D);
 //
 //  painter->endNativePainting();
 //}
 //
-//void PolygonTextureMappingGui::drawControls(QPainter* painter, const QList<int>* selectedVertices)
+//void PolygonTextureLayerGui::drawControls(QPainter* painter, const QList<int>* selectedVertices)
 //{
 //  QSharedPointer<Polygon> outputPoly = qSharedPointerCast<Polygon>(outputShape);
 //  Util::drawControlsPolygon(painter, selectedVertices, *outputPoly);
 //}
 //
-//void PolygonTextureMappingGui::drawInputControls(QPainter* painter, const QList<int>* selectedVertices)
+//void PolygonTextureLayerGui::drawInputControls(QPainter* painter, const QList<int>* selectedVertices)
 //{
 //  QSharedPointer<Polygon> inputPoly = qSharedPointerCast<Polygon>(inputShape);
 //  Util::drawControlsPolygon(painter, selectedVertices, *inputPoly);
 //}
 
-TriangleTextureMappingGui::TriangleTextureMappingGui(QSharedPointer<TextureMapping> mapping)
-  : PolygonTextureMappingGui(mapping)
+TriangleTextureLayerGui::TriangleTextureLayerGui(QSharedPointer<TextureLayer> mapping)
+  : PolygonTextureLayerGui(mapping)
 {
-  _graphicsItem.reset(new TriangleTextureGraphicsItem(_mapping, true));
-  _inputGraphicsItem.reset(new TriangleTextureGraphicsItem(_mapping, false));
+  _graphicsItem.reset(new TriangleTextureGraphicsItem(_layer, true));
+  _inputGraphicsItem.reset(new TriangleTextureGraphicsItem(_layer, false));
 }
 //
-//void TriangleTextureMappingGui::_doDraw(QPainter* painter)
+//void TriangleTextureLayerGui::_doDraw(QPainter* painter)
 //{
 //  qDebug() << "Is this really used!" << endl;
 ////  Q_UNUSED(painter);
@@ -413,14 +413,14 @@ TriangleTextureMappingGui::TriangleTextureMappingGui(QSharedPointer<TextureMappi
 ////  glEnd();
 //}
 
-MeshTextureMappingGui::MeshTextureMappingGui(QSharedPointer<TextureMapping> mapping)
-  : PolygonTextureMappingGui(mapping)
+MeshTextureLayerGui::MeshTextureLayerGui(QSharedPointer<TextureLayer> mapping)
+  : PolygonTextureLayerGui(mapping)
 {
-  _graphicsItem.reset(new MeshTextureGraphicsItem(_mapping, true));
-  _inputGraphicsItem.reset(new MeshTextureGraphicsItem(_mapping, false));
+  _graphicsItem.reset(new MeshTextureGraphicsItem(_layer, true));
+  _inputGraphicsItem.reset(new MeshTextureGraphicsItem(_layer, false));
 
   // Add mesh sub property.
-  QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_mapping->getShape());
+  QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_layer->getShape());
   _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Subdivisions"));
 
   // Rename subdivision subproperties.
@@ -433,15 +433,15 @@ MeshTextureMappingGui::MeshTextureMappingGui(QSharedPointer<TextureMapping> mapp
   _meshItem->setAttribute("minimum", QSize(2, 2));
 
   // Add.
-  _propertyBrowser->insertProperty(_meshItem, _paintItem); // insert at the beginning
+  _propertyBrowser->insertProperty(_meshItem, _sourceItem); // insert at the beginning
 }
 
-void MeshTextureMappingGui::setValue(QtProperty* property, const QVariant& value)
+void MeshTextureLayerGui::setValue(QtProperty* property, const QVariant& value)
 {
   if (property == _meshItem)
   {
-    QSharedPointer<Mesh> outputMesh = qSharedPointerCast<Mesh>(_mapping->getShape());
-    QSharedPointer<Mesh> inputMesh  = qSharedPointerCast<Mesh>(textureMapping.toStrongRef()->getInputShape());
+    QSharedPointer<Mesh> outputMesh = qSharedPointerCast<Mesh>(_layer->getShape());
+    QSharedPointer<Mesh> inputMesh  = qSharedPointerCast<Mesh>(textureLayer.toStrongRef()->getInputShape());
     QSize size = (static_cast<QtVariantProperty*>(property))->value().toSize();
     if (outputMesh->nColumns() != size.width() || outputMesh->nRows() != size.height() ||
         inputMesh->nColumns() != size.width() || inputMesh->nRows() != size.height())
@@ -458,14 +458,14 @@ void MeshTextureMappingGui::setValue(QtProperty* property, const QVariant& value
     }
   }
   else
-    TextureMappingGui::setValue(property, value);
+    TextureLayerGui::setValue(property, value);
 }
 
-EllipseTextureMappingGui::EllipseTextureMappingGui(QSharedPointer<TextureMapping> mapping)
-: PolygonTextureMappingGui(mapping)
+EllipseTextureLayerGui::EllipseTextureLayerGui(QSharedPointer<TextureLayer> mapping)
+: PolygonTextureLayerGui(mapping)
 {
-  _graphicsItem.reset(new EllipseTextureGraphicsItem(_mapping, true));
-  _inputGraphicsItem.reset(new EllipseTextureGraphicsItem(_mapping, false));
+  _graphicsItem.reset(new EllipseTextureGraphicsItem(_layer, true));
+  _inputGraphicsItem.reset(new EllipseTextureGraphicsItem(_layer, false));
 }
 
 }
diff --git a/src/gui/MappingGui.h b/src/gui/LayerGui.h
similarity index 68%
rename from src/gui/MappingGui.h
rename to src/gui/LayerGui.h
index 69a85fcd..df88ddd9 100644
--- a/src/gui/MappingGui.h
+++ b/src/gui/LayerGui.h
@@ -1,5 +1,5 @@
 /*
- * MappingGui.h
+ * LayerGui.h
  *
  * (c) 2013 Sofian Audry -- info(@)sofianaudry(.)com
  * (c) 2013 Alexandre Quessy -- alexandre(@)quessy(.)net
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef MAPPING_GUI_
-#define MAPPING_GUI_
+#ifndef LAYER_GUI_
+#define LAYER_GUI_
 
 #include <QtGlobal>
 
@@ -34,8 +34,8 @@
 #include <stdio.h>
 
 #include "Shape.h"
-#include "Paint.h"
-#include "Mapping.h"
+#include "Source.h"
+#include "Layer.h"
 #include "MappingManager.h"
 
 #include "MapperGLCanvas.h"
@@ -62,19 +62,19 @@ class MainWindow;
  * This is the "view" side of the Mapping class (model). It contains the graphic items for
  * both input and output as well as the properties editor.
  */
-class MappingGui : public QObject
+class LayerGui : public QObject
 {
   Q_OBJECT
 
 public:
-  typedef QSharedPointer<MappingGui> ptr;
+  typedef QSharedPointer<LayerGui> ptr;
 
 protected:
   /// Constructor. A mapper applies to a mapping.
-  MappingGui(Mapping::ptr mapping);
+  LayerGui(Layer::ptr mapping);
 
 public:
-  virtual ~MappingGui() {}
+  virtual ~LayerGui() {}
 
 public:
   /// Returns a pointer to the properties editor for that mapper.
@@ -90,23 +90,23 @@ public slots:
   virtual void setValue(QtProperty* property, const QVariant& value);
   virtual void setValue(QString propertyName, QVariant value);
   virtual void updateShape(MShape* shape);
-	virtual void updatePaints();
+	virtual void updateSources();
 
 signals:
   void valueChanged();
-  void paintChanged();
+  void sourceChanged();
   
 protected:
-  Mapping::ptr _mapping;
+  Layer::ptr _layer;
 
   QSharedPointer<QtTreePropertyBrowser> _propertyBrowser;
   QtVariantEditorFactory* _variantFactory;
   QtVariantPropertyManager* _variantManager;
-	QtEnumPropertyManager* _paintEnumManager;
+	QtEnumPropertyManager* _sourceEnumManager;
 
   QtVariantProperty* _idItem;
   QtVariantProperty* _opacityItem;
-	QtVariantProperty* _paintItem;
+	QtVariantProperty* _sourceItem;
   QtProperty* _outputItem;
 
   std::map<QtProperty*, std::pair<MShape*, int> > _propertyToVertex;
@@ -122,34 +122,34 @@ public slots:
 };
 
 /// Parent class for color -> color mappings.
-class ColorMappingGui : public MappingGui
+class ColorLayerGui : public LayerGui
 {
   Q_OBJECT
 
 protected:
-  ColorMappingGui(Mapping::ptr mapping);
-  virtual ~ColorMappingGui() {}
+  ColorLayerGui(Layer::ptr mapping);
+  virtual ~ColorLayerGui() {}
 
 protected:
   QSharedPointer<Color> color;
 };
 
-class PolygonColorMappingGui : public ColorMappingGui
+class PolygonColorLayerGui : public ColorLayerGui
 {
   Q_OBJECT
 
 public:
-  PolygonColorMappingGui(Mapping::ptr mapping);
-  virtual ~PolygonColorMappingGui() {}
+  PolygonColorLayerGui(Layer::ptr mapping);
+  virtual ~PolygonColorLayerGui() {}
 };
 
-class MeshColorMappingGui : public PolygonColorMappingGui
+class MeshColorLayerGui : public PolygonColorLayerGui
 {
   Q_OBJECT
 
 public:
-  MeshColorMappingGui(Mapping::ptr mapping);
-  virtual ~MeshColorMappingGui() {}
+  MeshColorLayerGui(Layer::ptr mapping);
+  virtual ~MeshColorLayerGui() {}
 
 public slots:
   virtual void setValue(QtProperty* property, const QVariant& value);
@@ -158,23 +158,23 @@ public slots:
   QtVariantProperty* _meshItem;
 };
 
-class EllipseColorMappingGui : public ColorMappingGui
+class EllipseColorLayerGui : public ColorLayerGui
 {
   Q_OBJECT
 
 public:
-  EllipseColorMappingGui(Mapping::ptr mapping);
-  virtual ~EllipseColorMappingGui() {}
+  EllipseColorLayerGui(Layer::ptr mapping);
+  virtual ~EllipseColorLayerGui() {}
 };
 
 /// Parent class for texture -> texture mapping.
-class TextureMappingGui : public MappingGui
+class TextureLayerGui : public LayerGui
 {
   Q_OBJECT
 
 public:
-  TextureMappingGui(QSharedPointer<TextureMapping> mapping);
-  virtual ~TextureMappingGui() {}
+  TextureLayerGui(QSharedPointer<TextureLayer> mapping);
+  virtual ~TextureLayerGui() {}
 
 public slots:
   virtual void updateShape(MShape* shape);
@@ -184,35 +184,35 @@ public slots:
   QtVariantProperty* _meshItem;
 
   // FIXME: use typedefs, member of the class for type names that are too long to type:
-  QWeakPointer<TextureMapping> textureMapping;
+  QWeakPointer<TextureLayer> textureLayer;
   QWeakPointer<MShape> inputShape;
 };
 
-class PolygonTextureMappingGui : public TextureMappingGui
+class PolygonTextureLayerGui : public TextureLayerGui
 {
   Q_OBJECT
 
 public:
-  PolygonTextureMappingGui(QSharedPointer<TextureMapping> mapping) : TextureMappingGui(mapping) {}
-  virtual ~PolygonTextureMappingGui() {}
+  PolygonTextureLayerGui(QSharedPointer<TextureLayer> mapping) : TextureLayerGui(mapping) {}
+  virtual ~PolygonTextureLayerGui() {}
 };
 
-class TriangleTextureMappingGui : public PolygonTextureMappingGui
+class TriangleTextureLayerGui : public PolygonTextureLayerGui
 {
   Q_OBJECT
 
 public:
-  TriangleTextureMappingGui(QSharedPointer<TextureMapping> mapping);
-  virtual ~TriangleTextureMappingGui() {}
+  TriangleTextureLayerGui(QSharedPointer<TextureLayer> mapping);
+  virtual ~TriangleTextureLayerGui() {}
 };
 
-class MeshTextureMappingGui : public PolygonTextureMappingGui
+class MeshTextureLayerGui : public PolygonTextureLayerGui
 {
   Q_OBJECT
 
 public:
-  MeshTextureMappingGui(QSharedPointer<TextureMapping> mapping);
-  virtual ~MeshTextureMappingGui() {}
+  MeshTextureLayerGui(QSharedPointer<TextureLayer> mapping);
+  virtual ~MeshTextureLayerGui() {}
 
 public slots:
   virtual void setValue(QtProperty* property, const QVariant& value);
@@ -221,12 +221,12 @@ public slots:
   QtVariantProperty* _meshItem;
 };
 
-class EllipseTextureMappingGui : public PolygonTextureMappingGui {
+class EllipseTextureLayerGui : public PolygonTextureLayerGui {
   Q_OBJECT
 
 public:
-  EllipseTextureMappingGui(QSharedPointer<TextureMapping> mapping);
-  virtual ~EllipseTextureMappingGui() {}
+  EllipseTextureLayerGui(QSharedPointer<TextureLayer> mapping);
+  virtual ~EllipseTextureLayerGui() {}
 
 protected:
   static void _setPointOfEllipseAtAngle(QPointF& point, const QPointF& center, float hRadius, float vRadius, float rotation, float circularAngle);
@@ -234,4 +234,4 @@ class EllipseTextureMappingGui : public PolygonTextureMappingGui {
 
 }
 
-#endif /* MAPPER_H_ */
+#endif /* LAYER_GUI_H_ */
diff --git a/src/gui/MappingItemDelegate.cpp b/src/gui/LayerItemDelegate.cpp
similarity index 93%
rename from src/gui/MappingItemDelegate.cpp
rename to src/gui/LayerItemDelegate.cpp
index b58757ec..2abfdc7b 100644
--- a/src/gui/MappingItemDelegate.cpp
+++ b/src/gui/LayerItemDelegate.cpp
@@ -17,18 +17,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "MappingItemDelegate.h"
+#include "LayerItemDelegate.h"
 #include <QPainterPath>
 
 namespace mmp {
 
-MappingItemDelegate::MappingItemDelegate(QObject *parent) :
+LayerItemDelegate::LayerItemDelegate(QObject *parent) :
   QStyledItemDelegate(parent)
 {
 
 }
 
-void MappingItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+void LayerItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
   painter->setRenderHint(QPainter::Antialiasing);
 
@@ -173,7 +173,7 @@ void MappingItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o
   }
 }
 
-QWidget *MappingItemDelegate::createEditor(QWidget *parent,
+QWidget *LayerItemDelegate::createEditor(QWidget *parent,
         const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
   if (index.column() == MM::IconAndNameColum)
@@ -189,7 +189,7 @@ QWidget *MappingItemDelegate::createEditor(QWidget *parent,
   }
 }
 
-void MappingItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
+void LayerItemDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
 {
   QString value = index.model()->data(index, Qt::EditRole).toString();
 
@@ -197,20 +197,20 @@ void MappingItemDelegate::setEditorData(QWidget *editor, const QModelIndex &inde
   nameEdit->setText(value);
 }
 
-void MappingItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
+void LayerItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
 {
   QLineEdit *nameEdit = static_cast<QLineEdit*>(editor); // TODO: use reinterpret_cast instead static_cast
   model->setData(index, nameEdit->text(), Qt::EditRole);
 }
 
-void MappingItemDelegate::updateEditorGeometry(QWidget *editor,
+void LayerItemDelegate::updateEditorGeometry(QWidget *editor,
         const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
   Q_UNUSED(index)
   editor->setGeometry(option.rect);
 }
 
-bool MappingItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
+bool LayerItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
         const QStyleOptionViewItem &option, const QModelIndex &index)
 {
   QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
diff --git a/src/gui/MappingItemDelegate.h b/src/gui/LayerItemDelegate.h
similarity index 90%
rename from src/gui/MappingItemDelegate.h
rename to src/gui/LayerItemDelegate.h
index 1b034b57..51759bc5 100644
--- a/src/gui/MappingItemDelegate.h
+++ b/src/gui/LayerItemDelegate.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPPINGITEMDELEGATE_H
-#define MAPPINGITEMDELEGATE_H
+#ifndef LAYERITEMDELEGATE_H
+#define LAYERITEMDELEGATE_H
 
 #include <QStyledItemDelegate>
 #include <QLineEdit>
@@ -34,12 +34,12 @@ namespace mmp {
 
 typedef int uid;
 
-class MappingItemDelegate : public QStyledItemDelegate
+class LayerItemDelegate : public QStyledItemDelegate
 {
   Q_OBJECT
 
 public:
-  MappingItemDelegate(QObject *parent = nullptr);
+  LayerItemDelegate(QObject *parent = nullptr);
 
   void paint(QPainter *painter, const QStyleOptionViewItem &option,
              const QModelIndex &index) const override;
@@ -63,4 +63,4 @@ class MappingItemDelegate : public QStyledItemDelegate
 
 }
 
-#endif // MAPPINGITEMDELEGATE_H
+#endif // LAYERITEMDELEGATE_H
diff --git a/src/gui/MappingListModel.cpp b/src/gui/LayerListModel.cpp
similarity index 61%
rename from src/gui/MappingListModel.cpp
rename to src/gui/LayerListModel.cpp
index c4ae06fd..c9e35620 100644
--- a/src/gui/MappingListModel.cpp
+++ b/src/gui/LayerListModel.cpp
@@ -17,33 +17,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "MappingListModel.h"
+#include "LayerListModel.h"
 #include <QIODevice>
 
 namespace mmp {
 
-MappingListModel::MappingListModel(QObject *parent) :
+LayerListModel::LayerListModel(QObject *parent) :
   QAbstractTableModel(parent) {}
 
-int MappingListModel::rowCount(const QModelIndex &parent) const
+int LayerListModel::rowCount(const QModelIndex &parent) const
 {
-  return (parent.isValid() && parent.column() != 0) ? 0 : mappingList.size();
+  return (parent.isValid() && parent.column() != 0) ? 0 : layerList.size();
 }
 
-int MappingListModel::columnCount(const QModelIndex &parent) const
+int LayerListModel::columnCount(const QModelIndex &parent) const
 {
   Q_UNUSED(parent)
   return 3;
 }
 
-QVariant MappingListModel::data(const QModelIndex &index, int role) const
+QVariant LayerListModel::data(const QModelIndex &index, int role) const
 {
   if (!index.isValid())
     return QVariant();
 
   switch (role) {
   case Qt::CheckStateRole:
-    return mappingList.at(index.row()).isVisible ? Qt::Checked : Qt::Unchecked;
+    return layerList.at(index.row()).isVisible ? Qt::Checked : Qt::Unchecked;
 
   case Qt::SizeHintRole:
     if (index.column() == MM::HideColumn)
@@ -54,25 +54,25 @@ QVariant MappingListModel::data(const QModelIndex &index, int role) const
       return QSize(MM::MAPPING_LIST_BUTTONS_COLUMN, 40);
    break;
   case Qt::CheckStateRole + 1:
-    return mappingList.at(index.row()).isSolo ? Qt::Checked : Qt::Unchecked;
+    return layerList.at(index.row()).isSolo ? Qt::Checked : Qt::Unchecked;
 
   case Qt::CheckStateRole + 2:
-    return mappingList.at(index.row()).isLocked ? Qt::Checked : Qt::Unchecked;
+    return layerList.at(index.row()).isLocked ? Qt::Checked : Qt::Unchecked;
 
   case Qt::UserRole:
-    return QVariant(mappingList.at(index.row()).id);
+    return QVariant(layerList.at(index.row()).id);
 
   case Qt::EditRole:
-    return QVariant(mappingList.at(index.row()).label);
+    return QVariant(layerList.at(index.row()).label);
 
   case Qt::DisplayRole:
-    return QVariant(mappingList.at(index.row()).label);
+    return QVariant(layerList.at(index.row()).label);
 
   case Qt::DecorationRole:
-    return mappingList.at(index.row()).icon;
+    return layerList.at(index.row()).icon;
 
   case Qt::ToolTipRole:
-    return QString("ID: %1").arg(mappingList.at(index.row()).id);
+    return QString("ID: %1").arg(layerList.at(index.row()).id);
 
   default:
     return QVariant();
@@ -81,7 +81,7 @@ QVariant MappingListModel::data(const QModelIndex &index, int role) const
   return QVariant();
 }
 
-Qt::ItemFlags MappingListModel::flags(const QModelIndex &index) const
+Qt::ItemFlags LayerListModel::flags(const QModelIndex &index) const
 {
   if (!index.isValid())
     return Qt::NoItemFlags;
@@ -94,21 +94,21 @@ Qt::ItemFlags MappingListModel::flags(const QModelIndex &index) const
       Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
 }
 
-Qt::DropActions MappingListModel::supportedDropActions() const
+Qt::DropActions LayerListModel::supportedDropActions() const
 {
   return Qt::MoveAction;
 }
 
 #define MIMETYPE QLatin1String("mapping/model.item.list")
 
-QStringList MappingListModel::mimeTypes() const
+QStringList LayerListModel::mimeTypes() const
 {
   QStringList types;
   types << MIMETYPE;
   return types;
 }
 
-QMimeData *MappingListModel::mimeData(const QModelIndexList &indexes) const
+QMimeData *LayerListModel::mimeData(const QModelIndexList &indexes) const
 {
   QMimeData *mimeData = QAbstractTableModel::mimeData(indexes);
   QByteArray encodeData;
@@ -129,7 +129,7 @@ QMimeData *MappingListModel::mimeData(const QModelIndexList &indexes) const
   return mimeData;
 }
 
-bool MappingListModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
+bool LayerListModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent)
 {
   if (!data->hasFormat(MIMETYPE)
       || column > 0)
@@ -142,9 +142,9 @@ bool MappingListModel::dropMimeData(const QMimeData *data, Qt::DropAction action
 
   if (!parent.isValid()) {
     if (row < 0)
-      endRow = mappingList.size();
+      endRow = layerList.size();
     else
-      endRow = qMin(row, mappingList.size());
+      endRow = qMin(row, layerList.size());
   } else {
     endRow = parent.row();
   }
@@ -165,30 +165,30 @@ bool MappingListModel::dropMimeData(const QMimeData *data, Qt::DropAction action
   return true;
 }
 
-bool MappingListModel::setData(const QModelIndex &index, const QVariant &value, int role)
+bool LayerListModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
   if (!index.isValid())
     return false;
 
   if (role == Qt::CheckStateRole && value.type() == QVariant::Bool) {
-    if (mappingList[index.row()].isVisible != value.toBool()) {
-      mappingList[index.row()].isVisible = value.toBool();
+    if (layerList[index.row()].isVisible != value.toBool()) {
+      layerList[index.row()].isVisible = value.toBool();
       emit dataChanged(index, index);
       return true;
     }
   }
 
   if (role == Qt::CheckStateRole + 1 && value.type() == QVariant::Bool) {
-    if (mappingList[index.row()].isSolo != value.toBool()) {
-      mappingList[index.row()].isSolo = value.toBool();
+    if (layerList[index.row()].isSolo != value.toBool()) {
+      layerList[index.row()].isSolo = value.toBool();
       emit dataChanged(index, index);
       return true;
     }
   }
 
   if (role == Qt::CheckStateRole + 2 && value.type() == QVariant::Bool) {
-    if (mappingList[index.row()].isLocked != value.toBool()) {
-      mappingList[index.row()].isLocked = value.toBool();
+    if (layerList[index.row()].isLocked != value.toBool()) {
+      layerList[index.row()].isLocked = value.toBool();
       emit dataChanged(index, index);
       return true;
     }
@@ -196,8 +196,8 @@ bool MappingListModel::setData(const QModelIndex &index, const QVariant &value,
 
   // Note: Removed the check for column as this was blocking OSC from changing name.
   if (role == Qt::EditRole /* && index.column() == MM::IconAndNameColum*/) {
-    if (mappingList[index.row()].label != value.toString()) {
-      mappingList[index.row()].label = value.toString();
+    if (layerList[index.row()].label != value.toString()) {
+      layerList[index.row()].label = value.toString();
       emit dataChanged(index, index);
       return true;
     }
@@ -206,24 +206,24 @@ bool MappingListModel::setData(const QModelIndex &index, const QVariant &value,
   return false;
 }
 
-void MappingListModel::removeItem(int index)
+void LayerListModel::removeItem(int index)
 {
-  auto it = mappingList.begin();
-  mappingList.erase(it + index);
+  auto it = layerList.begin();
+  layerList.erase(it + index);
 }
 
-void MappingListModel::moveItem(int row, int endRow)
+void LayerListModel::moveItem(int row, int endRow)
 {
   if (beginMoveRows(QModelIndex(), row, row, QModelIndex(), (row < endRow ? endRow+1 : endRow)))
   {
-    mappingList.move(row, endRow);
+    layerList.move(row, endRow);
     endMoveRows();
   }
 }
 
-void MappingListModel::addItem(Mapping::ptr mapping, const QIcon &icon, const QString &label)
+void LayerListModel::addItem(Layer::ptr mapping, const QIcon &icon, const QString &label)
 {
-  MappingItem item;
+  LayerItem item;
 
   item.id = mapping->getId();
   item.icon = icon;
@@ -231,31 +231,31 @@ void MappingListModel::addItem(Mapping::ptr mapping, const QIcon &icon, const QS
   item.isVisible = mapping->isVisible();
   item.isLocked = mapping->isLocked();
   item.isSolo = mapping->isSolo();
-  mappingList.insert(0, item);
+  layerList.insert(0, item);
 }
 
-void MappingListModel::updateModel()
+void LayerListModel::updateModel()
 {
   beginResetModel();
   endResetModel();
 }
 
-void MappingListModel::clear()
+void LayerListModel::clear()
 {
   beginResetModel();
-  mappingList.clear();
+  layerList.clear();
   endResetModel();
 }
 
-QModelIndex MappingListModel::getIndexFromRow(int row)
+QModelIndex LayerListModel::getIndexFromRow(int row)
 {
   return this->createIndex(row, 1);
 }
 
-int MappingListModel::getItemRowFromId(uid id) const
+int LayerListModel::getItemRowFromId(uid id) const
 {
-  for ( int row = 0; row < mappingList.size(); row++) {
-    int itemId = mappingList.at(row).id;
+  for ( int row = 0; row < layerList.size(); row++) {
+    int itemId = layerList.at(row).id;
     if (itemId == id)
       return row;
   }
@@ -263,14 +263,14 @@ int MappingListModel::getItemRowFromId(uid id) const
   return -1;
 }
 
-QModelIndex MappingListModel::getIndexFromId(uid id) const
+QModelIndex LayerListModel::getIndexFromId(uid id) const
 {
   return this->createIndex(getItemRowFromId(id), 0);
 }
 
-uid MappingListModel::getItemId(const QModelIndex &index) const
+uid LayerListModel::getItemId(const QModelIndex &index) const
 {
-  return mappingList.at(index.row()).id;
+  return layerList.at(index.row()).id;
 }
 
 }
diff --git a/src/gui/MappingListModel.h b/src/gui/LayerListModel.h
similarity index 84%
rename from src/gui/MappingListModel.h
rename to src/gui/LayerListModel.h
index 555ebb2d6..7a099524 100644
--- a/src/gui/MappingListModel.h
+++ b/src/gui/LayerListModel.h
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MAPPINGLISTMODEL_H
-#define MAPPINGLISTMODEL_H
+#ifndef LAYERLISTMODEL_H
+#define LAYERLISTMODEL_H
 
 #include <QAbstractTableModel>
 #include <QList>
@@ -27,19 +27,19 @@
 #include <QMimeData>
 
 #include "MM.h"
-#include "Mapping.h"
+#include "Layer.h"
 
 namespace mmp {
 
 typedef int uid;
 
-class MappingListModel : public QAbstractTableModel
+class LayerListModel : public QAbstractTableModel
 {
   Q_OBJECT
 
 public:
-  MappingListModel(QObject *parent = nullptr);
-  ~MappingListModel() override {}
+  LayerListModel(QObject *parent = nullptr);
+  ~LayerListModel() override {}
 
   int rowCount(const QModelIndex & parent = QModelIndex()) const override;
   int columnCount(const QModelIndex & parent = QModelIndex()) const override;
@@ -56,7 +56,7 @@ class MappingListModel : public QAbstractTableModel
   bool setData(const QModelIndex &index, const QVariant &value, int role) override;
 
   void removeItem(int index);
-  void addItem(Mapping::ptr mapping, const QIcon &icon, const QString &label);
+  void addItem(Layer::ptr mapping, const QIcon &icon, const QString &label);
   void moveItem(int row, int endRow);
 
   void updateModel();
@@ -68,7 +68,7 @@ class MappingListModel : public QAbstractTableModel
   QModelIndex getIndexFromId(uid id) const;
 
 private:
-  struct MappingItem {
+  struct LayerItem {
     int id;
     QIcon icon;
     QString label;
@@ -77,9 +77,9 @@ class MappingListModel : public QAbstractTableModel
     bool isSolo;
   };
 
-  QList<MappingItem> mappingList;
+  QList<LayerItem> layerList;
 };
 
 }
 
-#endif // MAPPINGLISTMODEL_H
+#endif // LAYERLISTMODEL_H
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index de35a04c..37675d0e 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -49,11 +49,11 @@ MainWindow::MainWindow()
 
 
   // Initialize internal variables.
-  currentPaintId = NULL_UID;
-  currentMappingId = NULL_UID;
+  currentSourceId = NULL_UID;
+  currentLayerId = NULL_UID;
   // TODO: not sure we need this anymore since we have NULL_UID
-  _hasCurrentPaint = false;
-  _hasCurrentMapping = false;
+  _hasCurrentSource = false;
+  _hasCurrentLayer = false;
   currentSelectedItem = NULL;
 
   // Frames per second.
@@ -64,7 +64,7 @@ MainWindow::MainWindow()
 
   // Editing toggles.
   _displayControls = true;
-  _displayPaintControls = true;
+  _displaySourceControls = true;
   _stickyVertices = true;
   _displayUndoStack = false;
   _showMenuBar = true; // Show menubar by default
@@ -76,8 +76,8 @@ MainWindow::MainWindow()
   createLayout();
   createActions();
   createMenus();
-  createMappingContextMenu();
-  createPaintContextMenu();
+  createLayerContextMenu();
+  createSourceContextMenu();
   createToolBars();
   createStatusBar();
   updateRecentFileActions();
@@ -118,70 +118,70 @@ MainWindow::~MainWindow()
   delete systemTimer;
 }
 
-void MainWindow::handlePaintItemSelectionChanged()
+void MainWindow::handleSourceItemSelectionChanged()
 {
-  // Set current paint.
-  QListWidgetItem* item = paintList->currentItem();
+  // Set current source.
+  QListWidgetItem* item = sourceList->currentItem();
   currentSelectedItem = item;
 
-  // Is a paint item selected?
-  bool paintItemSelected = (item ? true : false);
+  // Is a source item selected?
+  bool sourceItemSelected = (item ? true : false);
 
-  if (paintItemSelected)
+  if (sourceItemSelected)
   {
-    // Set current paint.
-    uid paintId = getItemId(*item);
+    // Set current source.
+    uid sourceId = getItemId(*item);
     // Unselect current mapping.
-    if (currentPaintId != paintId)
-      removeCurrentMapping();
-    // Set current paint.
-    setCurrentPaint(paintId);
+    if (currentSourceId != sourceId)
+      removeCurrentLayer();
+    // Set current source.
+    setCurrentSource(sourceId);
   }
   else
-    removeCurrentPaint();
+    removeCurrentSource();
 
-  // Enable/disable creation of mappings depending on whether a paint is selected.
-  addMeshAction->setEnabled(paintItemSelected);
-  addTriangleAction->setEnabled(paintItemSelected);
-  addEllipseAction->setEnabled(paintItemSelected);
-  deletePaintAction->setEnabled(paintItemSelected);
-  renamePaintAction->setEnabled(paintItemSelected);
+  // Enable/disable creation of mappings depending on whether a source is selected.
+  addMeshAction->setEnabled(sourceItemSelected);
+  addTriangleAction->setEnabled(sourceItemSelected);
+  addEllipseAction->setEnabled(sourceItemSelected);
+  deleteSourceAction->setEnabled(sourceItemSelected);
+  renameSourceAction->setEnabled(sourceItemSelected);
 
   // Update canvases.
   updateCanvases();
 }
 
-void MainWindow::handleMappingItemSelectionChanged(const QModelIndex &index)
+void MainWindow::handleLayerItemSelectionChanged(const QModelIndex &index)
 {
-  // Set current paint and mappings.
-  uid mappingId = mappingListModel->getItemId(index);
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
-  uid paintId = mapping->getPaint()->getId();
-  // Set current mapping and paint
-  setCurrentMapping(mappingId);
-  setCurrentPaint(paintId);
+  // Set current source and mappings.
+  uid layerId = layerListModel->getItemId(index);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
+  uid sourceId = layer->getSource()->getId();
+  // Set current mapping and source
+  setCurrentLayer(layerId);
+  setCurrentSource(sourceId);
   // Enable destination zoom toolbar buttons and avoid loop
   if (!destinationCanvasToolbar->buttonsAreEnable()) {
     // Enable destination toolbar
    destinationCanvasToolbar->enableZoomToolBar(true);
    // Enable source toolbar
    sourceCanvasToolbar->enableZoomToolBar(true);
-   // Enable paint and mapping edit action
-   duplicateMappingAction->setEnabled(true);
-   deleteMappingAction->setEnabled(true);
-   renameMappingAction->setEnabled(true);
-   mappingLockedAction->setEnabled(true);
-   mappingHideAction->setEnabled(true);
-   mappingSoloAction->setEnabled(true);
-   mappingRotate90CWAction->setEnabled(true);
-   mappingRotate90CCWAction->setEnabled(true);
-   mappingRotate180Action->setEnabled(true);
-   mappingHorizontalFlipAction->setEnabled(true);
-   mappingVerticalFlipAction->setEnabled(true);
-   mappingRaiseAction->setEnabled(true);
-   mappingLowerAction->setEnabled(true);
-   mappingRaiseToTopAction->setEnabled(true);
-   mappingLowerToBottomAction->setEnabled(true);
+   // Enable source and mapping edit action
+   duplicateLayerAction->setEnabled(true);
+   deleteLayerAction->setEnabled(true);
+   renameLayerAction->setEnabled(true);
+   layerLockedAction->setEnabled(true);
+   layerHideAction->setEnabled(true);
+   layerSoloAction->setEnabled(true);
+   layerRotate90CWAction->setEnabled(true);
+   layerRotate90CCWAction->setEnabled(true);
+   layerRotate180Action->setEnabled(true);
+   layerHorizontalFlipAction->setEnabled(true);
+   layerVerticalFlipAction->setEnabled(true);
+   layerRaiseAction->setEnabled(true);
+   layerLowerAction->setEnabled(true);
+   layerRaiseToTopAction->setEnabled(true);
+   layerLowerToBottomAction->setEnabled(true);
    // Enable zoom action
    zoomInAction->setEnabled(true);
    zoomOutAction->setEnabled(true);
@@ -191,34 +191,34 @@ void MainWindow::handleMappingItemSelectionChanged(const QModelIndex &index)
 
   // Update canvases.
   updateCanvases();
-  updateMappingListColumnWidth();
+  updateLayerListColumnWidth();
 }
 
-void MainWindow::handleMappingItemChanged(const QModelIndex &index)
+void MainWindow::handleLayerItemChanged(const QModelIndex &index)
 {
   // Get item.
-  uid mappingId = mappingListModel->getItemId(index);
+  uid layerId = layerListModel->getItemId(index);
 
   // Sync name.
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
-  Q_CHECK_PTR(mapping);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
+  Q_CHECK_PTR(layer);
 
   // Change properties.
-  mapping->setName(index.data(Qt::EditRole).toString());
-  mapping->setVisible(index.data(Qt::CheckStateRole).toBool());
-  mapping->setSolo(index.data(Qt::CheckStateRole + 1).toBool());
-  mapping->setLocked(index.data(Qt::CheckStateRole + 2).toBool());
+  layer->setName(index.data(Qt::EditRole).toString());
+  layer->setVisible(index.data(Qt::CheckStateRole).toBool());
+  layer->setSolo(index.data(Qt::CheckStateRole + 1).toBool());
+  layer->setLocked(index.data(Qt::CheckStateRole + 2).toBool());
 
   // Update model (important to make sure icons get updated in the interface).
-  mappingListModel->updateModel();
+  layerListModel->updateModel();
 
   updatePlayingState();
  }
 
-void MainWindow::handleMappingIndexesMoved()
+void MainWindow::handleLayerIndexesMoved()
 {
   // Resync mapping manager.
-  syncMappingManager();
+  syncLayerManager();
 
   // Update canvases according to new order.
   updateCanvases();
@@ -227,133 +227,133 @@ void MainWindow::handleMappingIndexesMoved()
   updatePlayingState();
 }
 
-void MainWindow::handlePaintItemSelected(QListWidgetItem* item)
+void MainWindow::handleSourceItemSelected(QListWidgetItem* item)
 {
   Q_UNUSED(item);
   // Change currently selected item.
   currentSelectedItem = item;
 }
 
-void MainWindow::handlePaintChanged(Paint::ptr paint)
+void MainWindow::handleSourceChanged(Source::ptr source)
 {
   // Change currently selected item.
-  uid curMappingId = getCurrentMappingId();
-  removeCurrentMapping();
-  removeCurrentPaint();
+  uid curLayerId = getCurrentLayerId();
+  removeCurrentLayer();
+  removeCurrentSource();
 
-  uid paintId = mappingManager->getPaintId(paint);
+  uid sourceId = mappingManager->getSourceId(source);
 
 //  QSharedPointer<Texture> texture;
 
-  if (paint->getSourceType() == SourceType::Video)
+  if (source->getSourceType() == SourceType::Video)
   {
-    QSharedPointer<Video> media = qSharedPointerCast<Video>(paint);
+    QSharedPointer<Video> media = qSharedPointerCast<Video>(source);
     Q_CHECK_PTR(media);
-    updatePaintItem(paintId, getPaintIcon(paint), strippedName(media->getUri()));
+    updateSourceItem(sourceId, getSourceIcon(source), strippedName(media->getUri()));
     //    QString fileName = QFileDialog::getOpenFileName(this,
     //        tr("Import media source file"), ".");
     //    // Restart video playback. XXX Hack
     //    if (!fileName.isEmpty())
-    //      importMediaFile(fileName, paint, false);
+    //      importMediaFile(fileName, source, false);
   }
-  if (paint->getSourceType() == SourceType::Image)
+  if (source->getSourceType() == SourceType::Image)
   {
-    QSharedPointer<Image> image = qSharedPointerCast<Image>(paint);
+    QSharedPointer<Image> image = qSharedPointerCast<Image>(source);
     Q_CHECK_PTR(image);
-    updatePaintItem(paintId, getPaintIcon(paint), strippedName(image->getUri()));
+    updateSourceItem(sourceId, getSourceIcon(source), strippedName(image->getUri()));
     //    QString fileName = QFileDialog::getOpenFileName(this,
     //        tr("Import media source file"), ".");
     //    // Restart video playback. XXX Hack
     //    if (!fileName.isEmpty())
-    //      importMediaFile(fileName, paint, true);
+    //      importMediaFile(fileName, source, true);
   }
-  else if (paint->getSourceType() == SourceType::Color)
+  else if (source->getSourceType() == SourceType::Color)
   {
-    // Pop-up color-choosing dialog to choose color paint.
-    QSharedPointer<Color> color = qSharedPointerCast<Color>(paint);
+    // Pop-up color-choosing dialog to choose color source.
+    QSharedPointer<Color> color = qSharedPointerCast<Color>(source);
     Q_CHECK_PTR(color);
-    updatePaintItem(paintId, getPaintIcon(paint), strippedName(color->getColor().name()));
+    updateSourceItem(sourceId, getSourceIcon(source), strippedName(color->getColor().name()));
   }
 
-  if (curMappingId != NULL_UID)
+  if (curLayerId != NULL_UID)
   {
-    setCurrentMapping(curMappingId);
+    setCurrentLayer(curLayerId);
   }
 
 //  updatePlayingState();
 }
 
-void MainWindow::mappingPropertyChanged(uid id, QString propertyName, QVariant value)
+void MainWindow::layerPropertyChanged(uid id, QString propertyName, QVariant value)
 {
   // Retrieve mapping.
-  Mapping::ptr mapping = mappingManager->getMappingById(id);
-  Q_CHECK_PTR(mapping);
+  Layer::ptr layer = mappingManager->getLayerById(id);
+  Q_CHECK_PTR(layer);
 
   // Send to mapping gui.
-  MappingGui::ptr mappingGui = getMappingGuiByMappingId(id);
-  Q_CHECK_PTR(mappingGui);
-  mappingGui->setValue(propertyName, value);
+  LayerGui::ptr layerGui = getLayerGuiByLayerId(id);
+  Q_CHECK_PTR(layerGui);
+  layerGui->setValue(propertyName, value);
 
   // Send to actions.
-  if (mapping == getCurrentMapping())
+  if (layer == getCurrentLayer())
   {
     if (propertyName == "visible")
     {
-      mappingHideAction->setChecked(!value.toBool());
+      layerHideAction->setChecked(!value.toBool());
       updatePlayingState();
     }
     else if (propertyName == "solo")
     {
-      mappingSoloAction->setChecked(value.toBool());
+      layerSoloAction->setChecked(value.toBool());
       updatePlayingState();
     }
     else if (propertyName == "locked")
     {
-      mappingLockedAction->setChecked(value.toBool());
+      layerLockedAction->setChecked(value.toBool());
     }
-    else if (propertyName == "paintId")
+    else if (propertyName == "sourceId")
     {
-      mappingGui->updatePaints();
+      layerGui->updateSources();
       updatePlayingState();
     }
   }
 
   // Send to list items.
-  const QModelIndex& index = mappingListModel->getIndexFromId(mapping->getId());
+  const QModelIndex& index = layerListModel->getIndexFromId(layer->getId());
   if (propertyName == "name")
   {
-    mappingListModel->setData(index, mapping->getName(), Qt::EditRole);
+    layerListModel->setData(index, layer->getName(), Qt::EditRole);
   }
   else if (propertyName == "visible")
   {
-    mappingListModel->setData(index, mapping->isVisible(), Qt::CheckStateRole);
+    layerListModel->setData(index, layer->isVisible(), Qt::CheckStateRole);
   }
   else if (propertyName == "solo")
   {
-    mappingListModel->setData(index, mapping->isSolo(), Qt::CheckStateRole + 1);
+    layerListModel->setData(index, layer->isSolo(), Qt::CheckStateRole + 1);
   }
   else if (propertyName == "locked")
   {
-    mappingListModel->setData(index, mapping->isLocked(), Qt::CheckStateRole + 2);
+    layerListModel->setData(index, layer->isLocked(), Qt::CheckStateRole + 2);
   }
 }
 
-void MainWindow::paintPropertyChanged(uid id, QString propertyName, QVariant value)
+void MainWindow::sourcePropertyChanged(uid id, QString propertyName, QVariant value)
 {
-  // Retrieve paint.
-  Paint::ptr paint = mappingManager->getPaintById(id);
-  Q_CHECK_PTR(paint);
+  // Retrieve source.
+  Source::ptr source = mappingManager->getSourceById(id);
+  Q_CHECK_PTR(source);
 
-  // Send to paint gui.
-  PaintGui::ptr paintGui = getPaintGuiByPaintId(id);
-  Q_CHECK_PTR(paintGui);
+  // Send to source gui.
+  SourceGui::ptr sourceGui = getSourceGuiBySourceId(id);
+  Q_CHECK_PTR(sourceGui);
 
-  paintGui->setValue(propertyName, value);
+  sourceGui->setValue(propertyName, value);
 
   // Send to list items.
-  QListWidgetItem* paintItem = getItemFromId(*paintList, id);
+  QListWidgetItem* sourceItem = getItemFromId(*sourceList, id);
   if (propertyName == "name")
-    paintItem->setText(paint->getName());
+    sourceItem->setText(source->getName());
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
@@ -498,7 +498,7 @@ void MainWindow::setOutputWindowFullScreen(bool enable)
   outputWindow->setFullScreen(enable);
   // setCheckState
   displayControlsAction->setChecked(enable);
-  displayPaintControlsAction->setChecked(enable);
+  displaySourceControlsAction->setChecked(enable);
  }
 
 void MainWindow::newFile()
@@ -693,7 +693,7 @@ void MainWindow::addColor()
   if (pauseAction->isVisible())
     pause(false);
 
-  // Pop-up color-choosing dialog to choose color paint.
+  // Pop-up color-choosing dialog to choose color source.
   // FIXME: we use a static variable to store the last chosen color
   // it should rather be a member of this class, or so.
   static QColor color = QColor(0, 255, 0, 255);
@@ -708,7 +708,7 @@ void MainWindow::addColor()
 #endif
   if (color.isValid())
   {
-    addColorPaint(color);
+    addColorSource(color);
   }
 
   // Restart video playback if it was previously playing. XXX Hack
@@ -718,107 +718,107 @@ void MainWindow::addColor()
 
 void MainWindow::addMesh()
 {
-  // A paint must be selected to add a mapping.
-  if (getCurrentPaintId() == NULL_UID)
+  // A source must be selected to add a mapping.
+  if (getCurrentSourceId() == NULL_UID)
     return;
 
-  // Retrieve current paint (as texture).
-  Paint::ptr paint = getMappingManager().getPaintById(getCurrentPaintId());
-  Q_CHECK_PTR(paint);
+  // Retrieve current source (as texture).
+  Source::ptr source = getMappingManager().getSourceById(getCurrentSourceId());
+  Q_CHECK_PTR(source);
 
   // Create input and output quads.
-  Mapping* mappingPtr;
-  if (paint->getSourceType() == SourceType::Color)
+  Layer* layerPtr;
+  if (source->getSourceType() == SourceType::Color)
   {
     MShape::ptr outputQuad = MShape::ptr(Util::createMeshForColor(sourceCanvas->width(), sourceCanvas->height()));
-    mappingPtr = new ColorMapping(paint, outputQuad);
+    layerPtr = new ColorLayer(source, outputQuad);
   }
   else
   {
-    QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(paint);
+    QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(source);
     Q_CHECK_PTR(texture);
 
     MShape::ptr outputQuad = MShape::ptr(Util::createMeshForTexture(texture.data(), sourceCanvas->width(), sourceCanvas->height()));
     MShape::ptr  inputQuad = MShape::ptr(Util::createMeshForTexture(texture.data(), sourceCanvas->width(), sourceCanvas->height()));
-    mappingPtr = new TextureMapping(paint, outputQuad, inputQuad);
+    layerPtr = new TextureLayer(source, outputQuad, inputQuad);
   }
 
   // Create texture mapping.
-  Mapping::ptr mapping(mappingPtr);
-  uint mappingId = mappingManager->addMapping(mapping);
+  Layer::ptr layer(layerPtr);
+  uint layerId = mappingManager->addLayer(layer);
 
   // Lets the undo-stack handle Undo/Redo the adding of mapping item.
-  undoStack->push(new AddMappingCommand(this, mappingId));
+  undoStack->push(new AddLayerCommand(this, layerId));
 }
 
 void MainWindow::addTriangle()
 {
-  // A paint must be selected to add a mapping.
-  if (getCurrentPaintId() == NULL_UID)
+  // A source must be selected to add a mapping.
+  if (getCurrentSourceId() == NULL_UID)
     return;
 
-  // Retrieve current paint (as texture).
-  Paint::ptr paint = getMappingManager().getPaintById(getCurrentPaintId());
-  Q_CHECK_PTR(paint);
+  // Retrieve current source (as texture).
+  Source::ptr source = getMappingManager().getSourceById(getCurrentSourceId());
+  Q_CHECK_PTR(source);
 
   // Create input and output quads.
-  Mapping* mappingPtr;
-  if (paint->getSourceType() == SourceType::Color)
+  Layer* layerPtr;
+  if (source->getSourceType() == SourceType::Color)
   {
     MShape::ptr outputTriangle = MShape::ptr(Util::createTriangleForColor(sourceCanvas->width(), sourceCanvas->height()));
-    mappingPtr = new ColorMapping(paint, outputTriangle);
+    layerPtr = new ColorLayer(source, outputTriangle);
   }
   else
   {
-    QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(paint);
+    QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(source);
     Q_CHECK_PTR(texture);
 
     MShape::ptr outputTriangle = MShape::ptr(Util::createTriangleForTexture(texture.data(), sourceCanvas->width(), sourceCanvas->height()));
     MShape::ptr inputTriangle = MShape::ptr(Util::createTriangleForTexture(texture.data(), sourceCanvas->width(), sourceCanvas->height()));
-    mappingPtr = new TextureMapping(paint, inputTriangle, outputTriangle);
+    layerPtr = new TextureLayer(source, inputTriangle, outputTriangle);
   }
 
   // Create mapping.
-  Mapping::ptr mapping(mappingPtr);
-  uint mappingId = mappingManager->addMapping(mapping);
+  Layer::ptr layer(layerPtr);
+  uint layerId = mappingManager->addLayer(layer);
 
   // Lets undo-stack handle Undo/Redo the adding of mapping item.
-  undoStack->push(new AddMappingCommand(this, mappingId));
+  undoStack->push(new AddLayerCommand(this, layerId));
 }
 
 void MainWindow::addEllipse()
 {
-  // A paint must be selected to add a mapping.
-  if (getCurrentPaintId() == NULL_UID)
+  // A source must be selected to add a mapping.
+  if (getCurrentSourceId() == NULL_UID)
     return;
 
-  // Retrieve current paint (as texture).
-  Paint::ptr paint = getMappingManager().getPaintById(getCurrentPaintId());
-  Q_CHECK_PTR(paint);
+  // Retrieve current source (as texture).
+  Source::ptr source = getMappingManager().getSourceById(getCurrentSourceId());
+  Q_CHECK_PTR(source);
 
   // Create input and output ellipses.
-  Mapping* mappingPtr;
-  if (paint->getSourceType() == SourceType::Color)
+  Layer* layerPtr;
+  if (source->getSourceType() == SourceType::Color)
   {
     MShape::ptr outputEllipse = MShape::ptr(Util::createEllipseForColor(sourceCanvas->width(), sourceCanvas->height()));
-    mappingPtr = new ColorMapping(paint, outputEllipse);
+    layerPtr = new ColorLayer(source, outputEllipse);
   }
   else
   {
-    QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(paint);
+    QSharedPointer<Texture> texture = qSharedPointerCast<Texture>(source);
     Q_CHECK_PTR(texture);
 
     MShape::ptr outputEllipse = MShape::ptr(Util::createEllipseForTexture(texture.data(), sourceCanvas->width(), sourceCanvas->height()));
     MShape::ptr inputEllipse = MShape::ptr(Util::createEllipseForTexture(texture.data(), sourceCanvas->width(), sourceCanvas->height()));
-    mappingPtr = new TextureMapping(paint, inputEllipse, outputEllipse);
+    layerPtr = new TextureLayer(source, inputEllipse, outputEllipse);
   }
 
   // Create mapping.
-  Mapping::ptr mapping(mappingPtr);
-  uint mappingId = mappingManager->addMapping(mapping);
+  Layer::ptr layer(layerPtr);
+  uint layerId = mappingManager->addLayer(layer);
 
   // Lets undo-stack handle Undo/Redo the adding of mapping item.
-  undoStack->push(new AddMappingCommand(this, mappingId));
+  undoStack->push(new AddLayerCommand(this, layerId));
 }
 
 void MainWindow::about()
@@ -836,7 +836,7 @@ void MainWindow::about()
 void MainWindow::updateStatusBar()
 {
   QPointF mousePos = destinationCanvas->mapToScene(destinationCanvas->mapFromGlobal(destinationCanvas->cursor().pos()));
-  if (currentSelectedItem) // Show mouse coordinate only if mappingList is not empty
+  if (currentSelectedItem) // Show mouse coordinate only if layerList is not empty
     mousePosLabel->setText("Mouse coordinate:   X " + QString::number(mousePos.x()) + "   Y " + QString::number(mousePos.y()));
   else
     mousePosLabel->setText(""); // Otherwise set empty text.
@@ -866,39 +866,39 @@ void MainWindow::showMenuBar(bool shown)
 /**
  * Called when the user wants to delete an item.
  *
- * Deletes either a Paint or a Mapping.
+ * Deletes either a Source or a Mapping.
  */
 void MainWindow::deleteItem()
 {
-  bool isMappingTabSelected = (mappingSplitter == contentTab->currentWidget());
-  bool isPaintTabSelected = (paintSplitter == contentTab->currentWidget());
+  bool isLayerTabSelected = (layerSplitter == contentTab->currentWidget());
+  bool isSourceTabSelected = (sourceSplitter == contentTab->currentWidget());
 
   if (currentSelectedItem)
   {
-    if (isMappingTabSelected) //currentSelectedItem->listWidget() == mappingList)
+    if (isLayerTabSelected) //currentSelectedItem->listWidget() == layerList)
     {
       // Delete mapping.
-      undoStack->push(new DeleteMappingCommand(this, getCurrentMappingId()));
+      undoStack->push(new DeleteLayerCommand(this, getCurrentLayerId()));
       //currentSelectedItem = NULL;
     }
-    else if (isPaintTabSelected) //currentSelectedItem->listWidget() == paintList)
+    else if (isSourceTabSelected) //currentSelectedItem->listWidget() == sourceList)
     {
-      // Delete paint.
-      undoStack->push(new RemovePaintCommand(this, getItemId(*paintList->currentItem())));
+      // Delete source.
+      undoStack->push(new RemoveSourceCommand(this, getItemId(*sourceList->currentItem())));
       //currentSelectedItem = NULL;
     }
     else
     {
-      qCritical() << "Selected item neither a mapping nor a paint." << Qt::endl;
+      qCritical() << "Selected item neither a mapping nor a source." << Qt::endl;
     }
   }
 }
 
-void MainWindow::duplicateMappingItem()
+void MainWindow::duplicateLayerItem()
 {
   if (currentSelectedIndex.isValid())
   {
-    duplicateMapping(currentMappingItemId());
+    duplicateLayer(currentLayerItemId());
   }
   else
   {
@@ -906,11 +906,11 @@ void MainWindow::duplicateMappingItem()
   }
 }
 
-void MainWindow::deleteMappingItem()
+void MainWindow::deleteLayerItem()
 {
-  if (hasCurrentMapping())
+  if (hasCurrentLayer())
   {
-    undoStack->push(new DeleteMappingCommand(this, getCurrentMappingId()));
+    undoStack->push(new DeleteLayerCommand(this, getCurrentLayerId()));
   }
   else
   {
@@ -918,121 +918,121 @@ void MainWindow::deleteMappingItem()
   }
 }
 
-void MainWindow::renameMappingItem()
+void MainWindow::renameLayerItem()
 {
   // Set current item editable and rename it
-  QModelIndex index = mappingList->currentIndex();
+  QModelIndex index = layerList->currentIndex();
   // Used by context menu
-  mappingList->edit(index);
+  layerList->edit(index);
   // Switch to mapping tab.
-  contentTab->setCurrentWidget(mappingSplitter);
+  contentTab->setCurrentWidget(layerSplitter);
 }
 
-void MainWindow::setMappingItemLocked(bool locked)
+void MainWindow::setLayerItemLocked(bool locked)
 {
-  setMappingLocked(currentMappingItemId(), locked);
+  setLayerLocked(currentLayerItemId(), locked);
 }
 
-void MainWindow::setMappingItemHide(bool hide)
+void MainWindow::setLayerItemHide(bool hide)
 {
-  setMappingVisible(currentMappingItemId(), !hide);
+  setLayerVisible(currentLayerItemId(), !hide);
 }
 
-void MainWindow::setMappingItemSolo(bool solo)
+void MainWindow::setLayerItemSolo(bool solo)
 {
-  setMappingSolo(currentMappingItemId(), solo);
+  setLayerSolo(currentLayerItemId(), solo);
 }
 
 void MainWindow::loadLayerMedia()
 {
   QAction *action = qobject_cast<QAction *>(sender());
-  Paint::ptr media;
-  uid currentLayerId = getCurrentMapping()->getId();
+  Source::ptr media;
+  uid currentLayerId = getCurrentLayer()->getId();
 
   if (action) {
     if (action->data().toString() == "import-new-media") {
-      // Due to the fact that we can't assign a media/paint without adding a mesh
+      // Due to the fact that we can't assign a media/source without adding a mesh
       importMedia();
       addMesh(); // Creating a temporary mesh
-      media = mappingManager->getPaintById(currentPaintId); // The last imported video is current ID
-      deleteMapping(getCurrentMapping()->getId()); // Delete the temporary mesh
-      setCurrentMapping(currentLayerId); // Set the previous selected layer as the current
+      media = mappingManager->getSourceById(currentSourceId); // The last imported video is current ID
+      deleteLayer(getCurrentLayer()->getId()); // Delete the temporary mesh
+      setCurrentLayer(currentLayerId); // Set the previous selected layer as the current
     } else {
-      media = mappingManager->getPaintById(action->data().toInt());
+      media = mappingManager->getSourceById(action->data().toInt());
     }
 
-    if (media && media != getCurrentMapping()->getPaint() &&
-        getCurrentMapping()->paintIsCompatible(media)) {
+    if (media && media != getCurrentLayer()->getSource() &&
+        getCurrentLayer()->sourceIsCompatible(media)) {
       // Change layer source
-      getCurrentMapping()->setPaint(media);
+      getCurrentLayer()->setSource(media);
     }
   }
 }
 
-void MainWindow::transformActionMappingItem()
+void MainWindow::transformActionLayerItem()
 {
   QAction *actionSender = qobject_cast<QAction *>(sender());
 
-  if (actionSender == mappingRotate90CWAction) {
+  if (actionSender == layerRotate90CWAction) {
     undoStack->push(new RotateShapeCommand(destinationCanvas, TransformShapeCommand::FREE, destinationCanvas->getCurrentShape(), MShape::Rotate90CW));
   }
-  else if (actionSender == mappingRotate90CCWAction) {
+  else if (actionSender == layerRotate90CCWAction) {
     undoStack->push(new RotateShapeCommand(destinationCanvas, TransformShapeCommand::FREE, destinationCanvas->getCurrentShape(), MShape::Rotate90CCW));
   }
-  else if (actionSender == mappingRotate180Action) {
+  else if (actionSender == layerRotate180Action) {
     undoStack->push(new RotateShapeCommand(destinationCanvas, TransformShapeCommand::FREE, destinationCanvas->getCurrentShape(), MShape::Rotate180));
   }
 
-  else if (actionSender == mappingHorizontalFlipAction) {
+  else if (actionSender == layerHorizontalFlipAction) {
     undoStack->push(new FlipShapeCommand(destinationCanvas, TransformShapeCommand::FREE, destinationCanvas->getCurrentShape(), MShape::Horizontal));
   }
-  else if (actionSender == mappingVerticalFlipAction) {
+  else if (actionSender == layerVerticalFlipAction) {
     undoStack->push(new FlipShapeCommand(destinationCanvas, TransformShapeCommand::FREE, destinationCanvas->getCurrentShape(), MShape::Vertical));
   }
 
 }
 
-void MainWindow::reorderMappingItem()
+void MainWindow::reorderLayerItem()
 {
   QAction *actionSender = qobject_cast<QAction *>(sender());
 
-  if (actionSender == mappingRaiseAction) {
-    undoStack->push(new MoveMappingCommand(this, getCurrentMappingId(), MM::Raise));
+  if (actionSender == layerRaiseAction) {
+    undoStack->push(new MoveLayerCommand(this, getCurrentLayerId(), MM::Raise));
   }
-  else if (actionSender == mappingLowerAction) {
-    undoStack->push(new MoveMappingCommand(this, getCurrentMappingId(), MM::Lower));
+  else if (actionSender == layerLowerAction) {
+    undoStack->push(new MoveLayerCommand(this, getCurrentLayerId(), MM::Lower));
   }
-  else if (actionSender == mappingRaiseToTopAction) {
-    undoStack->push(new MoveMappingCommand(this, getCurrentMappingId(), MM::Top));
+  else if (actionSender == layerRaiseToTopAction) {
+    undoStack->push(new MoveLayerCommand(this, getCurrentLayerId(), MM::Top));
   }
-  else if (actionSender == mappingLowerToBottomAction) {
-    undoStack->push(new MoveMappingCommand(this, getCurrentMappingId(), MM::Bottom));
+  else if (actionSender == layerLowerToBottomAction) {
+    undoStack->push(new MoveLayerCommand(this, getCurrentLayerId(), MM::Bottom));
   }
 }
 
-void MainWindow::renameMapping(uid mappingId, const QString &name)
+void MainWindow::renameLayer(uid layerId, const QString &name)
 {
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
-  Q_CHECK_PTR(mapping);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
+  Q_CHECK_PTR(layer);
 
-  if (!mapping.isNull()) {
-    QModelIndex index = mappingListModel->getIndexFromId(mappingId);
-    mappingListModel->setData(index, name, Qt::EditRole);
-    mapping->setName(name);
+  if (!layer.isNull()) {
+    QModelIndex index = layerListModel->getIndexFromId(layerId);
+    layerListModel->setData(index, name, Qt::EditRole);
+    layer->setName(name);
   }
 }
 
-//void MainWindow::mappingListEditEnd(QWidget *editor)
+//void MainWindow::layerListEditEnd(QWidget *editor)
 //{
 //  QString name = reinterpret_cast<QLineEdit*>(editor)->text();
-//  renameMapping(getItemId(*mappingList->currentItem()), name);
+//  renameMapping(getItemId(*layerList->currentItem()), name);
 //}
 
-void MainWindow::deletePaintItem()
+void MainWindow::deleteSourceItem()
 {
-  if(hasCurrentPaint())
+  if(hasCurrentSource())
   {
-    undoStack->push(new RemovePaintCommand(this, getCurrentPaintId()));
+    undoStack->push(new RemoveSourceCommand(this, getCurrentSourceId()));
   }
   else
   {
@@ -1040,30 +1040,30 @@ void MainWindow::deletePaintItem()
   }
 }
 
-void MainWindow::renamePaintItem()
+void MainWindow::renameSourceItem()
 {
   // Set current item editable and rename it
-  QListWidgetItem* item = paintList->currentItem();
+  QListWidgetItem* item = sourceList->currentItem();
   item->setFlags(item->flags() | Qt::ItemIsEditable);
   // Used by context menu
-  paintList->editItem(item);
-  // Switch to paint tab
-  contentTab->setCurrentWidget(paintSplitter);
+  sourceList->editItem(item);
+  // Switch to source tab
+  contentTab->setCurrentWidget(sourceSplitter);
 }
 
-void MainWindow::renamePaint(uid paintId, const QString &name)
+void MainWindow::renameSource(uid sourceId, const QString &name)
 {
-  Paint::ptr paint = mappingManager->getPaintById(paintId);
-  Q_CHECK_PTR(paint);
-  if (!paint.isNull()) {
-    paint->setName(name);
+  Source::ptr source = mappingManager->getSourceById(sourceId);
+  Q_CHECK_PTR(source);
+  if (!source.isNull()) {
+    source->setName(name);
   }
 }
 
-void MainWindow::paintListEditEnd(QWidget *editor)
+void MainWindow::sourceListEditEnd(QWidget *editor)
 {
   QString name = reinterpret_cast<QLineEdit*>(editor)->text();
-  renamePaint(getItemId(*paintList->currentItem()), name);
+  renameSource(getItemId(*sourceList->currentItem()), name);
 }
 
 void MainWindow::setupOutputScreen()
@@ -1108,29 +1108,29 @@ void MainWindow::openRecentVideo()
 
 bool MainWindow::clearProject()
 {
-  // Disconnect signals to avoid problems when clearning mappingList and paintList.
+  // Disconnect signals to avoid problems when clearning layerList and sourceList.
   disconnectProjectWidgets();
 
-  // Clear current paint / mapping.
-  removeCurrentPaint();
-  removeCurrentMapping();
+  // Clear current source / mapping.
+  removeCurrentSource();
+  removeCurrentLayer();
 
   // Empty list widgets.
-  mappingListModel->clear();
-  paintList->clear();
+  layerListModel->clear();
+  sourceList->clear();
 
   // Clear property panel.
-  for (int i=mappingPropertyPanel->count()-1; i>=0; i--)
-    mappingPropertyPanel->removeWidget(mappingPropertyPanel->widget(i));
+  for (int i=layerPropertyPanel->count()-1; i>=0; i--)
+    layerPropertyPanel->removeWidget(layerPropertyPanel->widget(i));
 
   // Disable property panel.
-  mappingPropertyPanel->setDisabled(true);
+  layerPropertyPanel->setDisabled(true);
 
-  // Clear list of mappers.
-  mappers.clear();
+  // Clear list of layerGuis.
+  layerGuis.clear();
 
-  // Clear list of paint guis.
-  paintGuis.clear();
+  // Clear list of source guis.
+  sourceGuis.clear();
 
   // Clear model.
   mappingManager->clearAll();
@@ -1148,81 +1148,81 @@ bool MainWindow::clearProject()
   return true;
 }
 
-uid MainWindow::createMediaPaint(uid paintId, QString uri, float x, float y,
+uid MainWindow::createMediaSource(uid sourceId, QString uri, float x, float y,
                                  bool isImage, VideoType type, double rate)
 {
   // Cannot create image with already existing id.
-  if (Paint::getUidAllocator().exists(paintId))
+  if (Source::getUidAllocator().exists(sourceId))
     return NULL_UID;
 
   else
   {
     Texture* tex = nullptr;
     if (isImage)
-      tex = new Image(uri, paintId);
+      tex = new Image(uri, sourceId);
     else {
-      tex = new Video(uri, type, rate, paintId);
+      tex = new Video(uri, type, rate, sourceId);
     }
 
     // Create new image with corresponding ID.
     tex->setPosition(x, y);
 
     // Add it to the manager.
-    Paint::ptr paint(tex);
+    Source::ptr source(tex);
 
     if (type == VIDEO_WEBCAM) {
-      paint->setName(tex->getCameraNameFromUri(uri));
+      source->setName(tex->getCameraNameFromUri(uri));
     } else {
-      paint->setName(strippedName(uri));
+      source->setName(strippedName(uri));
     }
 
-    // Add paint to model and return its uid.
-    uid id = mappingManager->addPaint(paint);
+    // Add source to model and return its uid.
+    uid id = mappingManager->addSource(source);
 
-    // Add paint widget item.
-    undoStack->push(new AddPaintCommand(this, id, paint->getIcon(), paint->getName()));
+    // Add source widget item.
+    undoStack->push(new AddSourceCommand(this, id, source->getIcon(), source->getName()));
     return id;
   }
 }
 
-uid MainWindow::createColorPaint(uid paintId, QColor color)
+uid MainWindow::createColorSource(uid sourceId, QColor color)
 {
   // Cannot create image with already existing id.
-  if (Paint::getUidAllocator().exists(paintId))
+  if (Source::getUidAllocator().exists(sourceId))
     return NULL_UID;
 
   else
   {
-    Color* img = new Color(color, paintId);
+    Color* img = new Color(color, sourceId);
 
     // Add it to the manager.
-    Paint::ptr paint(img);
-    paint->setName(strippedName(color.name()));
+    Source::ptr source(img);
+    source->setName(strippedName(color.name()));
 
-    // Add paint to model and return its uid.
-    uid id = mappingManager->addPaint(paint);
+    // Add source to model and return its uid.
+    uid id = mappingManager->addSource(source);
 
-    // Add paint widget item.
-    undoStack->push(new AddPaintCommand(this, id, paint->getIcon(), paint->getName()));
+    // Add source widget item.
+    undoStack->push(new AddSourceCommand(this, id, source->getIcon(), source->getName()));
 
     return id;
   }
 }
 
-uid MainWindow::createMeshTextureMapping(uid mappingId,
-                                         uid paintId,
+uid MainWindow::createMeshTextureLayer(uid layerId,
+                                         uid sourceId,
                                          int nColumns, int nRows,
                                          const QVector<QPointF> &src, const QVector<QPointF> &dst)
 {
-  // Cannot create element with already existing id or element for which no paint exists.
-  if (Mapping::getUidAllocator().exists(mappingId) ||
-      !Paint::getUidAllocator().exists(paintId) ||
-      paintId == NULL_UID)
+  // Cannot create element with already existing id or element for which no source exists.
+  if (Layer::getUidAllocator().exists(layerId) ||
+      !Source::getUidAllocator().exists(sourceId) ||
+      sourceId == NULL_UID)
     return NULL_UID;
 
   else
   {
-    Paint::ptr paint = mappingManager->getPaintById(paintId);
+    Source::ptr source = mappingManager->getSourceById(sourceId);
     int nVertices = nColumns * nRows;
     qDebug() << nVertices << " vs " << nColumns << "x" << nRows << " vs " << src.size() << " " << dst.size() << Qt::endl;
     Q_ASSERT(src.size() == nVertices && dst.size() == nVertices);
@@ -1231,158 +1231,158 @@ uid MainWindow::createMeshTextureMapping(uid mappingId,
     MShape::ptr outputMesh(new Mesh(dst, nColumns, nRows));
 
     // Add it to the manager.
-    Mapping::ptr mapping(new TextureMapping(paint, outputMesh, inputMesh, mappingId));
-    uid id = mappingManager->addMapping(mapping);
+    Layer::ptr layer(new TextureLayer(source, outputMesh, inputMesh, layerId));
+    uid id = mappingManager->addLayer(layer);
 
     // Add it to the GUI.
-    addMappingItem(mappingId);
+    addLayerItem(layerId);
 
     // Return the id.
     return id;
   }
 }
 
-uid MainWindow::createTriangleTextureMapping(uid mappingId,
-                                             uid paintId,
+uid MainWindow::createTriangleTextureLayer(uid layerId,
+                                             uid sourceId,
                                              const QVector<QPointF> &src, const QVector<QPointF> &dst)
 {
-  // Cannot create element with already existing id or element for which no paint exists.
-  if (Mapping::getUidAllocator().exists(mappingId) ||
-      !Paint::getUidAllocator().exists(paintId) ||
-      paintId == NULL_UID)
+  // Cannot create element with already existing id or element for which no source exists.
+  if (Layer::getUidAllocator().exists(layerId) ||
+      !Source::getUidAllocator().exists(sourceId) ||
+      sourceId == NULL_UID)
     return NULL_UID;
 
   else
   {
-    Paint::ptr paint = mappingManager->getPaintById(paintId);
+    Source::ptr source = mappingManager->getSourceById(sourceId);
     Q_ASSERT(src.size() == 3 && dst.size() == 3);
 
     MShape::ptr inputTriangle( new Triangle(src[0], src[1], src[2]));
     MShape::ptr outputTriangle(new Triangle(dst[0], dst[1], dst[2]));
 
     // Add it to the manager.
-    Mapping::ptr mapping(new TextureMapping(paint, outputTriangle, inputTriangle, mappingId));
-    uid id = mappingManager->addMapping(mapping);
+    Layer::ptr layer(new TextureLayer(source, outputTriangle, inputTriangle, layerId));
+    uid id = mappingManager->addLayer(layer);
 
     // Add it to the GUI.
-    addMappingItem(mappingId);
+    addLayerItem(layerId);
 
     // Return the id.
     return id;
   }
 }
 
-uid MainWindow::createEllipseTextureMapping(uid mappingId,
-                                            uid paintId,
+uid MainWindow::createEllipseTextureLayer(uid layerId,
+                                            uid sourceId,
                                             const QVector<QPointF> &src, const QVector<QPointF> &dst)
 {
-  // Cannot create element with already existing id or element for which no paint exists.
-  if (Mapping::getUidAllocator().exists(mappingId) ||
-      !Paint::getUidAllocator().exists(paintId) ||
-      paintId == NULL_UID)
+  // Cannot create element with already existing id or element for which no source exists.
+  if (Layer::getUidAllocator().exists(layerId) ||
+      !Source::getUidAllocator().exists(sourceId) ||
+      sourceId == NULL_UID)
     return NULL_UID;
 
   else
   {
-    Paint::ptr paint = mappingManager->getPaintById(paintId);
+    Source::ptr source = mappingManager->getSourceById(sourceId);
     Q_ASSERT(src.size() == 5 && dst.size() == 5);
 
     MShape::ptr inputEllipse( new Ellipse(src[0], src[1], src[2], src[3], src[4]));
     MShape::ptr outputEllipse(new Ellipse(dst[0], dst[1], dst[2], dst[3], dst[4]));
 
     // Add it to the manager.
-    Mapping::ptr mapping(new TextureMapping(paint, outputEllipse, inputEllipse, mappingId));
-    uid id = mappingManager->addMapping(mapping);
+    Layer::ptr layer(new TextureLayer(source, outputEllipse, inputEllipse, layerId));
+    uid id = mappingManager->addLayer(layer);
 
     // Add it to the GUI.
-    addMappingItem(mappingId);
+    addLayerItem(layerId);
 
     // Return the id.
     return id;
   }
 }
 
-uid MainWindow::createQuadColorMapping(uid mappingId,
-                                       uid paintId,
+uid MainWindow::createQuadColorLayer(uid layerId,
+                                       uid sourceId,
                                        const QVector<QPointF> &dst)
 {
-  // Cannot create element with already existing id or element for which no paint exists.
-  if (Mapping::getUidAllocator().exists(mappingId) ||
-      !Paint::getUidAllocator().exists(paintId) ||
-      paintId == NULL_UID)
+  // Cannot create element with already existing id or element for which no source exists.
+  if (Layer::getUidAllocator().exists(layerId) ||
+      !Source::getUidAllocator().exists(sourceId) ||
+      sourceId == NULL_UID)
     return NULL_UID;
 
   else
   {
-    Paint::ptr paint = mappingManager->getPaintById(paintId);
+    Source::ptr source = mappingManager->getSourceById(sourceId);
     Q_ASSERT(dst.size() == 4);
 
     MShape::ptr outputQuad(new Quad(dst[0], dst[1], dst[2], dst[3]));
 
     // Add it to the manager.
-    Mapping::ptr mapping(new ColorMapping(paint, outputQuad, mappingId));
-    uid id = mappingManager->addMapping(mapping);
+    Layer::ptr layer(new ColorLayer(source, outputQuad, layerId));
+    uid id = mappingManager->addLayer(layer);
 
     // Add it to the GUI.
-    addMappingItem(mappingId);
+    addLayerItem(layerId);
 
     // Return the id.
     return id;
   }
 }
 
-uid MainWindow::createTriangleColorMapping(uid mappingId,
-                                           uid paintId,
+uid MainWindow::createTriangleColorLayer(uid layerId,
+                                           uid sourceId,
                                            const QVector<QPointF> &dst)
 {
-  // Cannot create element with already existing id or element for which no paint exists.
-  if (Mapping::getUidAllocator().exists(mappingId) ||
-      !Paint::getUidAllocator().exists(paintId) ||
-      paintId == NULL_UID)
+  // Cannot create element with already existing id or element for which no source exists.
+  if (Layer::getUidAllocator().exists(layerId) ||
+      !Source::getUidAllocator().exists(sourceId) ||
+      sourceId == NULL_UID)
     return NULL_UID;
 
   else
   {
-    Paint::ptr paint = mappingManager->getPaintById(paintId);
+    Source::ptr source = mappingManager->getSourceById(sourceId);
     Q_ASSERT(dst.size() == 3);
 
     MShape::ptr outputTriangle(new Triangle(dst[0], dst[1], dst[2]));
 
     // Add it to the manager.
-    Mapping::ptr mapping(new ColorMapping(paint, outputTriangle, mappingId));
-    uid id = mappingManager->addMapping(mapping);
+    Layer::ptr layer(new ColorLayer(source, outputTriangle, layerId));
+    uid id = mappingManager->addLayer(layer);
 
     // Add it to the GUI.
-    addMappingItem(mappingId);
+    addLayerItem(layerId);
 
     // Return the id.
     return id;
   }
 }
 
-uid MainWindow::createEllipseColorMapping(uid mappingId,
-                                          uid paintId,
+uid MainWindow::createEllipseColorLayer(uid layerId,
+                                          uid sourceId,
                                           const QVector<QPointF> &dst)
 {
-  // Cannot create element with already existing id or element for which no paint exists.
-  if (Mapping::getUidAllocator().exists(mappingId) ||
-      !Paint::getUidAllocator().exists(paintId) ||
-      paintId == NULL_UID)
+  // Cannot create element with already existing id or element for which no source exists.
+  if (Layer::getUidAllocator().exists(layerId) ||
+      !Source::getUidAllocator().exists(sourceId) ||
+      sourceId == NULL_UID)
     return NULL_UID;
 
   else
   {
-    Paint::ptr paint = mappingManager->getPaintById(paintId);
+    Source::ptr source = mappingManager->getSourceById(sourceId);
     Q_ASSERT(dst.size() == 4);
 
     MShape::ptr outputEllipse(new Ellipse(dst[0], dst[1], dst[2], dst[3]));
 
     // Add it to the manager.
-    Mapping::ptr mapping(new ColorMapping(paint, outputEllipse, mappingId));
-    uid id = mappingManager->addMapping(mapping);
+    Layer::ptr layer(new ColorLayer(source, outputEllipse, layerId));
+    uid id = mappingManager->addLayer(layer);
 
     // Add it to the GUI.
-    addMappingItem(mappingId);
+    addLayerItem(layerId);
 
     // Return the id.
     return id;
@@ -1390,92 +1390,92 @@ uid MainWindow::createEllipseColorMapping(uid mappingId,
 }
 
 
-void MainWindow::setMappingVisible(uid mappingId, bool visible)
+void MainWindow::setLayerVisible(uid layerId, bool visible)
 {
   // Set mapping visibility
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
 
-  if (mapping.isNull())
+  if (layer.isNull())
   {
     qDebug() << "No such mapping id" << Qt::endl;
   }
   else
   {
-    mapping->setVisible(visible);
+    layer->setVisible(visible);
     // Change list item check state
-    QModelIndex index = mappingListModel->getIndexFromId(mappingId);
-    mappingListModel->setData(index, visible, Qt::CheckStateRole);
+    QModelIndex index = layerListModel->getIndexFromId(layerId);
+    layerListModel->setData(index, visible, Qt::CheckStateRole);
     // Update canvases.
     updateCanvases();
   }
 }
 
-void MainWindow::setMappingSolo(uid mappingId, bool solo)
+void MainWindow::setLayerSolo(uid layerId, bool solo)
 {
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
-  if (!mapping.isNull()) {
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
+  if (!layer.isNull()) {
     // Turn this mapping into solo mode
-    mapping->setSolo(solo);
+    layer->setSolo(solo);
     // Change list item check state
-    QModelIndex index = mappingListModel->getIndexFromId(mappingId);
-    mappingListModel->setData(index, solo, Qt::CheckStateRole + 1);
+    QModelIndex index = layerListModel->getIndexFromId(layerId);
+    layerListModel->setData(index, solo, Qt::CheckStateRole + 1);
     // Update canvases
     updateCanvases();
   }
 }
 
-void MainWindow::setMappingLocked(uid mappingId, bool locked)
+void MainWindow::setLayerLocked(uid layerId, bool locked)
 {
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
 
-  if (!mapping.isNull()) {
+  if (!layer.isNull()) {
     // Lock position of mapping
-    mapping->setLocked(locked);
+    layer->setLocked(locked);
     // Lock shape too.
-    mapping->getShape()->setLocked(locked);
+    layer->getShape()->setLocked(locked);
     // Change list item check state
-    QModelIndex index = mappingListModel->getIndexFromId(mappingId);
-    mappingListModel->setData(index, locked, Qt::CheckStateRole + 2);
+    QModelIndex index = layerListModel->getIndexFromId(layerId);
+    layerListModel->setData(index, locked, Qt::CheckStateRole + 2);
     // Update canvases
     updateCanvases();
   }
 }
 
-void MainWindow::deleteMapping(uid mappingId)
+void MainWindow::deleteLayer(uid layerId)
 {
   // Cannot delete unexisting mapping.
-  if (Mapping::getUidAllocator().exists(mappingId))
+  if (Layer::getUidAllocator().exists(layerId))
   {
-    removeMappingItem(mappingId);
+    removeLayerItem(layerId);
   }
 }
 
-void MainWindow::moveMapping(uid mappingId, int idx)
+void MainWindow::moveLayer(uid layerId, int idx)
 {
   // Cannot delete unexisting mapping.
-  if (Mapping::getUidAllocator().exists(mappingId))
+  if (Layer::getUidAllocator().exists(layerId))
   {
-    moveMappingItem(mappingId, idx);
+    moveLayerItem(layerId, idx);
   }
 }
 
-void MainWindow::duplicateMapping(uid mappingId)
+void MainWindow::duplicateLayer(uid layerId)
 {
   // Clone current Mapping.
-  Mapping::ptr clonedMappingPtr(mappingManager->getMappingById(mappingId)->clone());
+  Layer::ptr clonedMappingPtr(mappingManager->getLayerById(layerId)->clone());
 
   // Get duplicated mapping id
-  uid cloneId = mappingManager->addMapping(clonedMappingPtr);
+  uid cloneId = mappingManager->addLayer(clonedMappingPtr);
 
   // Lets the undo-stack handle Undo/Redo the duplication of mapping item.
-  undoStack->push(new DuplicateMappingCommand(this, cloneId));
+  undoStack->push(new DuplicateLayerCommand(this, cloneId));
 }
 
-/// Deletes/removes a paint and all associated mappigns.
-void MainWindow::deletePaint(uid paintId, bool replace)
+/// Deletes/removes a source and all associated mappigns.
+void MainWindow::deleteSource(uid sourceId, bool replace)
 {
-  // Cannot delete unexisting paint.
-  if (Paint::getUidAllocator().exists(paintId))
+  // Cannot delete unexisting source.
+  if (Source::getUidAllocator().exists(sourceId))
   {
     if (replace == false) {
       int r = QMessageBox::warning(this, tr("MapMap"),
@@ -1483,11 +1483,11 @@ void MainWindow::deletePaint(uid paintId, bool replace)
                                    QMessageBox::Ok | QMessageBox::Cancel);
       if (r == QMessageBox::Ok)
       {
-        removePaintItem(paintId);
+        removeSourceItem(sourceId);
       }
     }
     else
-      removePaintItem(paintId);
+      removeSourceItem(sourceId);
   }
 }
 
@@ -1500,49 +1500,49 @@ void MainWindow::windowModified()
 
 void MainWindow::createLayout()
 {
-  // Create paint list.
-  paintList = new QListWidget;
-  paintList->setSelectionMode(QAbstractItemView::SingleSelection);
-  paintList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-  paintList->setDefaultDropAction(Qt::MoveAction);
-  paintList->setDragDropMode(QAbstractItemView::InternalMove);
-  paintList->setMinimumWidth(PAINT_LIST_MINIMUM_HEIGHT);
+  // Create source list.
+  sourceList = new QListWidget;
+  sourceList->setSelectionMode(QAbstractItemView::SingleSelection);
+  sourceList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+  sourceList->setDefaultDropAction(Qt::MoveAction);
+  sourceList->setDragDropMode(QAbstractItemView::InternalMove);
+  sourceList->setMinimumWidth(PAINT_LIST_MINIMUM_HEIGHT);
 
-  // Create paint panel.
-  paintPropertyPanel = new QStackedWidget;
-  paintPropertyPanel->setDisabled(true);
-  paintPropertyPanel->setMinimumHeight(PAINT_PROPERTY_PANEL_MINIMUM_HEIGHT);
+  // Create source panel.
+  sourcePropertyPanel = new QStackedWidget;
+  sourcePropertyPanel->setDisabled(true);
+  sourcePropertyPanel->setMinimumHeight(PAINT_PROPERTY_PANEL_MINIMUM_HEIGHT);
 
   // Create mapping list.
-  mappingList = new QTableView;
-  mappingList->setSelectionMode(QAbstractItemView::SingleSelection);
-  mappingList->setSelectionBehavior(QAbstractItemView::SelectRows);
-  mappingList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-  mappingList->setDragEnabled(true);
-  mappingList->setAcceptDrops(true);
-  mappingList->setDropIndicatorShown(true);
-  mappingList->setEditTriggers(QAbstractItemView::DoubleClicked);
-  mappingList->setMinimumHeight(MAPPING_LIST_MINIMUM_HEIGHT);
-  mappingList->setContentsMargins(0, 0, 0, 0);
+  layerList = new QTableView;
+  layerList->setSelectionMode(QAbstractItemView::SingleSelection);
+  layerList->setSelectionBehavior(QAbstractItemView::SelectRows);
+  layerList->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+  layerList->setDragEnabled(true);
+  layerList->setAcceptDrops(true);
+  layerList->setDropIndicatorShown(true);
+  layerList->setEditTriggers(QAbstractItemView::DoubleClicked);
+  layerList->setMinimumHeight(MAPPING_LIST_MINIMUM_HEIGHT);
+  layerList->setContentsMargins(0, 0, 0, 0);
   // Set view delegate
-  mappingListModel = new MappingListModel;
-  mappingItemDelegate = new MappingItemDelegate;
-  mappingList->setModel(mappingListModel);
-  mappingList->setItemDelegate(mappingItemDelegate);
+  layerListModel = new LayerListModel;
+  layerItemDelegate = new LayerItemDelegate;
+  layerList->setModel(layerListModel);
+  layerList->setItemDelegate(layerItemDelegate);
   // Pimp Mapping table widget
-  mappingList->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-  mappingList->setShowGrid(false);
-  mappingList->horizontalHeader()->hide();
-  mappingList->verticalHeader()->hide();
-  mappingList->setMouseTracking(true);// Important
-  mappingList->setColumnWidth(0, MM::MAPPING_LIST_HIDE_COLUMN);
-  mappingList->setColumnWidth(1, MM::MAPPING_LIST_NAME_COLUMN);
-  mappingList->setColumnWidth(2, MM::MAPPING_LIST_BUTTONS_COLUMN);
+  layerList->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+  layerList->setShowGrid(false);
+  layerList->horizontalHeader()->hide();
+  layerList->verticalHeader()->hide();
+  layerList->setMouseTracking(true);// Important
+  layerList->setColumnWidth(0, MM::MAPPING_LIST_HIDE_COLUMN);
+  layerList->setColumnWidth(1, MM::MAPPING_LIST_NAME_COLUMN);
+  layerList->setColumnWidth(2, MM::MAPPING_LIST_BUTTONS_COLUMN);
 
   // Create property panel.
-  mappingPropertyPanel = new QStackedWidget;
-  mappingPropertyPanel->setDisabled(true);
-  mappingPropertyPanel->setMinimumHeight(MAPPING_PROPERTY_PANEL_MINIMUM_HEIGHT);
+  layerPropertyPanel = new QStackedWidget;
+  layerPropertyPanel->setDisabled(true);
+  layerPropertyPanel->setMinimumHeight(MAPPING_PROPERTY_PANEL_MINIMUM_HEIGHT);
 
   // Create canvases.
   sourceCanvas = new MapperGLCanvas(this, false);
@@ -1604,20 +1604,20 @@ void MainWindow::createLayout()
   _shortcutWindow->setVisible(false);
 
   // Create layout.
-  paintSplitter = new QSplitter(Qt::Vertical);
-  paintSplitter->setChildrenCollapsible(false);
-  paintSplitter->addWidget(paintList);
-  paintSplitter->addWidget(paintPropertyPanel);
+  sourceSplitter = new QSplitter(Qt::Vertical);
+  sourceSplitter->setChildrenCollapsible(false);
+  sourceSplitter->addWidget(sourceList);
+  sourceSplitter->addWidget(sourcePropertyPanel);
 
-  mappingSplitter = new QSplitter(Qt::Vertical);
-  mappingSplitter->setChildrenCollapsible(false);
-  mappingSplitter->addWidget(mappingList);
-  mappingSplitter->addWidget(mappingPropertyPanel);
+  layerSplitter = new QSplitter(Qt::Vertical);
+  layerSplitter->setChildrenCollapsible(false);
+  layerSplitter->addWidget(layerList);
+  layerSplitter->addWidget(layerPropertyPanel);
 
   // Content tab.
   contentTab = new QTabWidget;
-  contentTab->addTab(paintSplitter, QIcon(":/add-video"), tr("Library"));
-  contentTab->addTab(mappingSplitter, QIcon(":/add-mesh"), tr("Layers"));
+  contentTab->addTab(sourceSplitter, QIcon(":/add-video"), tr("Library"));
+  contentTab->addTab(layerSplitter, QIcon(":/add-mesh"), tr("Layers"));
 
   canvasSplitter = new QSplitter(Qt::Vertical);
   canvasSplitter->addWidget(sourcePanel);
@@ -1626,7 +1626,7 @@ void MainWindow::createLayout()
   mainSplitter = new QSplitter(Qt::Horizontal);
   mainSplitter->addWidget(canvasSplitter);
   mainSplitter->addWidget(contentTab);
-  connect(mainSplitter, SIGNAL(splitterMoved(int, int)), this, SLOT(updateMappingListColumnWidth()));
+  connect(mainSplitter, SIGNAL(splitterMoved(int, int)), this, SLOT(updateLayerListColumnWidth()));
 
   // Initialize size to 9:1 proportions.
   QSize sz = mainSplitter->size();
@@ -1643,7 +1643,7 @@ void MainWindow::createLayout()
   resize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
   setCentralWidget(mainSplitter);
 
-  // Connect mapping and paint lists signals and slots.
+  // Connect mapping and source lists signals and slots.
   connectProjectWidgets();
 
   // Reset focus on main window.
@@ -1743,7 +1743,7 @@ void MainWindow::createActions()
   addColorAction = new QAction(tr("Add &Color Source..."), this);
   addColorAction->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
   addColorAction->setIcon(QIcon(":/add-color"));
-  addColorAction->setToolTip(tr("Add a color paint..."));
+  addColorAction->setToolTip(tr("Add a color source..."));
   addColorAction->setIconVisibleInMenu(false);
   addColorAction->setShortcutContext(Qt::ApplicationShortcut);
   addAction(addColorAction);
@@ -1781,161 +1781,161 @@ void MainWindow::createActions()
   connect(aboutAction, SIGNAL(triggered()), this, SLOT(about()));
 
   // Duplicate.
-  duplicateMappingAction = new QAction(tr("Duplicate Layer"), this);
-  duplicateMappingAction->setShortcut(Qt::CTRL | Qt::Key_D);
-  duplicateMappingAction->setToolTip(tr("Duplicate layer item"));
-  duplicateMappingAction->setIconVisibleInMenu(false);
-  duplicateMappingAction->setEnabled(false);
-  duplicateMappingAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(duplicateMappingAction);
-  connect(duplicateMappingAction, SIGNAL(triggered()), this, SLOT(duplicateMappingItem()));
+  duplicateLayerAction = new QAction(tr("Duplicate Layer"), this);
+  duplicateLayerAction->setShortcut(Qt::CTRL | Qt::Key_D);
+  duplicateLayerAction->setToolTip(tr("Duplicate layer item"));
+  duplicateLayerAction->setIconVisibleInMenu(false);
+  duplicateLayerAction->setEnabled(false);
+  duplicateLayerAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(duplicateLayerAction);
+  connect(duplicateLayerAction, SIGNAL(triggered()), this, SLOT(duplicateLayerItem()));
 
   // Delete mapping.
-  deleteMappingAction = new QAction(tr("Delete Layer"), this);
-  deleteMappingAction->setShortcut(QKeySequence::Delete);
-  deleteMappingAction->setToolTip(tr("Delete layer item"));
-  deleteMappingAction->setIconVisibleInMenu(false);
-  deleteMappingAction->setEnabled(false);
-  deleteMappingAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(deleteMappingAction);
-  connect(deleteMappingAction, SIGNAL(triggered()), this, SLOT(deleteMappingItem()));
+  deleteLayerAction = new QAction(tr("Delete Layer"), this);
+  deleteLayerAction->setShortcut(QKeySequence::Delete);
+  deleteLayerAction->setToolTip(tr("Delete layer item"));
+  deleteLayerAction->setIconVisibleInMenu(false);
+  deleteLayerAction->setEnabled(false);
+  deleteLayerAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(deleteLayerAction);
+  connect(deleteLayerAction, SIGNAL(triggered()), this, SLOT(deleteLayerItem()));
 
   // Rename mapping.
-  renameMappingAction = new QAction(tr("Rename Layer"), this);
-  renameMappingAction->setShortcut(Qt::Key_F2);
-  renameMappingAction->setToolTip(tr("Rename layer item"));
-  renameMappingAction->setIconVisibleInMenu(false);
-  renameMappingAction->setEnabled(false);
-  renameMappingAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(renameMappingAction);
-  connect(renameMappingAction, SIGNAL(triggered()), this, SLOT(renameMappingItem()));
+  renameLayerAction = new QAction(tr("Rename Layer"), this);
+  renameLayerAction->setShortcut(Qt::Key_F2);
+  renameLayerAction->setToolTip(tr("Rename layer item"));
+  renameLayerAction->setIconVisibleInMenu(false);
+  renameLayerAction->setEnabled(false);
+  renameLayerAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(renameLayerAction);
+  connect(renameLayerAction, SIGNAL(triggered()), this, SLOT(renameLayerItem()));
 
   // Lock mapping.
-  mappingLockedAction = new QAction(tr("Lock Layer"), this);
-  mappingLockedAction->setToolTip(tr("Lock layer item"));
-  mappingLockedAction->setIconVisibleInMenu(false);
-  mappingLockedAction->setCheckable(true);
-  mappingLockedAction->setChecked(false);
-  mappingLockedAction->setEnabled(false);
-  mappingLockedAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(mappingLockedAction);
-  connect(mappingLockedAction, SIGNAL(triggered(bool)), this, SLOT(setMappingItemLocked(bool)));
+  layerLockedAction = new QAction(tr("Lock Layer"), this);
+  layerLockedAction->setToolTip(tr("Lock layer item"));
+  layerLockedAction->setIconVisibleInMenu(false);
+  layerLockedAction->setCheckable(true);
+  layerLockedAction->setChecked(false);
+  layerLockedAction->setEnabled(false);
+  layerLockedAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(layerLockedAction);
+  connect(layerLockedAction, SIGNAL(triggered(bool)), this, SLOT(setLayerItemLocked(bool)));
 
   // Hide mapping.
-  mappingHideAction = new QAction(tr("Hide Layer"), this);
-  mappingHideAction->setToolTip(tr("Hide layer item"));
-  mappingHideAction->setIconVisibleInMenu(false);
-  mappingHideAction->setCheckable(true);
-  mappingHideAction->setChecked(false);
-  mappingHideAction->setEnabled(false);
-  mappingHideAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(mappingHideAction);
-  connect(mappingHideAction, SIGNAL(triggered(bool)), this, SLOT(setMappingItemHide(bool)));
+  layerHideAction = new QAction(tr("Hide Layer"), this);
+  layerHideAction->setToolTip(tr("Hide layer item"));
+  layerHideAction->setIconVisibleInMenu(false);
+  layerHideAction->setCheckable(true);
+  layerHideAction->setChecked(false);
+  layerHideAction->setEnabled(false);
+  layerHideAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(layerHideAction);
+  connect(layerHideAction, SIGNAL(triggered(bool)), this, SLOT(setLayerItemHide(bool)));
 
   // Solo mapping.
-  mappingSoloAction = new QAction(tr("Solo Layer"), this);
-  mappingSoloAction->setToolTip(tr("Solo layer item"));
-  mappingSoloAction->setIconVisibleInMenu(false);
-  mappingSoloAction->setCheckable(true);
-  mappingSoloAction->setChecked(false);
-  mappingSoloAction->setEnabled(false);
-  mappingSoloAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(mappingSoloAction);
-  connect(mappingSoloAction, SIGNAL(triggered(bool)), this, SLOT(setMappingItemSolo(bool)));
+  layerSoloAction = new QAction(tr("Solo Layer"), this);
+  layerSoloAction->setToolTip(tr("Solo layer item"));
+  layerSoloAction->setIconVisibleInMenu(false);
+  layerSoloAction->setCheckable(true);
+  layerSoloAction->setChecked(false);
+  layerSoloAction->setEnabled(false);
+  layerSoloAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(layerSoloAction);
+  connect(layerSoloAction, SIGNAL(triggered(bool)), this, SLOT(setLayerItemSolo(bool)));
 
   // Rotate 90 degrees CW action.
-  mappingRotate90CWAction = new QAction(tr("Rotate 90° CW"), this);
-  mappingRotate90CWAction->setToolTip(tr("Rotate 90° CW"));
-  mappingRotate90CWAction->setIconVisibleInMenu(true);
-  mappingRotate90CWAction->setEnabled(false);
-  addAction(mappingRotate90CWAction);
-  connect(mappingRotate90CWAction, SIGNAL(triggered()), SLOT(transformActionMappingItem()));
+  layerRotate90CWAction = new QAction(tr("Rotate 90° CW"), this);
+  layerRotate90CWAction->setToolTip(tr("Rotate 90° CW"));
+  layerRotate90CWAction->setIconVisibleInMenu(true);
+  layerRotate90CWAction->setEnabled(false);
+  addAction(layerRotate90CWAction);
+  connect(layerRotate90CWAction, SIGNAL(triggered()), SLOT(transformActionLayerItem()));
 
   // Rotate 90 degrees CW action.
-  mappingRotate90CCWAction = new QAction(tr("Rotate 90° CW"), this);
-  mappingRotate90CCWAction->setToolTip(tr("Rotate 90° CW"));
-  mappingRotate90CCWAction->setIconVisibleInMenu(true);
-  mappingRotate90CCWAction->setEnabled(false);
-  addAction(mappingRotate90CCWAction);
-  connect(mappingRotate90CCWAction, SIGNAL(triggered()), SLOT(transformActionMappingItem()));
+  layerRotate90CCWAction = new QAction(tr("Rotate 90° CW"), this);
+  layerRotate90CCWAction->setToolTip(tr("Rotate 90° CW"));
+  layerRotate90CCWAction->setIconVisibleInMenu(true);
+  layerRotate90CCWAction->setEnabled(false);
+  addAction(layerRotate90CCWAction);
+  connect(layerRotate90CCWAction, SIGNAL(triggered()), SLOT(transformActionLayerItem()));
 
   // Rotate 180 degrees action.
-  mappingRotate180Action = new QAction(tr("Rotate 180°"), this);
-  mappingRotate180Action->setToolTip(tr("Rotate 180°"));
-  mappingRotate180Action->setIconVisibleInMenu(true);
-  mappingRotate180Action->setEnabled(false);
-  addAction(mappingRotate180Action);
-  connect(mappingRotate180Action, SIGNAL(triggered()), SLOT(transformActionMappingItem()));
+  layerRotate180Action = new QAction(tr("Rotate 180°"), this);
+  layerRotate180Action->setToolTip(tr("Rotate 180°"));
+  layerRotate180Action->setIconVisibleInMenu(true);
+  layerRotate180Action->setEnabled(false);
+  addAction(layerRotate180Action);
+  connect(layerRotate180Action, SIGNAL(triggered()), SLOT(transformActionLayerItem()));
 
   // Horizontal Flip Action
-  mappingHorizontalFlipAction = new QAction(tr("Flip Horizontally"), this);
-  mappingHorizontalFlipAction->setShortcut(Qt::Key_H);
-  mappingHorizontalFlipAction->setToolTip(tr("Flip Horizontally"));
-  mappingHorizontalFlipAction->setIconVisibleInMenu(true);
-  mappingHorizontalFlipAction->setEnabled(false);
-  addAction(mappingHorizontalFlipAction);
-  connect(mappingHorizontalFlipAction, SIGNAL(triggered()), SLOT(transformActionMappingItem()));
+  layerHorizontalFlipAction = new QAction(tr("Flip Horizontally"), this);
+  layerHorizontalFlipAction->setShortcut(Qt::Key_H);
+  layerHorizontalFlipAction->setToolTip(tr("Flip Horizontally"));
+  layerHorizontalFlipAction->setIconVisibleInMenu(true);
+  layerHorizontalFlipAction->setEnabled(false);
+  addAction(layerHorizontalFlipAction);
+  connect(layerHorizontalFlipAction, SIGNAL(triggered()), SLOT(transformActionLayerItem()));
 
   // Vertical Flip Action
-  mappingVerticalFlipAction = new QAction(tr("Flip Vertically"), this);
-  mappingVerticalFlipAction->setShortcut(Qt::Key_V);
-  mappingVerticalFlipAction->setToolTip(tr("Flip Vertically"));
-  mappingVerticalFlipAction->setIconVisibleInMenu(true);
-  mappingVerticalFlipAction->setEnabled(false);
-  addAction(mappingVerticalFlipAction);
-  connect(mappingVerticalFlipAction, SIGNAL(triggered()), SLOT(transformActionMappingItem()));
-
-  mappingRaiseAction = new QAction(tr("Raise"), this);
-  mappingRaiseAction->setShortcut(Qt::Key_PageUp);
-  mappingRaiseAction->setToolTip(tr("Raise"));
-  mappingRaiseAction->setIconVisibleInMenu(true);
-  mappingRaiseAction->setEnabled(false);
-  addAction(mappingRaiseAction);
-  connect(mappingRaiseAction, SIGNAL(triggered()), SLOT(reorderMappingItem()));
-
-  mappingLowerAction = new QAction(tr("Lower"), this);
-  mappingLowerAction->setShortcut(Qt::Key_PageDown);
-  mappingLowerAction->setToolTip(tr("Lower"));
-  mappingLowerAction->setIconVisibleInMenu(true);
-  mappingLowerAction->setEnabled(false);
-  addAction(mappingLowerAction);
-  connect(mappingLowerAction, SIGNAL(triggered()), SLOT(reorderMappingItem()));
-
-  mappingRaiseToTopAction = new QAction(tr("Raise to Top"), this);
-  mappingRaiseToTopAction->setShortcut(Qt::Key_Home); // bottom = end
-  mappingRaiseToTopAction->setToolTip(tr("Raise to top"));
-  mappingRaiseToTopAction->setIconVisibleInMenu(true);
-  mappingRaiseToTopAction->setEnabled(false);
-  addAction(mappingRaiseToTopAction);
-  connect(mappingRaiseToTopAction, SIGNAL(triggered()), SLOT(reorderMappingItem()));
-
-  mappingLowerToBottomAction = new QAction(tr("Lower to Bottom"), this);
-  mappingLowerToBottomAction->setShortcut(Qt::Key_End);
-  mappingLowerToBottomAction->setToolTip(tr("Lower to bottom"));
-  mappingLowerToBottomAction->setIconVisibleInMenu(true);
-  mappingLowerToBottomAction->setEnabled(false);
-  addAction(mappingLowerToBottomAction);
-  connect(mappingLowerToBottomAction, SIGNAL(triggered()), SLOT(reorderMappingItem()));
-
-  // Delete paint.
-  deletePaintAction = new QAction(tr("Delete Source"), this);
-  //deletePaintAction->setShortcut(tr("CTRL+DEL"));
-  deletePaintAction->setToolTip(tr("Delete source item"));
-  deletePaintAction->setIconVisibleInMenu(false);
-  deletePaintAction->setEnabled(false);
-  deletePaintAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(deletePaintAction);
-  connect(deletePaintAction, SIGNAL(triggered()), this, SLOT(deletePaintItem()));
-
-  // Rename paint.
-  renamePaintAction = new QAction(tr("Rename Source"), this);
-  //renamePaintAction->setShortcut(Qt::Key_F2);
-  renamePaintAction->setToolTip(tr("Rename source item"));
-  renamePaintAction->setIconVisibleInMenu(false);
-  renamePaintAction->setEnabled(false);
-  renamePaintAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(renamePaintAction);
-  connect(renamePaintAction, SIGNAL(triggered()), this, SLOT(renamePaintItem()));
+  layerVerticalFlipAction = new QAction(tr("Flip Vertically"), this);
+  layerVerticalFlipAction->setShortcut(Qt::Key_V);
+  layerVerticalFlipAction->setToolTip(tr("Flip Vertically"));
+  layerVerticalFlipAction->setIconVisibleInMenu(true);
+  layerVerticalFlipAction->setEnabled(false);
+  addAction(layerVerticalFlipAction);
+  connect(layerVerticalFlipAction, SIGNAL(triggered()), SLOT(transformActionLayerItem()));
+
+  layerRaiseAction = new QAction(tr("Raise"), this);
+  layerRaiseAction->setShortcut(Qt::Key_PageUp);
+  layerRaiseAction->setToolTip(tr("Raise"));
+  layerRaiseAction->setIconVisibleInMenu(true);
+  layerRaiseAction->setEnabled(false);
+  addAction(layerRaiseAction);
+  connect(layerRaiseAction, SIGNAL(triggered()), SLOT(reorderLayerItem()));
+
+  layerLowerAction = new QAction(tr("Lower"), this);
+  layerLowerAction->setShortcut(Qt::Key_PageDown);
+  layerLowerAction->setToolTip(tr("Lower"));
+  layerLowerAction->setIconVisibleInMenu(true);
+  layerLowerAction->setEnabled(false);
+  addAction(layerLowerAction);
+  connect(layerLowerAction, SIGNAL(triggered()), SLOT(reorderLayerItem()));
+
+  layerRaiseToTopAction = new QAction(tr("Raise to Top"), this);
+  layerRaiseToTopAction->setShortcut(Qt::Key_Home); // bottom = end
+  layerRaiseToTopAction->setToolTip(tr("Raise to top"));
+  layerRaiseToTopAction->setIconVisibleInMenu(true);
+  layerRaiseToTopAction->setEnabled(false);
+  addAction(layerRaiseToTopAction);
+  connect(layerRaiseToTopAction, SIGNAL(triggered()), SLOT(reorderLayerItem()));
+
+  layerLowerToBottomAction = new QAction(tr("Lower to Bottom"), this);
+  layerLowerToBottomAction->setShortcut(Qt::Key_End);
+  layerLowerToBottomAction->setToolTip(tr("Lower to bottom"));
+  layerLowerToBottomAction->setIconVisibleInMenu(true);
+  layerLowerToBottomAction->setEnabled(false);
+  addAction(layerLowerToBottomAction);
+  connect(layerLowerToBottomAction, SIGNAL(triggered()), SLOT(reorderLayerItem()));
+
+  // Delete source.
+  deleteSourceAction = new QAction(tr("Delete Source"), this);
+  //deleteSourceAction->setShortcut(tr("CTRL+DEL"));
+  deleteSourceAction->setToolTip(tr("Delete source item"));
+  deleteSourceAction->setIconVisibleInMenu(false);
+  deleteSourceAction->setEnabled(false);
+  deleteSourceAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(deleteSourceAction);
+  connect(deleteSourceAction, SIGNAL(triggered()), this, SLOT(deleteSourceItem()));
+
+  // Rename source.
+  renameSourceAction = new QAction(tr("Rename Source"), this);
+  //renameSourceAction->setShortcut(Qt::Key_F2);
+  renameSourceAction->setToolTip(tr("Rename source item"));
+  renameSourceAction->setIconVisibleInMenu(false);
+  renameSourceAction->setEnabled(false);
+  renameSourceAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(renameSourceAction);
+  connect(renameSourceAction, SIGNAL(triggered()), this, SLOT(renameSourceItem()));
 
   // Import a new media for current layer
   _importLayerMediaAction = new QAction(tr("Import New Media"), this);
@@ -2057,19 +2057,19 @@ void MainWindow::createActions()
   connect(displayControlsAction, SIGNAL(toggled(bool)), outputWindow, SLOT(setCanvasDisplayCrosshair(bool)));
 
   // Toggle display of canvas controls.
-  displayPaintControlsAction = new QAction(tr("&Display Controls of Layers of a Source"), this);
-  //displayPaintControlsAction->setShortcut(Qt::ALT | Qt::Key_C);
-  displayPaintControlsAction->setIcon(QIcon(":/control-points"));
-  displayPaintControlsAction->setToolTip(tr("Display all canvas controls related to current source"));
-  displayPaintControlsAction->setIconVisibleInMenu(false);
-  displayPaintControlsAction->setCheckable(true);
-  displayPaintControlsAction->setChecked(_displayPaintControls);
-  displayPaintControlsAction->setShortcutContext(Qt::ApplicationShortcut);
-  addAction(displayPaintControlsAction);
+  displaySourceControlsAction = new QAction(tr("&Display Controls of Layers of a Source"), this);
+  //displaySourceControlsAction->setShortcut(Qt::ALT | Qt::Key_C);
+  displaySourceControlsAction->setIcon(QIcon(":/control-points"));
+  displaySourceControlsAction->setToolTip(tr("Display all canvas controls related to current source"));
+  displaySourceControlsAction->setIconVisibleInMenu(false);
+  displaySourceControlsAction->setCheckable(true);
+  displaySourceControlsAction->setChecked(_displaySourceControls);
+  displaySourceControlsAction->setShortcutContext(Qt::ApplicationShortcut);
+  addAction(displaySourceControlsAction);
   // Manage show/hide of canvas controls.
-  connect(displayPaintControlsAction, SIGNAL(toggled(bool)), this, SLOT(enableDisplayPaintControls(bool)));
-//  connect(displayPaintControlsAction, SIGNAL(toggled(bool)), outputWindow, SLOT(setDisplayCrosshair(bool)));
-  connect(displayControlsAction, SIGNAL(toggled(bool)), displayPaintControlsAction, SLOT(setEnabled(bool)));
+  connect(displaySourceControlsAction, SIGNAL(toggled(bool)), this, SLOT(enableDisplaySourceControls(bool)));
+//  connect(displaySourceControlsAction, SIGNAL(toggled(bool)), outputWindow, SLOT(setDisplayCrosshair(bool)));
+  connect(displayControlsAction, SIGNAL(toggled(bool)), displaySourceControlsAction, SLOT(setEnabled(bool)));
 
   // Toggle sticky vertices
   stickyVerticesAction = new QAction(tr("&Sticky Vertices"), this);
@@ -2271,30 +2271,30 @@ void MainWindow::createMenus()
   editMenu->addAction(redoAction);
   editMenu->addSeparator();
   // Source canvas menu
-  editMenu->addAction(deletePaintAction);
-  editMenu->addAction(renamePaintAction);
+  editMenu->addAction(deleteSourceAction);
+  editMenu->addAction(renameSourceAction);
   editMenu->addSeparator();
   // Destination canvas menu
-  editMenu->addAction(duplicateMappingAction);
-  editMenu->addAction(deleteMappingAction);
-  editMenu->addAction(renameMappingAction);
+  editMenu->addAction(duplicateLayerAction);
+  editMenu->addAction(deleteLayerAction);
+  editMenu->addAction(renameLayerAction);
   editMenu->addSeparator();
-  editMenu->addAction(mappingRaiseAction);
-  editMenu->addAction(mappingLowerAction);
-  editMenu->addAction(mappingRaiseToTopAction);
-  editMenu->addAction(mappingLowerToBottomAction);
+  editMenu->addAction(layerRaiseAction);
+  editMenu->addAction(layerLowerAction);
+  editMenu->addAction(layerRaiseToTopAction);
+  editMenu->addAction(layerLowerToBottomAction);
   editMenu->addSeparator();
-  editMenu->addAction(mappingRotate90CWAction);
-  editMenu->addAction(mappingRotate90CCWAction);
-  editMenu->addAction(mappingRotate180Action);
+  editMenu->addAction(layerRotate90CWAction);
+  editMenu->addAction(layerRotate90CCWAction);
+  editMenu->addAction(layerRotate180Action);
   editMenu->addSeparator();
-  editMenu->addAction(mappingHorizontalFlipAction);
-  editMenu->addAction(mappingVerticalFlipAction);
+  editMenu->addAction(layerHorizontalFlipAction);
+  editMenu->addAction(layerVerticalFlipAction);
   editMenu->addSeparator();
 
-  editMenu->addAction(mappingLockedAction);
-  editMenu->addAction(mappingHideAction);
-  editMenu->addAction(mappingSoloAction);
+  editMenu->addAction(layerLockedAction);
+  editMenu->addAction(layerHideAction);
+  editMenu->addAction(layerSoloAction);
   editMenu->addSeparator();
 
   // Sticky vertices
@@ -2314,7 +2314,7 @@ void MainWindow::createMenus()
   viewMenu->addAction(outputFullScreenAction);
   viewMenu->addAction(displayTestSignalAction);
   viewMenu->addAction(displayControlsAction);
-  viewMenu->addAction(displayPaintControlsAction);
+  viewMenu->addAction(displaySourceControlsAction);
   outputScreenMenu = viewMenu->addMenu(tr("&Output screen"));
   outputScreenMenu->addActions(screenActions);
   viewMenu->addSeparator();
@@ -2360,70 +2360,70 @@ void MainWindow::createMenus()
   //  helpMenu->addAction(aboutQtAction);
 }
 
-void MainWindow::createMappingContextMenu()
+void MainWindow::createLayerContextMenu()
 {
   // Context menu.
-  mappingContextMenu = new QMenu(this);
-  mappingContextMenu->installEventFilter(this);
+  layerContextMenu = new QMenu(this);
+  layerContextMenu->installEventFilter(this);
 
   // Add different Action
-  mappingContextMenu->addAction(duplicateMappingAction);
-  mappingContextMenu->addAction(deleteMappingAction);
-  mappingContextMenu->addAction(renameMappingAction);
+  layerContextMenu->addAction(duplicateLayerAction);
+  layerContextMenu->addAction(deleteLayerAction);
+  layerContextMenu->addAction(renameLayerAction);
   // Add a little separator
-  mappingContextMenu->addSeparator();
+  layerContextMenu->addSeparator();
 
   // Create menu for source list
-  _changeLayerMediaMenu = mappingContextMenu->addMenu(tr("Change Layer Source"));
+  _changeLayerMediaMenu = layerContextMenu->addMenu(tr("Change Layer Source"));
 
   // Add another separator
-  mappingContextMenu->addSeparator();
-  mappingContextMenu->addAction(mappingRaiseAction);
-  mappingContextMenu->addAction(mappingLowerAction);
-  mappingContextMenu->addAction(mappingRaiseToTopAction);
-  mappingContextMenu->addAction(mappingLowerToBottomAction);
-  mappingContextMenu->addSeparator();
-  mappingContextMenu->addAction(mappingRotate90CWAction);
-  mappingContextMenu->addAction(mappingRotate90CCWAction);
-  mappingContextMenu->addAction(mappingRotate180Action);
-  mappingContextMenu->addSeparator();
-  mappingContextMenu->addAction(mappingHorizontalFlipAction);
-  mappingContextMenu->addAction(mappingVerticalFlipAction);
-
-  mappingContextMenu->addSeparator();
-  mappingContextMenu->addAction(mappingLockedAction);
-  mappingContextMenu->addAction(mappingHideAction);
-  mappingContextMenu->addAction(mappingSoloAction);
+  layerContextMenu->addSeparator();
+  layerContextMenu->addAction(layerRaiseAction);
+  layerContextMenu->addAction(layerLowerAction);
+  layerContextMenu->addAction(layerRaiseToTopAction);
+  layerContextMenu->addAction(layerLowerToBottomAction);
+  layerContextMenu->addSeparator();
+  layerContextMenu->addAction(layerRotate90CWAction);
+  layerContextMenu->addAction(layerRotate90CCWAction);
+  layerContextMenu->addAction(layerRotate180Action);
+  layerContextMenu->addSeparator();
+  layerContextMenu->addAction(layerHorizontalFlipAction);
+  layerContextMenu->addAction(layerVerticalFlipAction);
+
+  layerContextMenu->addSeparator();
+  layerContextMenu->addAction(layerLockedAction);
+  layerContextMenu->addAction(layerHideAction);
+  layerContextMenu->addAction(layerSoloAction);
 
   // Set context menu policy
-  mappingList->setContextMenuPolicy(Qt::CustomContextMenu);
+  layerList->setContextMenuPolicy(Qt::CustomContextMenu);
   destinationCanvas->setContextMenuPolicy(Qt::CustomContextMenu);
   outputWindow->setContextMenuPolicy(Qt::CustomContextMenu);
 
   // Context Menu Connexions
-  connect(mappingItemDelegate, SIGNAL(itemContextMenuRequested(const QPoint&)),
-          this, SLOT(showMappingContextMenu(const QPoint&)), Qt::QueuedConnection);
-  connect(destinationCanvas, SIGNAL(shapeContextMenuRequested(const QPoint&)), this, SLOT(showMappingContextMenu(const QPoint&)));
-  connect(outputWindow->getCanvas(), SIGNAL(shapeContextMenuRequested(const QPoint&)), this, SLOT(showMappingContextMenu(const QPoint&)));
+  connect(layerItemDelegate, SIGNAL(itemContextMenuRequested(const QPoint&)),
+          this, SLOT(showLayerContextMenu(const QPoint&)), Qt::QueuedConnection);
+  connect(destinationCanvas, SIGNAL(shapeContextMenuRequested(const QPoint&)), this, SLOT(showLayerContextMenu(const QPoint&)));
+  connect(outputWindow->getCanvas(), SIGNAL(shapeContextMenuRequested(const QPoint&)), this, SLOT(showLayerContextMenu(const QPoint&)));
 }
 
-void MainWindow::createPaintContextMenu()
+void MainWindow::createSourceContextMenu()
 {
-  // Paint Context Menu
-  paintContextMenu = new QMenu(this);
-  paintContextMenu->installEventFilter(this);
+  // Source Context Menu
+  sourceContextMenu = new QMenu(this);
+  sourceContextMenu->installEventFilter(this);
 
   // Add Actions
-  paintContextMenu->addAction(deletePaintAction);
-  paintContextMenu->addAction(renamePaintAction);
+  sourceContextMenu->addAction(deleteSourceAction);
+  sourceContextMenu->addAction(renameSourceAction);
 
   // Define Context policy
-  paintList->setContextMenuPolicy(Qt::CustomContextMenu);
+  sourceList->setContextMenuPolicy(Qt::CustomContextMenu);
   sourceCanvas->setContextMenuPolicy(Qt::CustomContextMenu);
 
   // Connexions
-  connect(paintList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showPaintContextMenu(const QPoint&)));
-  connect(sourceCanvas, SIGNAL(shapeContextMenuRequested(const QPoint&)), this, SLOT(showPaintContextMenu(const QPoint&)));
+  connect(sourceList, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showSourceContextMenu(const QPoint&)));
+  connect(sourceCanvas, SIGNAL(shapeContextMenuRequested(const QPoint&)), this, SLOT(showSourceContextMenu(const QPoint&)));
 }
 
 void MainWindow::createToolBars()
@@ -2516,8 +2516,8 @@ void MainWindow::readSettings()
   restoreState(settings.value("windowState").toByteArray());
 
   mainSplitter->restoreState(settings.value("mainSplitter").toByteArray());
-  paintSplitter->restoreState(settings.value("paintSplitter").toByteArray());
-  mappingSplitter->restoreState(settings.value("mappingSplitter").toByteArray());
+  sourceSplitter->restoreState(settings.value("sourceSplitter").toByteArray());
+  layerSplitter->restoreState(settings.value("layerSplitter").toByteArray());
   canvasSplitter->restoreState(settings.value("canvasSplitter").toByteArray());
   outputWindow->restoreGeometry(settings.value("outputWindow").toByteArray());
 
@@ -2538,7 +2538,7 @@ void MainWindow::readSettings()
   showMenuBarAction->setChecked(settings.value("showMenuBar", MM::DISPLAY_MENU_BAR).toBool());
 
   // New in 0.4.1
-   displayPaintControlsAction->setChecked(settings.value("displayAllControls", MM::DISPLAY_ALL_CONTROLS).toBool());
+   displaySourceControlsAction->setChecked(settings.value("displayAllControls", MM::DISPLAY_ALL_CONTROLS).toBool());
    stickyVerticesAction->setChecked(settings.value("stickyVertices", MM::STICKY_VERTICES).toBool());
    // Set toolbar icon size
    int toolBarIconSize = settings.value("toolbarIconSize", MM::TOOLBAR_ICON_SIZE).toInt();
@@ -2551,14 +2551,14 @@ void MainWindow::writeSettings()
   settings.setValue("geometry", saveGeometry());
   settings.setValue("windowState", saveState());
   settings.setValue("mainSplitter", mainSplitter->saveState());
-  settings.setValue("paintSplitter", paintSplitter->saveState());
-  settings.setValue("mappingSplitter", mappingSplitter->saveState());
+  settings.setValue("sourceSplitter", sourceSplitter->saveState());
+  settings.setValue("layerSplitter", layerSplitter->saveState());
   settings.setValue("canvasSplitter", canvasSplitter->saveState());
   settings.setValue("outputWindow", outputWindow->saveGeometry());
   settings.setValue("displayOutputWindow", outputFullScreenAction->isChecked());
   settings.setValue("displayTestSignal", displayTestSignalAction->isChecked());
   settings.setValue("displayControls", displayControlsAction->isChecked());
-  settings.setValue("displayAllControls", displayPaintControlsAction->isChecked());
+  settings.setValue("displayAllControls", displaySourceControlsAction->isChecked());
   settings.setValue("oscListeningPort", oscListeningPort);
   settings.setValue("displayUndoStack", displayUndoHistoryAction->isChecked());
   settings.setValue("zoomToolBar", displayZoomToolAction->isChecked());
@@ -2771,11 +2771,11 @@ void MainWindow::updateMediaListActions()
   // Clear media list menu
   _changeLayerMediaMenu->clear();
 
-  if (paintList->count() > 1) { // No need to load the same video
-    for (auto i = 0; i < paintList->count(); i++) {
+  if (sourceList->count() > 1) { // No need to load the same video
+    for (auto i = 0; i < sourceList->count(); i++) {
       QAction *mediaAction = new QAction(this);
-      mediaAction->setText(tr("&%1 %2").arg(i + 1).arg(mappingManager->getPaint(i)->getName()));
-      mediaAction->setData(mappingManager->getPaint(i)->getId());
+      mediaAction->setText(tr("&%1 %2").arg(i + 1).arg(mappingManager->getSource(i)->getName()));
+      mediaAction->setData(mappingManager->getSource(i)->getId());
       mediaAction->setVisible(true);
       connect(mediaAction, SIGNAL(triggered()),
               this, SLOT(loadLayerMedia()));
@@ -2789,22 +2789,22 @@ void MainWindow::updateMediaListActions()
 
 void MainWindow::updateLayerActions()
 {
-  if (mappingListModel->rowCount() < 1) {
-    duplicateMappingAction->setEnabled(false);
-    deleteMappingAction->setEnabled(false);
-    renameMappingAction->setEnabled(false);
-    mappingLockedAction->setEnabled(false);
-    mappingHideAction->setEnabled(false);
-    mappingSoloAction->setEnabled(false);
-    mappingRotate90CWAction->setEnabled(true);
-    mappingRotate90CCWAction->setEnabled(true);
-    mappingRotate180Action->setEnabled(true);
-    mappingHorizontalFlipAction->setEnabled(false);
-    mappingVerticalFlipAction->setEnabled(false);
-    mappingRaiseAction->setEnabled(false);
-    mappingLowerAction->setEnabled(false);
-    mappingRaiseToTopAction->setEnabled(false);
-    mappingLowerToBottomAction->setEnabled(false);
+  if (layerListModel->rowCount() < 1) {
+    duplicateLayerAction->setEnabled(false);
+    deleteLayerAction->setEnabled(false);
+    renameLayerAction->setEnabled(false);
+    layerLockedAction->setEnabled(false);
+    layerHideAction->setEnabled(false);
+    layerSoloAction->setEnabled(false);
+    layerRotate90CWAction->setEnabled(true);
+    layerRotate90CCWAction->setEnabled(true);
+    layerRotate180Action->setEnabled(true);
+    layerHorizontalFlipAction->setEnabled(false);
+    layerVerticalFlipAction->setEnabled(false);
+    layerRaiseAction->setEnabled(false);
+    layerLowerAction->setEnabled(false);
+    layerRaiseToTopAction->setEnabled(false);
+    layerLowerToBottomAction->setEnabled(false);
     //Disable zoom menus
     zoomInAction->setEnabled(false);
     zoomOutAction->setEnabled(false);
@@ -2856,10 +2856,10 @@ bool MainWindow::importMediaFile(const QString &fileName, bool isImage, bool isC
   QApplication::setOverrideCursor(Qt::WaitCursor);
 
   // Add media file to model.
-  uint mediaId = createMediaPaint(NULL_UID, fileName, 0, 0, isImage, type);
+  uint mediaId = createMediaSource(NULL_UID, fileName, 0, 0, isImage, type);
 
   // Initialize position (center).
-  QSharedPointer<Video> media = qSharedPointerCast<Video>(mappingManager->getPaintById(mediaId));
+  QSharedPointer<Video> media = qSharedPointerCast<Video>(mappingManager->getSourceById(mediaId));
   Q_CHECK_PTR(media);
 
   media->setPosition((sourceCanvas->width()  - media->getWidth() ) / 2.0f,
@@ -2887,16 +2887,16 @@ bool MainWindow::importMediaFile(const QString &fileName, bool isImage, bool isC
   return true;
 }
 
-bool MainWindow::addColorPaint(const QColor& color)
+bool MainWindow::addColorSource(const QColor& color)
 {
   QApplication::setOverrideCursor(Qt::WaitCursor);
 
   // Add color to model.
-  uint colorId = createColorPaint(NULL_UID, color);
+  uint colorId = createColorSource(NULL_UID, color);
 
   // Initialize position (center).
-  QSharedPointer<Color> colorPaint = qSharedPointerCast<Color>(mappingManager->getPaintById(colorId));
-  Q_CHECK_PTR(colorPaint);
+  QSharedPointer<Color> colorSource = qSharedPointerCast<Color>(mappingManager->getSourceById(colorId));
+  Q_CHECK_PTR(colorSource);
 
   QApplication::restoreOverrideCursor();
 
@@ -2905,60 +2905,60 @@ bool MainWindow::addColorPaint(const QColor& color)
   return true;
 }
 
-void MainWindow::addPaintItem(uid paintId, const QIcon& icon, const QString& name)
+void MainWindow::addSourceItem(uid sourceId, const QIcon& icon, const QString& name)
 {
-  Paint::ptr paint = mappingManager->getPaintById(paintId);
-  Q_CHECK_PTR(paint);
+  Source::ptr source = mappingManager->getSourceById(sourceId);
+  Q_CHECK_PTR(source);
 
-  // Create paint gui.
-  PaintGui::ptr paintGui;
-  SourceType paintType = paint->getSourceType();
-  if (paintType == SourceType::Video)
-    paintGui = PaintGui::ptr(new VideoGui(paint));
-  else if (paintType == SourceType::Image)
-    paintGui = PaintGui::ptr(new ImageGui(paint));
-  else if (paintType == SourceType::Color)
-    paintGui = PaintGui::ptr(new ColorGui(paint));
+  // Create source gui.
+  SourceGui::ptr sourceGui;
+  SourceType sourceType = source->getSourceType();
+  if (sourceType == SourceType::Video)
+    sourceGui = SourceGui::ptr(new VideoGui(source));
+  else if (sourceType == SourceType::Image)
+    sourceGui = SourceGui::ptr(new ImageGui(source));
+  else if (sourceType == SourceType::Color)
+    sourceGui = SourceGui::ptr(new ColorGui(source));
   else
-    paintGui = PaintGui::ptr(new PaintGui(paint));
+    sourceGui = SourceGui::ptr(new SourceGui(source));
 
-  // Add to list of paint guis..
-  paintGuis[paintId] = paintGui;
-  QWidget* paintEditor = paintGui->getPropertiesEditor();
-  paintPropertyPanel->addWidget(paintEditor);
-  paintPropertyPanel->setCurrentWidget(paintEditor);
-  paintPropertyPanel->setEnabled(true);
+  // Add to list of source guis..
+  sourceGuis[sourceId] = sourceGui;
+  QWidget* sourceEditor = sourceGui->getPropertiesEditor();
+  sourcePropertyPanel->addWidget(sourceEditor);
+  sourcePropertyPanel->setCurrentWidget(sourceEditor);
+  sourcePropertyPanel->setEnabled(true);
 
-  // When paint value is changed, update canvases.
-  //  connect(paintGui.get(), SIGNAL(valueChanged()),
+  // When source value is changed, update canvases.
+  //  connect(sourceGui.get(), SIGNAL(valueChanged()),
   //          this,           SLOT(updateCanvases()));
 
-  connect(paintGui.data(), SIGNAL(valueChanged(Paint::ptr)),
-          this,            SLOT(handlePaintChanged(Paint::ptr)));
+  connect(sourceGui.data(), SIGNAL(valueChanged(Source::ptr)),
+          this,            SLOT(handleSourceChanged(Source::ptr)));
 
-  connect(paint.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
-          this,           SLOT(paintPropertyChanged(uid, QString, QVariant)));
+  connect(source.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
+          this,           SLOT(sourcePropertyChanged(uid, QString, QVariant)));
 
   // TODO: attention: if mapping is invisible canvases will be updated for no reason
-  connect(paint.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
+  connect(source.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
           this,           SLOT(updateCanvases()));
 
-  // Add paint item to paintList widget.
+  // Add source item to sourceList widget.
   QListWidgetItem* item = new QListWidgetItem(icon, name);
-  setItemId(*item, paintId); // TODO: could possibly be replaced by a Paint pointer
+  setItemId(*item, sourceId); // TODO: could possibly be replaced by a Source pointer
 
   // Set size.
   item->setSizeHint(QSize(item->sizeHint().width(), MainWindow::PAINT_LIST_ITEM_HEIGHT));
 
   // Set tooltip.
-  item->setToolTip(QString("ID: %1").arg(paint->getId()));
+  item->setToolTip(QString("ID: %1").arg(source->getId()));
 
-  // Switch to paint tab.
-  contentTab->setCurrentWidget(paintSplitter);
+  // Switch to source tab.
+  contentTab->setCurrentWidget(sourceSplitter);
 
-  // Add item to paint list.
-  paintList->addItem(item);
-  paintList->setCurrentItem(item);
+  // Add item to source list.
+  sourceList->addItem(item);
+  sourceList->setCurrentItem(item);
 
   // Update mapping guis.
   updateMappers();
@@ -2970,8 +2970,8 @@ void MainWindow::addPaintItem(uid paintId, const QIcon& icon, const QString& nam
   updatePlayingState();
 }
 
-void MainWindow::updatePaintItem(uid paintId, const QIcon& icon, const QString& name) {
-  QListWidgetItem* item = getItemFromId(*paintList, paintId);
+void MainWindow::updateSourceItem(uid sourceId, const QIcon& icon, const QString& name) {
+  QListWidgetItem* item = getItemFromId(*sourceList, sourceId);
   if (item == NULL) {
     // FIXME there was an assert that seemed to make MapMap crash, here.
     return;
@@ -2988,83 +2988,83 @@ void MainWindow::updatePaintItem(uid paintId, const QIcon& icon, const QString&
   windowModified();
 }
 
-void MainWindow::addMappingItem(uid mappingId)
+void MainWindow::addLayerItem(uid layerId)
 {
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
-  Q_CHECK_PTR(mapping);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
+  Q_CHECK_PTR(layer);
 
   QString defaultName;
   QIcon icon;
 
-  ShapeType shapeType = mapping->getShape()->getType();
-  SourceType paintType = mapping->getPaint()->getSourceType();
+  ShapeType shapeType = layer->getShape()->getType();
+  SourceType sourceType = layer->getSource()->getSourceType();
 
   // Add mapper.
   // XXX hardcoded for textures
-  QSharedPointer<TextureMapping> textureMapping;
-  if (paintType == SourceType::Video || paintType == SourceType::Image)
+  QSharedPointer<TextureLayer> textureLayer;
+  if (sourceType == SourceType::Video || sourceType == SourceType::Image)
   {
-    textureMapping = qSharedPointerCast<TextureMapping>(mapping);
-    Q_CHECK_PTR(textureMapping);
+    textureLayer = qSharedPointerCast<TextureLayer>(layer);
+    Q_CHECK_PTR(textureLayer);
   }
 
-  MappingGui::ptr mapper;
+  LayerGui::ptr mapper;
 
   // XXX Branching on nVertices() is crap
 
   // Triangle
   if (shapeType == ShapeType::Triangle)
   {
-    defaultName = QString("Triangle %1").arg(mappingId);
+    defaultName = QString("Triangle %1").arg(layerId);
     icon = QIcon(":/shape-triangle");
 
-    if (paintType == SourceType::Color)
-      mapper = MappingGui::ptr(new PolygonColorMappingGui(mapping));
+    if (sourceType == SourceType::Color)
+      mapper = LayerGui::ptr(new PolygonColorLayerGui(layer));
     else
-      mapper = MappingGui::ptr(new TriangleTextureMappingGui(textureMapping));
+      mapper = LayerGui::ptr(new TriangleTextureLayerGui(textureLayer));
   }
   // Mesh
   else if (shapeType == ShapeType::Mesh)
   {
-    defaultName = QString("Mesh %1").arg(mappingId);
+    defaultName = QString("Mesh %1").arg(layerId);
     icon = QIcon(":/shape-mesh");
-    if (paintType == SourceType::Color)
-      mapper = MappingGui::ptr(new MeshColorMappingGui(mapping));
+    if (sourceType == SourceType::Color)
+      mapper = LayerGui::ptr(new MeshColorLayerGui(layer));
     else
-      mapper = MappingGui::ptr(new MeshTextureMappingGui(textureMapping));
+      mapper = LayerGui::ptr(new MeshTextureLayerGui(textureLayer));
   }
   else if (shapeType == ShapeType::Ellipse)
   {
-    defaultName = QString("Ellipse %1").arg(mappingId);
+    defaultName = QString("Ellipse %1").arg(layerId);
     icon = QIcon(":/shape-ellipse");
-    if (paintType == SourceType::Color)
-      mapper = MappingGui::ptr(new EllipseColorMappingGui(mapping));
+    if (sourceType == SourceType::Color)
+      mapper = LayerGui::ptr(new EllipseColorLayerGui(layer));
     else
-      mapper = MappingGui::ptr(new EllipseTextureMappingGui(textureMapping));
+      mapper = LayerGui::ptr(new EllipseTextureLayerGui(textureLayer));
   }
   else
   {
-    defaultName = QString("Polygon %1").arg(mappingId);
+    defaultName = QString("Polygon %1").arg(layerId);
     icon = QIcon(":/shape-polygon");
   }
 
   // Label is only going to be applied if no name is present.
-  if (mapping->getName().isEmpty())
-    mapping->setName(defaultName);
+  if (layer->getName().isEmpty())
+    layer->setName(defaultName);
 
-  // Add to list of mappers.
-  mappers[mappingId] = mapper;
+  // Add to list of layerGuis.
+  layerGuis[layerId] = mapper;
   QWidget* mapperEditor = mapper->getPropertiesEditor();
-  mappingPropertyPanel->addWidget(mapperEditor);
-  mappingPropertyPanel->setCurrentWidget(mapperEditor);
-  mappingPropertyPanel->setEnabled(true);
+  layerPropertyPanel->addWidget(mapperEditor);
+  layerPropertyPanel->setCurrentWidget(mapperEditor);
+  layerPropertyPanel->setEnabled(true);
 
   // When mapper value is changed, update canvases.
   connect(mapper.data(), SIGNAL(valueChanged()),
           this,          SLOT(updateCanvases()));
 
-  // Also update playing state in case paint was changed.
-  connect(mapper.data(), SIGNAL(paintChanged()),
+  // Also update playing state in case source was changed.
+  connect(mapper.data(), SIGNAL(sourceChanged()),
           this,          SLOT(updatePlayingState()));
 
   connect(sourceCanvas,  SIGNAL(shapeChanged(MShape*)),
@@ -3073,20 +3073,20 @@ void MainWindow::addMappingItem(uid mappingId)
   connect(destinationCanvas, SIGNAL(shapeChanged(MShape*)),
           mapper.data(),     SLOT(updateShape(MShape*)));
 
-  connect(mapping.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
-          this,           SLOT(mappingPropertyChanged(uid, QString, QVariant)));
+  connect(layer.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
+          this,           SLOT(layerPropertyChanged(uid, QString, QVariant)));
 
   // TODO: attention: if mapping is invisible canvases will be updated for no reason
-  connect(mapping.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
+  connect(layer.data(), SIGNAL(propertyChanged(uid, QString, QVariant)),
           this,           SLOT(updateCanvases()));
 
   // Switch to mapping tab.
-  contentTab->setCurrentWidget(mappingSplitter);
+  contentTab->setCurrentWidget(layerSplitter);
 
   // Add item to layerList widget.
-  mappingListModel->addItem(mapping, icon, mapping->getName());
-  mappingListModel->updateModel();
-  setCurrentMapping(mappingId);
+  layerListModel->addItem(layer, icon, layer->getName());
+  layerListModel->updateModel();
+  setCurrentLayer(layerId);
 
   // Add items to scenes.
   if (mapper->getInputGraphicsItem())
@@ -3101,34 +3101,34 @@ void MainWindow::addMappingItem(uid mappingId)
   updatePlayingState();
 }
 
-void MainWindow::removeMappingItem(uid mappingId)
+void MainWindow::removeLayerItem(uid layerId)
 {
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
-  Q_CHECK_PTR(mapping);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
+  Q_CHECK_PTR(layer);
 
   // Remove mapping from model.
-  mappingManager->removeMapping(mappingId);
+  mappingManager->removeLayer(layerId);
 
   // Remove associated mapper.
-  mappingPropertyPanel->removeWidget(mappers[mappingId]->getPropertiesEditor());
-  mappers.remove(mappingId);
+  layerPropertyPanel->removeWidget(layerGuis[layerId]->getPropertiesEditor());
+  layerGuis.remove(layerId);
 
-  // Remove widget from mappingList.
-  int row = mappingListModel->getItemRowFromId(mappingId);
+  // Remove widget from layerList.
+  int row = layerListModel->getItemRowFromId(layerId);
   Q_ASSERT( row >= 0 );
-  mappingListModel->removeItem(row);
+  layerListModel->removeItem(row);
 
   // Update list.
-  mappingListModel->updateModel();
+  layerListModel->updateModel();
 
-  if (mappingListModel->rowCount() == 0)
-    removeCurrentMapping();
+  if (layerListModel->rowCount() == 0)
+    removeCurrentLayer();
   else
   {
-    int nextSelectedRow = row == mappingListModel->rowCount() ? row - 1 : row;
-    QModelIndex index = mappingListModel->getIndexFromRow(nextSelectedRow);
-    mappingList->selectionModel()->select(index, QItemSelectionModel::Select);
-    mappingList->setCurrentIndex(index);
+    int nextSelectedRow = row == layerListModel->rowCount() ? row - 1 : row;
+    QModelIndex index = layerListModel->getIndexFromRow(nextSelectedRow);
+    layerList->selectionModel()->select(index, QItemSelectionModel::Select);
+    layerList->setCurrentIndex(index);
   }
 
   // Update everything.
@@ -3141,27 +3141,27 @@ void MainWindow::removeMappingItem(uid mappingId)
   updatePlayingState();
 }
 
-void MainWindow::moveMappingItem(uid mappingId, int idx)
+void MainWindow::moveLayerItem(uid layerId, int idx)
 {
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
-  Q_CHECK_PTR(mapping);
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
+  Q_CHECK_PTR(layer);
 
   // Remove mapping from model.
-  uid exchangeMappingId = mappingManager->getMapping(idx)->getId();
-  mappingManager->moveMapping(mappingId, idx);
+  uid exchangeLayerId = mappingManager->getLayer(idx)->getId();
+  mappingManager->moveLayer(layerId, idx);
 
-  // Remove widget from mappingList.
-  int row = mappingListModel->getItemRowFromId(mappingId);
-  int rowTo = mappingListModel->getItemRowFromId(exchangeMappingId);
+  // Remove widget from layerList.
+  int row = layerListModel->getItemRowFromId(layerId);
+  int rowTo = layerListModel->getItemRowFromId(exchangeLayerId);
   Q_ASSERT( row >= 0 );
-  mappingListModel->moveItem(row, idx);
+  layerListModel->moveItem(row, idx);
 
   // Update list.
-  mappingListModel->updateModel();
+  layerListModel->updateModel();
 
-  QModelIndex index = mappingListModel->getIndexFromRow(idx);
-  mappingList->selectionModel()->select(index, QItemSelectionModel::Select);
-  mappingList->setCurrentIndex(index);
+  QModelIndex index = layerListModel->getIndexFromRow(idx);
+  layerList->selectionModel()->select(index, QItemSelectionModel::Select);
+  layerList->setCurrentIndex(index);
 
   // Update everything.
   updateCanvases();
@@ -3173,39 +3173,39 @@ void MainWindow::moveMappingItem(uid mappingId, int idx)
   updatePlayingState();
 }
 
-void MainWindow::removePaintItem(uid paintId)
+void MainWindow::removeSourceItem(uid sourceId)
 {
-  Paint::ptr paint = mappingManager->getPaintById(paintId);
-  Q_CHECK_PTR(paint);
+  Source::ptr source = mappingManager->getSourceById(sourceId);
+  Q_CHECK_PTR(source);
 
-  // Remove all mappings associated with paint.
-  QMap<uid, Mapping::ptr> paintMappings = mappingManager->getPaintMappings(paint);
-  for (QMap<uid, Mapping::ptr>::const_iterator it = paintMappings.constBegin();
-       it != paintMappings.constEnd(); ++it) {
-    removeMappingItem(it.key());
+  // Remove all mappings associated with source.
+  QMap<uid, Layer::ptr> sourceLayers = mappingManager->getSourceLayers(source);
+  for (QMap<uid, Layer::ptr>::const_iterator it = sourceLayers.constBegin();
+       it != sourceLayers.constEnd(); ++it) {
+    removeLayerItem(it.key());
   }
-  // Remove paint from model.
-  Q_ASSERT( mappingManager->removePaint(paintId) );
+  // Remove source from model.
+  Q_ASSERT( mappingManager->removeSource(sourceId) );
 
   // Remove associated mapper.
-  paintPropertyPanel->removeWidget(paintGuis[paintId]->getPropertiesEditor());
-  paintGuis.remove(paintId);
+  sourcePropertyPanel->removeWidget(sourceGuis[sourceId]->getPropertiesEditor());
+  sourceGuis.remove(sourceId);
 
   updateMappers();
 
-  // Remove widget from paintList.
-  int row = getItemRowFromId(*paintList, paintId);
+  // Remove widget from sourceList.
+  int row = getItemRowFromId(*sourceList, sourceId);
   Q_ASSERT( row >= 0 );
-  QListWidgetItem* item = paintList->takeItem(row);
+  QListWidgetItem* item = sourceList->takeItem(row);
   if (item == currentSelectedItem)
     currentSelectedItem = NULL;
   delete item;
 
   // Update list.
-  paintList->update();
+  sourceList->update();
 
-  // Reset current paint.
-  removeCurrentPaint();
+  // Reset current source.
+  removeCurrentSource();
 
   // Update everything.
   updateCanvases();
@@ -3213,7 +3213,7 @@ void MainWindow::removePaintItem(uid paintId)
   // Window was modified.
   windowModified();
   // Build mapping!
-  // FIXME: mapping->build(); // I removed this 2014-04-25
+  // FIXME: layer->build(); // I removed this 2014-04-25
 
   // Update playing state.
   updatePlayingState();
@@ -3224,17 +3224,17 @@ void MainWindow::clearWindow()
   clearProject();
 }
 
-void MainWindow::syncMappingManager()
+void MainWindow::syncLayerManager()
 {
   // Reorder mappings.
   QVector<uid> newOrder;
-  for (int row=0; row<mappingListModel->rowCount(); row++)
-//  for (int row=mappingListModel->rowCount()-1; row>=0; row--)
+  for (int row=0; row<layerListModel->rowCount(); row++)
+//  for (int row=layerListModel->rowCount()-1; row>=0; row--)
   {
-    uid layerId = mappingListModel->getIndexFromRow(row).data(Qt::UserRole).toInt();
+    uid layerId = layerListModel->getIndexFromRow(row).data(Qt::UserRole).toInt();
     newOrder.push_back(layerId);
   }
-  mappingManager->reorderMappings(newOrder);
+  mappingManager->reorderLayers(newOrder);
 }
 
 bool MainWindow::fileExists(const QString &file)
@@ -3341,9 +3341,9 @@ void MainWindow::updateCanvases()
 
 void MainWindow::updateMappers() {
   // Update mapping guis.
-  for (QMap<uid, MappingGui::ptr>::iterator it = mappers.begin();
-       it != mappers.end(); ++it) {
-    it.value()->updatePaints();
+  for (QMap<uid, LayerGui::ptr>::iterator it = layerGuis.begin();
+       it != layerGuis.end(); ++it) {
+    it.value()->updateSources();
   }
 }
 
@@ -3370,20 +3370,20 @@ void MainWindow::processFrame()
 
 void MainWindow::updatePlayingState()
 {
-  // Pause all paints that are not visible.
+  // Pause all sources that are not visible.
   if (isPlaying())
   {
-    QVector<Paint::ptr> visiblePaints = mappingManager->getVisiblePaints();
-    for (int i=0; i<mappingManager->nPaints(); i++)
+    QVector<Source::ptr> visibleSources = mappingManager->getVisibleSources();
+    for (int i=0; i<mappingManager->nSources(); i++)
     {
-      Paint::ptr paint = mappingManager->getPaint(i);
-      if (visiblePaints.contains(paint))
+      Source::ptr source = mappingManager->getSource(i);
+      if (visibleSources.contains(source))
       {
-        paint->play();
+        source->play();
       }
       else
       {
-        paint->pause();
+        source->pause();
       }
     }
   }
@@ -3391,17 +3391,17 @@ void MainWindow::updatePlayingState()
   // Pause everyone.
   else
   {
-    for (int i=0; i<mappingManager->nPaints(); i++)
+    for (int i=0; i<mappingManager->nSources(); i++)
     {
-      mappingManager->getPaint(i)->pause();
+      mappingManager->getSource(i)->pause();
     }
   }
 
-  // Update all paint items with correct icon according to playing state.
-  for (int i=0; i<mappingManager->nPaints(); i++)
+  // Update all source items with correct icon according to playing state.
+  for (int i=0; i<mappingManager->nSources(); i++)
   {
-    Paint::ptr paint = mappingManager->getPaint(i);
-    updatePaintItem(paint->getId(), getPaintIcon(paint), paint->getName());
+    Source::ptr source = mappingManager->getSource(i);
+    updateSourceItem(source->getId(), getSourceIcon(source), source->getName());
   }
 
 }
@@ -3418,9 +3418,9 @@ void MainWindow::setFramesPerSecond(qreal fps)
   videoTimer->setInterval( int( 1000 / _framesPerSecond ) );
 }
 
-void MainWindow::enableDisplayPaintControls(bool display)
+void MainWindow::enableDisplaySourceControls(bool display)
 {
-  _displayPaintControls = display;
+  _displaySourceControls = display;
   updateCanvases();
 }
 
@@ -3444,31 +3444,31 @@ void MainWindow::enableStickyVertices(bool value)
   settings.setValue("stickyVertices", _stickyVertices);
 }
 
-void MainWindow::showMappingContextMenu(const QPoint &point)
+void MainWindow::showLayerContextMenu(const QPoint &point)
 {
   QWidget *objectSender = static_cast<QWidget*>(sender());
-  uid mappingId = currentMappingItemId();
-  Mapping::ptr mapping = mappingManager->getMappingById(mappingId);
+  uid layerId = currentLayerItemId();
+  Layer::ptr layer = mappingManager->getLayerById(layerId);
 
   // Switch to right action check state
-  mappingLockedAction->setChecked(mapping->isLocked());
-  mappingHideAction->setChecked(!mapping->isVisible());
-  mappingSoloAction->setChecked(mapping->isSolo());
+  layerLockedAction->setChecked(layer->isLocked());
+  layerHideAction->setChecked(!layer->isVisible());
+  layerSoloAction->setChecked(layer->isSolo());
 
   if (objectSender != nullptr) {
-    if (sender() == mappingItemDelegate) // XXX: The item delegate is not a widget
-      mappingContextMenu->exec(mappingList->mapToGlobal(point));
+    if (sender() == layerItemDelegate) // XXX: The item delegate is not a widget
+      layerContextMenu->exec(layerList->mapToGlobal(point));
     else
-      mappingContextMenu->exec(objectSender->mapToGlobal(point));
+      layerContextMenu->exec(objectSender->mapToGlobal(point));
   }
 }
 
-void MainWindow::showPaintContextMenu(const QPoint &point)
+void MainWindow::showSourceContextMenu(const QPoint &point)
 {
   QWidget *objectSender = dynamic_cast<QWidget*>(sender());
 
-  if (objectSender != nullptr && paintList->count() > 0)
-    paintContextMenu->exec(objectSender->mapToGlobal(point));
+  if (objectSender != nullptr && sourceList->count() > 0)
+    sourceContextMenu->exec(objectSender->mapToGlobal(point));
 }
 
 void MainWindow::play(bool updatePlayPauseActions)
@@ -3501,8 +3501,8 @@ void MainWindow::pause(bool updatePlayPauseActions)
 void MainWindow::rewind()
 {
   // Rewind all paints.
-  for (int i=0; i<mappingManager->nPaints(); i++)
-    mappingManager->getPaint(i)->rewind();
+  for (int i=0; i<mappingManager->nSources(); i++)
+    mappingManager->getSource(i)->rewind();
 }
 
 QString MainWindow::strippedName(const QString &fullFileName)
@@ -3510,13 +3510,13 @@ QString MainWindow::strippedName(const QString &fullFileName)
   return QFileInfo(fullFileName).fileName();
 }
 
-const QIcon MainWindow::getPaintIcon(Paint::ptr paint)
+const QIcon MainWindow::getSourceIcon(Source::ptr source)
 {
-  if (paint->isPlaying())
-    return paint->getIcon();
+  if (source->isPlaying())
+    return source->getIcon();
   else
   {
-    QPixmap pixmap = paint->getIcon().pixmap(MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
+    QPixmap pixmap = source->getIcon().pixmap(MM::MAPPING_LIST_ICON_SIZE, MM::MAPPING_LIST_ICON_SIZE);
     QPainter painter(&pixmap);
     painter.setPen(QPen(QColor(255, 0, 0, 128), 4));
     painter.drawLine(0, 0, pixmap.width(), pixmap.height());
@@ -3526,64 +3526,64 @@ const QIcon MainWindow::getPaintIcon(Paint::ptr paint)
 
 void MainWindow::connectProjectWidgets()
 {
-  connect(paintList, SIGNAL(itemSelectionChanged()),
-          this,      SLOT(handlePaintItemSelectionChanged()));
+  connect(sourceList, SIGNAL(itemSelectionChanged()),
+          this,      SLOT(handleSourceItemSelectionChanged()));
 
-  connect(paintList, SIGNAL(itemPressed(QListWidgetItem*)),
-          this,      SLOT(handlePaintItemSelected(QListWidgetItem*)));
+  connect(sourceList, SIGNAL(itemPressed(QListWidgetItem*)),
+          this,      SLOT(handleSourceItemSelected(QListWidgetItem*)));
 
-  connect(paintList, SIGNAL(itemActivated(QListWidgetItem*)),
-          this,      SLOT(handlePaintItemSelected(QListWidgetItem*)));
-  // Rename Paint with double click
-  connect(paintList, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
-          this,      SLOT(renamePaintItem()));
+  connect(sourceList, SIGNAL(itemActivated(QListWidgetItem*)),
+          this,      SLOT(handleSourceItemSelected(QListWidgetItem*)));
+  // Rename Source with double click
+  connect(sourceList, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
+          this,      SLOT(renameSourceItem()));
   // When finish to edit mapping item
-  connect(paintList->itemDelegate(), SIGNAL(commitData(QWidget*)),
-          this, SLOT(paintListEditEnd(QWidget*)));
+  connect(sourceList->itemDelegate(), SIGNAL(commitData(QWidget*)),
+          this, SLOT(sourceListEditEnd(QWidget*)));
 
-  connect(mappingList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
-          this,        SLOT(handleMappingItemSelectionChanged(QModelIndex)));
+  connect(layerList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+          this,        SLOT(handleLayerItemSelectionChanged(QModelIndex)));
 
-  connect(mappingListModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-          this,        SLOT(handleMappingItemChanged(QModelIndex)));
+  connect(layerListModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+          this,        SLOT(handleLayerItemChanged(QModelIndex)));
 
-  connect(mappingListModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
-          this,                 SLOT(handleMappingIndexesMoved()));
+  connect(layerListModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
+          this,                 SLOT(handleLayerIndexesMoved()));
 
-  connect(mappingItemDelegate, SIGNAL(itemDuplicated(uid)),
-          this, SLOT(duplicateMapping(uid)));
+  connect(layerItemDelegate, SIGNAL(itemDuplicated(uid)),
+          this, SLOT(duplicateLayer(uid)));
 
-  connect(mappingItemDelegate, SIGNAL(itemRemoved(uid)),
-          this, SLOT(deleteMapping(uid)));
+  connect(layerItemDelegate, SIGNAL(itemRemoved(uid)),
+          this, SLOT(deleteLayer(uid)));
 
   connect(_preferenceDialog, SIGNAL(settingSaved()), this, SLOT(updateSettings()));
 }
 
 void MainWindow::disconnectProjectWidgets()
 {
-  disconnect(paintList, SIGNAL(itemSelectionChanged()),
-             this,      SLOT(handlePaintItemSelectionChanged()));
+  disconnect(sourceList, SIGNAL(itemSelectionChanged()),
+             this,      SLOT(handleSourceItemSelectionChanged()));
 
-  disconnect(paintList, SIGNAL(itemPressed(QListWidgetItem*)),
-             this,      SLOT(handlePaintItemSelected(QListWidgetItem*)));
+  disconnect(sourceList, SIGNAL(itemPressed(QListWidgetItem*)),
+             this,      SLOT(handleSourceItemSelected(QListWidgetItem*)));
 
-  disconnect(paintList, SIGNAL(itemActivated(QListWidgetItem*)),
-             this,      SLOT(handlePaintItemSelected(QListWidgetItem*)));
+  disconnect(sourceList, SIGNAL(itemActivated(QListWidgetItem*)),
+             this,      SLOT(handleSourceItemSelected(QListWidgetItem*)));
 
-  disconnect(mappingList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
-          this,        SLOT(handleMappingItemSelectionChanged(QModelIndex)));
+  disconnect(layerList->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
+          this,        SLOT(handleLayerItemSelectionChanged(QModelIndex)));
 
-  disconnect(mappingListModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
-          this,        SLOT(handleMappingItemChanged(QModelIndex)));
+  disconnect(layerListModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+          this,        SLOT(handleLayerItemChanged(QModelIndex)));
 
-  disconnect(mappingListModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
-          this,                 SLOT(handleMappingIndexesMoved()));
+  disconnect(layerListModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
+          this,                 SLOT(handleLayerIndexesMoved()));
 
-  disconnect(mappingItemDelegate, SIGNAL(itemDuplicated(uid)),
-          this, SLOT(duplicateMapping(uid)));
+  disconnect(layerItemDelegate, SIGNAL(itemDuplicated(uid)),
+          this, SLOT(duplicateLayer(uid)));
 
-  disconnect(mappingItemDelegate, SIGNAL(itemRemoved(uid)),
-          this, SLOT(deleteMapping(uid)));
+  disconnect(layerItemDelegate, SIGNAL(itemRemoved(uid)),
+          this, SLOT(deleteLayer(uid)));
 
   disconnect(_preferenceDialog, SIGNAL(settingSaved()), this, SLOT(updateSettings()));
 }
@@ -3618,9 +3618,9 @@ int MainWindow::getItemRowFromId(const QListWidget& list, uid id)
   return (-1);
 }
 
-uid MainWindow::currentMappingItemId() const
+uid MainWindow::currentLayerItemId() const
 {
-  return mappingListModel->getItemId(currentSelectedIndex);
+  return layerListModel->getItemId(currentSelectedIndex);
 }
 
 QIcon MainWindow::createColorIcon(const QColor &color) {
@@ -3639,45 +3639,45 @@ QIcon MainWindow::createImageIcon(const QString& filename) {
 }
 
 
-void MainWindow::setCurrentPaint(int uid)
+void MainWindow::setCurrentSource(int uid)
 {
   if (uid == NULL_UID)
-    removeCurrentPaint();
+    removeCurrentSource();
   else {
-    if (currentPaintId != uid) {
-      currentPaintId = uid;
-      paintList->setCurrentRow( getItemRowFromId(*paintList, uid) );
-      paintPropertyPanel->setCurrentWidget(paintGuis[uid]->getPropertiesEditor());
+    if (currentSourceId != uid) {
+      currentSourceId = uid;
+      sourceList->setCurrentRow( getItemRowFromId(*sourceList, uid) );
+      sourcePropertyPanel->setCurrentWidget(sourceGuis[uid]->getPropertiesEditor());
     }
-    _hasCurrentPaint = true;
+    _hasCurrentSource = true;
   }
 }
 
-void MainWindow::setCurrentMapping(int uid)
+void MainWindow::setCurrentLayer(int uid)
 {
   if (uid == NULL_UID)
-    removeCurrentMapping();
+    removeCurrentLayer();
   else {
-    if (currentMappingId != uid) {
-      currentMappingId = uid;
-      currentSelectedIndex = mappingListModel->getIndexFromRow(mappingListModel->getItemRowFromId(uid));
-      mappingList->setCurrentIndex(currentSelectedIndex);
-      mappingPropertyPanel->setCurrentWidget(mappers[uid]->getPropertiesEditor());
+    if (currentLayerId != uid) {
+      currentLayerId = uid;
+      currentSelectedIndex = layerListModel->getIndexFromRow(layerListModel->getItemRowFromId(uid));
+      layerList->setCurrentIndex(currentSelectedIndex);
+      layerPropertyPanel->setCurrentWidget(layerGuis[uid]->getPropertiesEditor());
     }
-    _hasCurrentMapping = true;
+    _hasCurrentLayer = true;
   }
 }
 
-void MainWindow::removeCurrentPaint() {
-  _hasCurrentPaint = false;
-  currentPaintId = NULL_UID;
-  paintList->clearSelection();
+void MainWindow::removeCurrentSource() {
+  _hasCurrentSource = false;
+  currentSourceId = NULL_UID;
+  sourceList->clearSelection();
 }
 
-void MainWindow::removeCurrentMapping() {
-  _hasCurrentMapping = false;
-  currentMappingId = NULL_UID;
-  mappingList->clearSelection();
+void MainWindow::removeCurrentLayer() {
+  _hasCurrentLayer = false;
+  currentLayerId = NULL_UID;
+  layerList->clearSelection();
 }
 
 void MainWindow::startOscReceiver()
@@ -3755,9 +3755,9 @@ void MainWindow::updateSettings()
   stickyVerticesAction->setChecked(settings.value("stickyVertices").toBool());
 }
 
-void MainWindow::updateMappingListColumnWidth()
+void MainWindow::updateLayerListColumnWidth()
 {
-  mappingList->setColumnWidth(1, mappingList->horizontalHeader()->width() - (MM::MAPPING_LIST_HIDE_COLUMN + MM::MAPPING_LIST_BUTTONS_COLUMN));
+  layerList->setColumnWidth(1, layerList->horizontalHeader()->width() - (MM::MAPPING_LIST_HIDE_COLUMN + MM::MAPPING_LIST_BUTTONS_COLUMN));
 }
 
 // void MainWindow::applyOscCommand(const QVariantList& command)
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 2e5503a9..5074b66a 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -42,15 +42,15 @@
 #include "ConsoleWindow.h"
 
 #include "MappingManager.h"
-#include "MappingItemDelegate.h"
-#include "MappingListModel.h"
+#include "LayerItemDelegate.h"
+#include "LayerListModel.h"
 
 #include "qtpropertymanager.h"
 #include "qtvariantproperty.h"
 #include "qttreepropertybrowser.h"
 #include "qtgroupboxpropertybrowser.h"
 
-#include "PaintGui.h"
+#include "SourceGui.h"
 
 namespace mmp {
 
@@ -108,34 +108,34 @@ private slots:
   // Edit menu.
   void deleteItem();
   // Context menu for mappings.
-  void duplicateMappingItem();
-  void deleteMappingItem();
-  void renameMappingItem();
-  void setMappingItemLocked(bool locked);
-  void setMappingItemHide(bool hide);
-  void setMappingItemSolo(bool solo);
+  void duplicateLayerItem();
+  void deleteLayerItem();
+  void renameLayerItem();
+  void setLayerItemLocked(bool locked);
+  void setLayerItemHide(bool hide);
+  void setLayerItemSolo(bool solo);
   void loadLayerMedia();
-  void transformActionMappingItem();
-  void reorderMappingItem();
-  // Context menu for paints
-  void deletePaintItem();
-  void renamePaintItem();
-  void paintListEditEnd(QWidget* editor);
+  void transformActionLayerItem();
+  void reorderLayerItem();
+  // Context menu for sources
+  void deleteSourceItem();
+  void renameSourceItem();
+  void sourceListEditEnd(QWidget* editor);
   // Output menu
   void setupOutputScreen();
   void updateScreenCount();
 
   // Widget callbacks.
-  void handlePaintItemSelectionChanged();
+  void handleSourceItemSelectionChanged();
 //  void handleItemDoubleClicked(QListWidgetItem* item);
-  void handleMappingItemSelectionChanged(const QModelIndex &index);
-  void handleMappingItemChanged(const QModelIndex &index);
-  void handleMappingIndexesMoved();
-  void handlePaintItemSelected(QListWidgetItem* item);
-  void handlePaintChanged(Paint::ptr paint);
+  void handleLayerItemSelectionChanged(const QModelIndex &index);
+  void handleLayerItemChanged(const QModelIndex &index);
+  void handleLayerIndexesMoved();
+  void handleSourceItemSelected(QListWidgetItem* item);
+  void handleSourceChanged(Source::ptr source);
 
-  void mappingPropertyChanged(uid id, QString propertyName, QVariant value);
-  void paintPropertyChanged(uid id, QString propertyName, QVariant value);
+  void layerPropertyChanged(uid id, QString propertyName, QVariant value);
+  void sourcePropertyChanged(uid id, QString propertyName, QVariant value);
 
   void addMesh();
   void addTriangle();
@@ -167,77 +167,77 @@ private slots:
 
   void updateSettings();
 
-  void updateMappingListColumnWidth();
+  void updateLayerListColumnWidth();
 
 public slots:
 
   // CRUD.
 
-  /// Clears all mappings and paints.
+  /// Clears all mappings and sources.
   bool clearProject();
 
-  /// Create or replace a media paint (or image).
-  uid createMediaPaint(uid paintId, QString uri, float x, float y, bool isImage, VideoType type, double rate=1.0);
+  /// Create or replace a media source (or image).
+  uid createMediaSource(uid sourceId, QString uri, float x, float y, bool isImage, VideoType type, double rate=1.0);
 
-  /// Create or replace a color paint.
-  uid createColorPaint(uid paintId, QColor color);
+  /// Create or replace a color source.
+  uid createColorSource(uid sourceId, QColor color);
 
   // TODO: Remove all these unsed fonctions below
 
   /*======= Start of Unsed fonctions =======*/
   /// Creates a textured mesh.
-  uid createMeshTextureMapping(uid mappingId,
-                               uid paintId,
+  uid createMeshTextureLayer(uid mappingId,
+                               uid sourceId,
                                int nColumns, int nRows,
                                const QVector<QPointF> &src, const QVector<QPointF> &dst);
 
   /// Creates a textured triangle.
-  uid createTriangleTextureMapping(uid mappingId,
-                                   uid paintId,
+  uid createTriangleTextureLayer(uid mappingId,
+                                   uid sourceId,
                                    const QVector<QPointF> &src, const QVector<QPointF> &dst);
 
 
   /// Creates a textured ellipse.
-  uid createEllipseTextureMapping(uid mappingId,
-                                  uid paintId,
+  uid createEllipseTextureLayer(uid mappingId,
+                                  uid sourceId,
                                   const QVector<QPointF> &src, const QVector<QPointF> &dst);
 
   /// Creates a color quad.
-  uid createQuadColorMapping(uid mappingId,
-                             uid paintId,
+  uid createQuadColorLayer(uid mappingId,
+                             uid sourceId,
                              const QVector<QPointF> &dst);
 
   /// Creates a color triangle.
-  uid createTriangleColorMapping(uid mappingId,
-                                 uid paintId,
+  uid createTriangleColorLayer(uid mappingId,
+                                 uid sourceId,
                                  const QVector<QPointF> &dst);
 
   /// Creates a color ellipse.
-  uid createEllipseColorMapping(uid mappingId,
-                                uid paintId,
+  uid createEllipseColorLayer(uid mappingId,
+                                uid sourceId,
                                 const QVector<QPointF> &dst);
   /*======= End of Unsed fonctions =======*/
 
   /// Sets visibility of mapping.
-  void setMappingVisible(uid mappingId, bool visible);
+  void setLayerVisible(uid mappingId, bool visible);
 
   /// Sets solo status of mapping.
-  void setMappingSolo(uid mappingId, bool solo);
+  void setLayerSolo(uid mappingId, bool solo);
 
   /// Sets locked attribute of mapping.
-  void setMappingLocked(uid mappingId, bool locked);
+  void setLayerLocked(uid mappingId, bool locked);
 
   /// Deletes/removes a mapping.
-  void deleteMapping(uid mappingId);
+  void deleteLayer(uid mappingId);
 
   /// Moves a mapping to given index.
-  void moveMapping(uid mappingId, int idx);
+  void moveLayer(uid mappingId, int idx);
 
   /// Clone/duplicate a mapping
-  void duplicateMapping(uid mappingId);
+  void duplicateLayer(uid mappingId);
 
-  /// Deletes/removes a paint and all associated mappigns.
-  void deletePaint(uid paintId, bool replace = false);
+  /// Deletes/removes a source and all associated mappigns.
+  void deleteSource(uid sourceId, bool replace = false);
 
   /// Updates all canvases.
   void updateCanvases();
@@ -252,7 +252,7 @@ public slots:
   void processFrame();
 
   /**
-   * Performs operations related to the playing state, such as making sure to play only paints
+   * Performs operations related to the playing state, such as making sure to play only sources
    * that are visible.
    */
   void updatePlayingState();
@@ -260,14 +260,14 @@ public slots:
   // Editing toggles.
   void setFramesPerSecond(qreal fps);
   void enableDisplayControls(bool display);
-  void enableDisplayPaintControls(bool display);
+  void enableDisplaySourceControls(bool display);
   void enableStickyVertices(bool display);
   void displayUndoHistory(bool display);
 
   // Show Mapping Context Menu
-  void showMappingContextMenu(const QPoint &point);
-  // Show Paint Context Menu
-  void showPaintContextMenu(const QPoint &point);
+  void showLayerContextMenu(const QPoint &point);
+  // Show Source Context Menu
+  void showSourceContextMenu(const QPoint &point);
 
   /// Start playback.
   void play(bool updatePlayPauseActions=true);
@@ -285,8 +285,8 @@ public slots:
   void createLayout();
   void createActions();
   void createMenus();
-  void createMappingContextMenu();
-  void createPaintContextMenu();
+  void createLayerContextMenu();
+  void createSourceContextMenu();
   void createToolBars();
   void createStatusBar();
   void updateRecentFileActions();
@@ -311,18 +311,18 @@ public slots:
   void setCurrentFile(const QString &fileName);
   void setCurrentVideo(const QString &filename);
   bool importMediaFile(const QString &fileName, bool isImage = false, bool isCamera = false);
-  bool addColorPaint(const QColor& color);
-  void addMappingItem(uid mappingId);
-  void removeMappingItem(uid mappingId);
-  void moveMappingItem(uid mappingId, int steps);
-  void addPaintItem(uid paintId, const QIcon& icon, const QString& name);
-  void updatePaintItem(uid paintId, const QIcon& icon, const QString& name);
-  void removePaintItem(uid paintId);
-  void renameMapping(uid mappingId, const QString& name);
-  void renamePaint(uid paintId, const QString& name);
+  bool addColorSource(const QColor& color);
+  void addLayerItem(uid mappingId);
+  void removeLayerItem(uid mappingId);
+  void moveLayerItem(uid mappingId, int steps);
+  void addSourceItem(uid sourceId, const QIcon& icon, const QString& name);
+  void updateSourceItem(uid sourceId, const QIcon& icon, const QString& name);
+  void removeSourceItem(uid sourceId);
+  void renameLayer(uid mappingId, const QString& name);
+  void renameSource(uid sourceId, const QString& name);
   void clearWindow();
   // Resync mapping manager order the same as the GUI.
-  void syncMappingManager();
+  void syncLayerManager();
   // Check if the file exists
   bool fileExists(const QString& file);
   // Check if the file is supported
@@ -336,11 +336,11 @@ public slots:
   // Returns a short version of filename.
   static QString strippedName(const QString &fullFileName);
 
-  // Returns the paint icon depending on play/pause state.
-  static const QIcon getPaintIcon(Paint::ptr paint);
+  // Returns the source icon depending on play/pause state.
+  static const QIcon getSourceIcon(Source::ptr source);
 
 private:
-  // Connects/disconnects project-specific widgets (paints and mappings).
+  // Connects/disconnects project-specific widgets (sources and mappings).
   void connectProjectWidgets();
   void disconnectProjectWidgets();
 
@@ -349,7 +349,7 @@ public slots:
   static void setItemId(QListWidgetItem& item, uid id);
   static QListWidgetItem* getItemFromId(const QListWidget& list, uid id);
   static int getItemRowFromId(const QListWidget& list, uid id);
-  uid currentMappingItemId() const;
+  uid currentLayerItemId() const;
 
   static QIcon createColorIcon(const QColor& color);
   static QIcon createFileIcon(const QString& filename);
@@ -369,8 +369,8 @@ public slots:
   QMenu *outputScreenMenu;
   QMenu *recentFileMenu;
   QMenu *recentVideoMenu;
-  QMenu *mappingContextMenu;
-  QMenu *paintContextMenu;
+  QMenu *layerContextMenu;
+  QMenu *sourceContextMenu;
 
   // Some menus when need to be separated
   QMenu *sourceMenu;
@@ -395,27 +395,27 @@ public slots:
   QAction *undoAction;
   QAction *redoAction;
   // Mappings context menu actions
-  QAction *duplicateMappingAction;
-  QAction *deleteMappingAction;
-  QAction *renameMappingAction;
-  QAction *mappingSoloAction;
-  QAction *mappingLockedAction;
-  QAction *mappingHideAction;
+  QAction *duplicateLayerAction;
+  QAction *deleteLayerAction;
+  QAction *renameLayerAction;
+  QAction *layerSoloAction;
+  QAction *layerLockedAction;
+  QAction *layerHideAction;
   // Transform.
-  QAction *mappingRotate90CWAction;
-  QAction *mappingRotate90CCWAction;
-  QAction *mappingRotate180Action;
-  QAction *mappingHorizontalFlipAction;
-  QAction *mappingVerticalFlipAction;
+  QAction *layerRotate90CWAction;
+  QAction *layerRotate90CCWAction;
+  QAction *layerRotate180Action;
+  QAction *layerHorizontalFlipAction;
+  QAction *layerVerticalFlipAction;
   // Layer reordering.
-  QAction *mappingRaiseAction;
-  QAction *mappingLowerAction;
-  QAction *mappingRaiseToTopAction;
-  QAction *mappingLowerToBottomAction;
-
-  // Paints context menu action
-  QAction *deletePaintAction;
-  QAction *renamePaintAction;
+  QAction *layerRaiseAction;
+  QAction *layerLowerAction;
+  QAction *layerRaiseToTopAction;
+  QAction *layerLowerToBottomAction;
+
+  // Sources context menu action
+  QAction *deleteSourceAction;
+  QAction *renameSourceAction;
   QAction *preferencesAction;
   QAction *aboutAction;
   QAction *clearRecentFileActions;
@@ -431,7 +431,7 @@ public slots:
 
   QAction *outputFullScreenAction;
   QAction *displayControlsAction;
-  QAction *displayPaintControlsAction;
+  QAction *displaySourceControlsAction;
   QAction *displayTestSignalAction;
   QAction *stickyVerticesAction;
   QAction *displayUndoHistoryAction;
@@ -470,13 +470,13 @@ public slots:
   // Widgets and layout.
   QTabWidget* contentTab;
 
-  QSplitter* paintSplitter;
-  QListWidget* paintList;
-  QStackedWidget* paintPropertyPanel;
+  QSplitter* sourceSplitter;
+  QListWidget* sourceList;
+  QStackedWidget* sourcePropertyPanel;
 
-  QSplitter* mappingSplitter;
-  QTableView* mappingList;
-  QStackedWidget* mappingPropertyPanel;
+  QSplitter* layerSplitter;
+  QTableView* layerList;
+  QStackedWidget* layerPropertyPanel;
 
   QUndoView* undoView;
 
@@ -510,8 +510,8 @@ public slots:
 
   // Model.
   MappingManager* mappingManager;
-  MappingListModel *mappingListModel;
-  MappingItemDelegate *mappingItemDelegate;
+  LayerListModel *layerListModel;
+  LayerItemDelegate *layerItemDelegate;
 
   // OSC.
   OscInterface::ptr osc_interface;
@@ -521,14 +521,14 @@ public slots:
   // View.
 
   // The view counterpart of Mappings.
-  QMap<uid, MappingGui::ptr> mappers;
-  QMap<uid, PaintGui::ptr> paintGuis;
+  QMap<uid, LayerGui::ptr> layerGuis;
+  QMap<uid, SourceGui::ptr> sourceGuis;
 
-  // Current selected paint/mapping.
-  uid currentPaintId;
-  uid currentMappingId;
-  bool _hasCurrentMapping;
-  bool _hasCurrentPaint;
+  // Current selected source/mapping.
+  uid currentSourceId;
+  uid currentLayerId;
+  bool _hasCurrentLayer;
+  bool _hasCurrentSource;
 
   // Number of frames per second.
   qreal _framesPerSecond;
@@ -539,8 +539,8 @@ public slots:
   // True iff we are displaying the controls.
   bool _displayControls;
 
-  // True iff we are displaying the borders of all controls of all shapes related to a paint.
-  bool _displayPaintControls;
+  // True iff we are displaying the borders of all controls of all shapes related to a source.
+  bool _displaySourceControls;
 
   // True iff we want vertices to stick to each other.
   bool _stickyVertices;
@@ -550,7 +550,7 @@ public slots:
   // Menu bar hidden state
   bool _showMenuBar;
 
-  // Keeps track of the current selected item, wether it's a paint or mapping.
+  // Keeps track of the current selected item, wether it's a source or mapping.
   QListWidgetItem* currentSelectedItem;
   QModelIndex currentSelectedIndex;
   QTimer *videoTimer;
@@ -573,28 +573,28 @@ public slots:
   QLabel *mousePosLabel;
   QLabel *trueFramesPerSecondsLabel;
 
-  typedef Paint::SourceType SourceType;
+  typedef Source::SourceType SourceType;
   typedef MShape::ShapeType ShapeType ;
 
 public:
   // Accessor/mutators for the view. ///////////////////////////////////////////////////////////////////
   MappingManager& getMappingManager() const { return *mappingManager; }
 
-  MappingGui::ptr getMappingGuiByMappingId(uint id) const { return mappers[id]; }
-  PaintGui::ptr getPaintGuiByPaintId(uint id) const { return paintGuis[id]; }
+  LayerGui::ptr getLayerGuiByLayerId(uint id) const { return layerGuis[id]; }
+  SourceGui::ptr getSourceGuiBySourceId(uint id) const { return sourceGuis[id]; }
 
-  uid getCurrentPaintId() const { return currentPaintId; }
-  uid getCurrentMappingId() const { return currentMappingId; }
+  uid getCurrentSourceId() const { return currentSourceId; }
+  uid getCurrentLayerId() const { return currentLayerId; }
 
-  Mapping::ptr getCurrentMapping() const { return mappingManager->getMappingById(currentMappingId); }
-  Paint::ptr getCurrentPaint() const { return mappingManager->getPaintById(currentPaintId); }
+  Layer::ptr getCurrentLayer() const { return mappingManager->getLayerById(currentLayerId); }
+  Source::ptr getCurrentSource() const { return mappingManager->getSourceById(currentSourceId); }
 
-  bool hasCurrentPaint() const { return _hasCurrentPaint; }
-  bool hasCurrentMapping() const { return _hasCurrentMapping; }
-  void setCurrentPaint(int uid);
-  void setCurrentMapping(int uid);
-  void removeCurrentPaint();
-  void removeCurrentMapping();
+  bool hasCurrentSource() const { return _hasCurrentSource; }
+  bool hasCurrentLayer() const { return _hasCurrentLayer; }
+  void setCurrentSource(int uid);
+  void setCurrentLayer(int uid);
+  void removeCurrentSource();
+  void removeCurrentLayer();
 
   OutputGLWindow* getOutputWindow() const { return outputWindow; }
   MapperGLCanvas* getSourceCanvas() const { return sourceCanvas; }
@@ -610,8 +610,8 @@ public slots:
   /// Returns true iff we should display the controls.
   bool displayControls() const { return _displayControls; }
 
-  /// Returns true iff we should display all of the shapes related to a paint.
-  bool displayPaintControls() const { return _displayPaintControls; }
+  /// Returns true iff we should display all of the shapes related to a source.
+  bool displaySourceControls() const { return _displaySourceControls; }
 
   /// Returns true iff we want vertices to stick to each other.
   bool isStickyVertices() const { return _stickyVertices; }
diff --git a/src/gui/MapperGLCanvas.cpp b/src/gui/MapperGLCanvas.cpp
index 704be27b..835bcb10 100644
--- a/src/gui/MapperGLCanvas.cpp
+++ b/src/gui/MapperGLCanvas.cpp
@@ -90,7 +90,7 @@ MapperGLCanvas::MapperGLCanvas(MainWindow* mainWindow,
   undoStack = mainWindow->getUndoStack();
 }
 
-MShape::ptr MapperGLCanvas::getShapeFromMapping(Mapping::ptr mapping)
+MShape::ptr MapperGLCanvas::getShapeFromMapping(Layer::ptr mapping)
 {
   if (mapping.isNull())
   {
@@ -104,10 +104,10 @@ MShape::ptr MapperGLCanvas::getShapeFromMapping(Mapping::ptr mapping)
 
 MShape::ptr MapperGLCanvas::getCurrentShape()
 {
-  return getShapeFromMapping(MainWindow::window()->getCurrentMapping());
+  return getShapeFromMapping(MainWindow::window()->getCurrentLayer());
 }
 
-QSharedPointer<ShapeGraphicsItem> MapperGLCanvas::getShapeGraphicsItemFromMapping(Mapping::ptr mapping)
+QSharedPointer<ShapeGraphicsItem> MapperGLCanvas::getShapeGraphicsItemFromMapping(Layer::ptr mapping)
 {
   if (mapping.isNull())
   {
@@ -115,14 +115,14 @@ QSharedPointer<ShapeGraphicsItem> MapperGLCanvas::getShapeGraphicsItemFromMappin
   }
   else
   {
-    MappingGui::ptr mappingGui = MainWindow::window()->getMappingGuiByMappingId(mapping->getId());
-    return (isOutput() ? mappingGui->getGraphicsItem() : mappingGui->getInputGraphicsItem());
+    LayerGui::ptr layerGui = MainWindow::window()->getLayerGuiByLayerId(mapping->getId());
+    return (isOutput() ? layerGui->getGraphicsItem() : layerGui->getInputGraphicsItem());
   }
 }
 
 QSharedPointer<ShapeGraphicsItem> MapperGLCanvas::getCurrentShapeGraphicsItem()
 {
-  return getShapeGraphicsItemFromMapping(_mainWindow->getCurrentMapping());
+  return getShapeGraphicsItemFromMapping(_mainWindow->getCurrentLayer());
 }
 
 // Draws foreground (displays crosshair if needed).
@@ -131,22 +131,22 @@ void MapperGLCanvas::drawForeground(QPainter *painter , const QRectF &rect)
   Q_UNUSED(rect);
   if (MainWindow::window()->displayControls())
   {
-    uid mid = MainWindow::window()->getCurrentMappingId();
+    uid mid = MainWindow::window()->getCurrentLayerId();
     if (mid != NULL_UID)
     {
 
       // Display other controls.
-      if (_mainWindow->displayPaintControls())
+      if (_mainWindow->displaySourceControls())
       {
-        QMap<uid, Mapping::ptr> paintMappings = _mainWindow->getMappingManager().getPaintMappings( _mainWindow->getCurrentPaint() );
-        for (QMap<uid, Mapping::ptr>::const_iterator it = paintMappings.constBegin();
-             it != paintMappings.constEnd(); ++it)
+        QMap<uid, Layer::ptr> sourceLayers = _mainWindow->getMappingManager().getSourceLayers( _mainWindow->getCurrentSource() );
+        for (QMap<uid, Layer::ptr>::const_iterator it = sourceLayers.constBegin();
+             it != sourceLayers.constEnd(); ++it)
         {
           if (it.key() != mid)
           {
-            ShapeGraphicsItem::ptr paintMappingItem = getShapeGraphicsItemFromMapping(it.value());
-            if (paintMappingItem)
-              paintMappingItem->getControlPainter()->paintShape(painter, this, false);
+            ShapeGraphicsItem::ptr sourceLayerItem = getShapeGraphicsItemFromMapping(it.value());
+            if (sourceLayerItem)
+              sourceLayerItem->getControlPainter()->paintShape(painter, this, false);
           }
         }
       }
@@ -311,8 +311,8 @@ void MapperGLCanvas::mousePressEvent(QMouseEvent* event)
 
     // Possibility of changing shape in output by clicking on it.
     MappingManager manager = getMainWindow()->getMappingManager();
-    QVector<Mapping::ptr> mappings = manager.getVisibleMappings();
-    for (QVector<Mapping::ptr>::const_iterator it = mappings.begin();
+    QVector<Layer::ptr> mappings = manager.getVisibleLayers();
+    for (QVector<Layer::ptr>::const_iterator it = mappings.begin();
          it != mappings.end(); ++it)
     {
       MShape::ptr shape = getShapeFromMapping(*it);
@@ -329,7 +329,7 @@ void MapperGLCanvas::mousePressEvent(QMouseEvent* event)
         if (isOutput() && shape != selectedShape)
         {
           // Change current mapping.
-          getMainWindow()->setCurrentMapping((*it)->getId());
+          getMainWindow()->setCurrentLayer((*it)->getId());
 
           // Reset selected shape to new one.
           selectedShape = getCurrentShape();
@@ -856,9 +856,9 @@ void MapperGLCanvas::_snapVertex(QPointF* p)
   int vertexStickRadius = settings.value("vertexStickRadius", MM::VERTEX_STICK_RADIUS).toInt();
   MappingManager manager = MainWindow::window()->getMappingManager();
   MShape::ptr currentShape = getCurrentShape();
-  for (int i = 0; i < manager.nMappings(); i++)
+  for (int i = 0; i < manager.nLayers(); i++)
   {
-    MShape::ptr shape = getShapeFromMapping(manager.getMapping(i));
+    MShape::ptr shape = getShapeFromMapping(manager.getLayer(i));
     if (shape && shape != currentShape)
     {
       for (int vertex = 0; vertex < shape->nVertices(); vertex++)
diff --git a/src/gui/MapperGLCanvas.h b/src/gui/MapperGLCanvas.h
index e11e1fcc..7c026652 100644
--- a/src/gui/MapperGLCanvas.h
+++ b/src/gui/MapperGLCanvas.h
@@ -36,7 +36,7 @@
 #include "UidAllocator.h"
 #include "Shape.h"
 
-#include "MappingGui.h"
+#include "LayerGui.h"
 
 namespace mmp {
 
@@ -58,9 +58,9 @@ class MapperGLCanvas: public QGraphicsView
   /// Returns shape associated with mapping id.
   virtual bool isOutput() const { return _isOutput; }
 
-  MShape::ptr getShapeFromMapping(Mapping::ptr mapping);
+  MShape::ptr getShapeFromMapping(Layer::ptr mapping);
   MShape::ptr getCurrentShape();
-  QSharedPointer<ShapeGraphicsItem> getShapeGraphicsItemFromMapping(Mapping::ptr mapping);
+  QSharedPointer<ShapeGraphicsItem> getShapeGraphicsItemFromMapping(Layer::ptr mapping);
   QSharedPointer<ShapeGraphicsItem> getCurrentShapeGraphicsItem();
 
 //  QSize sizeHint() const;
diff --git a/src/gui/ShapeGraphicsItem.cpp b/src/gui/ShapeGraphicsItem.cpp
index 09ab48c6..a579739e 100644
--- a/src/gui/ShapeGraphicsItem.cpp
+++ b/src/gui/ShapeGraphicsItem.cpp
@@ -25,10 +25,10 @@
 
 namespace mmp {
 
-ShapeGraphicsItem::ShapeGraphicsItem(Mapping::ptr mapping, bool output)
+ShapeGraphicsItem::ShapeGraphicsItem(Layer::ptr mapping, bool output)
   : _mapping(mapping), _output(output)
 {
-  _shape = output ? getMapping()->getShape() : getMapping()->getInputShape();
+  _shape = output ? getLayer()->getShape() : getLayer()->getInputShape();
 }
 
 MapperGLCanvas* ShapeGraphicsItem::getCanvas() const
@@ -37,12 +37,12 @@ MapperGLCanvas* ShapeGraphicsItem::getCanvas() const
   return isOutput() ? win->getDestinationCanvas() : win->getSourceCanvas();
 }
 
-bool ShapeGraphicsItem::isMappingCurrent() const {
-  return MainWindow::window()->getCurrentMappingId() == getMapping()->getId();
+bool ShapeGraphicsItem::isLayerCurrent() const {
+  return MainWindow::window()->getCurrentLayerId() == getLayer()->getId();
 }
 
-bool ShapeGraphicsItem::isMappingVisible() const {
-  return MainWindow::window()->getMappingManager().mappingIsVisible(getMapping());
+bool ShapeGraphicsItem::isLayerVisible() const {
+  return MainWindow::window()->getMappingManager().layerIsVisible(getLayer());
 }
 
 void ShapeGraphicsItem::paint(QPainter *painter,
@@ -52,11 +52,11 @@ void ShapeGraphicsItem::paint(QPainter *painter,
 
   // Sync depth of figure with that of mapping (for layered output).
   if (isOutput())
-    setZValue(MainWindow::window()->getMappingManager().getMappingDepth(getMapping()));
-    //setZValue(getMapping()->getDepth());
+    setZValue(MainWindow::window()->getMappingManager().getLayerDepth(getLayer()));
+    //setZValue(getLayer()->getDepth());
 
   // Paint if visible.
-  if (isMappingVisible())
+  if (isLayerVisible())
   {
     // Paint whatever needs to be painted.
     _prePaint(painter, option);
@@ -68,7 +68,7 @@ void ShapeGraphicsItem::paint(QPainter *painter,
 //void VertexGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
 //{
 //  ShapeGraphicsItem* shapeParent = static_cast<ShapeGraphicsItem*>(parentItem());
-//  if (!shapeParent->isMappingVisible())
+//  if (!shapeParent->isLayerVisible())
 //  {
 //    // Prevent mouse grabbing.
 //    event->ignore();
@@ -80,12 +80,12 @@ void ShapeGraphicsItem::paint(QPainter *painter,
 //      QGraphicsItem::mousePressEvent(event);
 //      if (event->button() == Qt::LeftButton)
 //      {
-//        MainWindow::instance()->setCurrentMapping(shapeParent->getMapping()->getId());
+//        MainWindow::instance()->setCurrentMapping(shapeParent->getLayer()->getId());
 //      }
 //    }
 //    else
 //    {
-//      if (shapeParent->isMappingCurrent())
+//      if (shapeParent->isLayerCurrent())
 //        QGraphicsItem::mousePressEvent(event);
 //      else
 //        event->ignore(); // prevent mousegrabbing on non-current mapping
@@ -101,8 +101,8 @@ void ShapeGraphicsItem::paint(QPainter *painter,
 ////  if (MainWindow::instance()->displayControls())
 ////  {
 ////    ShapeGraphicsItem* shapeParent = static_cast<ShapeGraphicsItem*>(parentItem());
-////    if (shapeParent->isMappingVisible() &&
-////        shapeParent->isMappingCurrent())
+////    if (shapeParent->isLayerVisible() &&
+////        shapeParent->isLayerCurrent())
 ////    {
 ////      qreal zoomFactor = 1.0 / shapeParent->getCanvas()->getZoomFactor();
 ////      resetMatrix();
@@ -117,18 +117,18 @@ void ColorGraphicsItem::_prePaint(QPainter *painter,
 {
   Q_UNUSED(option);
 
-  Color* color = static_cast<Color*>(getMapping()->getPaint().data());
+  Color* color = static_cast<Color*>(getLayer()->getSource().data());
   Q_ASSERT(color);
 
   painter->setPen(Qt::NoPen);
 
   // Set brush.
   QColor col = color->getColor();
-  col.setAlphaF(getMapping()->getComputedOpacity());
+  col.setAlphaF(getLayer()->getComputedOpacity());
   painter->setBrush(col);
 }
 
-PolygonColorGraphicsItem::PolygonColorGraphicsItem(Mapping::ptr mapping, bool output)
+PolygonColorGraphicsItem::PolygonColorGraphicsItem(Layer::ptr mapping, bool output)
   : ColorGraphicsItem(mapping, output) {
   _controlPainter.reset(new PolygonControlPainter(this));
 }
@@ -151,7 +151,7 @@ void PolygonColorGraphicsItem::_doPaint(QPainter *painter,
   painter->drawPolygon(mapFromScene(poly->toPolygon()));
 }
 
-MeshColorGraphicsItem::MeshColorGraphicsItem(Mapping::ptr mapping, bool output)
+MeshColorGraphicsItem::MeshColorGraphicsItem(Layer::ptr mapping, bool output)
 : PolygonColorGraphicsItem(mapping, output)
 {
   _controlPainter.reset(new MeshControlPainter(this));
@@ -177,7 +177,7 @@ void MeshColorGraphicsItem::_doPaint(QPainter *painter,
   }
 }
 
-EllipseColorGraphicsItem::EllipseColorGraphicsItem(Mapping::ptr mapping, bool output)
+EllipseColorGraphicsItem::EllipseColorGraphicsItem(Layer::ptr mapping, bool output)
   : ColorGraphicsItem(mapping, output) {
     _controlPainter.reset(new EllipseControlPainter(this));
   }
@@ -203,10 +203,10 @@ void EllipseColorGraphicsItem::_doPaint(QPainter* painter,
   painter->drawPath(shape());
 }
 
-TextureGraphicsItem::TextureGraphicsItem(Mapping::ptr mapping, bool output)
+TextureGraphicsItem::TextureGraphicsItem(Layer::ptr mapping, bool output)
   : ShapeGraphicsItem(mapping, output)
 {
-  _textureMapping = qSharedPointerCast<TextureMapping>(mapping);
+  _textureMapping = qSharedPointerCast<TextureLayer>(mapping);
   Q_CHECK_PTR(_textureMapping);
 
   _inputShape = qSharedPointerCast<MShape>(_textureMapping.toStrongRef()->getInputShape());
@@ -227,7 +227,7 @@ void TextureGraphicsItem::_doPaint(QPainter *painter,
 void TextureGraphicsItem::_doDrawInput(QPainter* painter)
 {
   Q_UNUSED(painter);
-  if (isMappingCurrent())
+  if (isLayerCurrent())
   {
     // FIXME: Does this draw the quad counterclockwise?
     glBegin (GL_QUADS);
@@ -297,7 +297,7 @@ void TextureGraphicsItem::_prePaint(QPainter* painter,
 
   // Set texture color (apply opacity).
   glColor4f(1.0f, 1.0f, 1.0f,
-            isOutput() ? getMapping()->getComputedOpacity() : getMapping()->getPaint()->getOpacity());
+            isOutput() ? getLayer()->getComputedOpacity() : getLayer()->getSource()->getOpacity());
 
 }
 
@@ -313,7 +313,7 @@ void TextureGraphicsItem::_postPaint(QPainter* painter,
 
 QSharedPointer<Texture> TextureGraphicsItem::_getTexture()
 {
-  return qSharedPointerCast<Texture>(_textureMapping.toStrongRef()->getPaint());
+  return qSharedPointerCast<Texture>(_textureMapping.toStrongRef()->getSource());
 }
 
 QPainterPath PolygonTextureGraphicsItem::shape() const
@@ -346,11 +346,11 @@ void TriangleTextureGraphicsItem::_doDrawOutput(QPainter* painter)
   }
 }
 
-PolygonTextureGraphicsItem::PolygonTextureGraphicsItem(Mapping::ptr mapping, bool output) : TextureGraphicsItem(mapping, output) {
+PolygonTextureGraphicsItem::PolygonTextureGraphicsItem(Layer::ptr mapping, bool output) : TextureGraphicsItem(mapping, output) {
   _controlPainter.reset(new PolygonControlPainter(this));
 }
 
-MeshTextureGraphicsItem::MeshTextureGraphicsItem(Mapping::ptr mapping, bool output) : PolygonTextureGraphicsItem(mapping, output) {
+MeshTextureGraphicsItem::MeshTextureGraphicsItem(Layer::ptr mapping, bool output) : PolygonTextureGraphicsItem(mapping, output) {
   _controlPainter.reset(new MeshControlPainter(this));
   _nHorizontalQuads = _nVerticalQuads = -1;
   _wasGrabbing = false;
@@ -379,7 +379,7 @@ void MeshTextureGraphicsItem::_doDrawOutput(QPainter* painter)
 
     // Keep track of whether we are currently grabbing the shape or a vertex so as to
     // reduce resolution when editing (to prevent lags).
-    bool grabbing = (isMappingCurrent() &&
+    bool grabbing = (isLayerCurrent() &&
                      (getCanvas()->shapeGrabbed() || getCanvas()->vertexGrabbed()));
 
     // Max depth is adjusted to draw less quads during click & drag.
@@ -555,7 +555,7 @@ void EllipseTextureGraphicsItem::DrawingData::setPointOfEllipseAtAngle(QPointF&
   point.setY( sin(angle + rotation) * distance + center.y() );
 }
 
-EllipseTextureGraphicsItem::EllipseTextureGraphicsItem(Mapping::ptr mapping, bool output) : TextureGraphicsItem(mapping, output) {
+EllipseTextureGraphicsItem::EllipseTextureGraphicsItem(Layer::ptr mapping, bool output) : TextureGraphicsItem(mapping, output) {
   _controlPainter.reset(new EllipseControlPainter(this));
 }
 
diff --git a/src/gui/ShapeGraphicsItem.h b/src/gui/ShapeGraphicsItem.h
index c01795b0..0f2712df 100644
--- a/src/gui/ShapeGraphicsItem.h
+++ b/src/gui/ShapeGraphicsItem.h
@@ -36,8 +36,8 @@
 
 #include <QGraphicsItem>
 #include <QCoreApplication>
-#include "Paint.h"
-#include "Mapping.h"
+#include "Source.h"
+#include "Layer.h"
 #include "MapperGLCanvas.h"
 
 namespace mmp {
@@ -57,7 +57,7 @@ class ShapeGraphicsItem : public QGraphicsItem
   typedef QSharedPointer<ShapeGraphicsItem> ptr;
 
 protected:
-  ShapeGraphicsItem(Mapping::ptr mapping, bool output=true);
+  ShapeGraphicsItem(Layer::ptr mapping, bool output=true);
 public:
   virtual ~ShapeGraphicsItem() {}
 
@@ -66,7 +66,7 @@ class ShapeGraphicsItem : public QGraphicsItem
   MShape::ptr getShape() const { return _shape.toStrongRef(); }
 
   /// Returns the mapping.
-  Mapping::ptr getMapping() const { return _mapping.toStrongRef(); }
+  Layer::ptr getLayer() const { return _mapping.toStrongRef(); }
 
   /// Returns the control painter (see below).
   QSharedPointer<ShapeControlPainter> getControlPainter() { return _controlPainter; }
@@ -78,10 +78,10 @@ class ShapeGraphicsItem : public QGraphicsItem
   MapperGLCanvas* getCanvas() const;
 
   /// Returns whether the mapping this shape is associated with is currently selected.
-  bool isMappingCurrent() const;
+  bool isLayerCurrent() const;
 
   /// Returns whether the mapping this shape is associated should be visible.
-  bool isMappingVisible() const;
+  bool isLayerVisible() const;
 
   /// Returns the bounding rectangle of this item.
   virtual QRectF boundingRect() const { return shape().boundingRect(); }
@@ -108,7 +108,7 @@ class ShapeGraphicsItem : public QGraphicsItem
   { Q_UNUSED(painter); Q_UNUSED(option); }
 
 protected:
-  QWeakPointer<Mapping> _mapping;
+  QWeakPointer<Layer> _mapping;
   QWeakPointer<MShape> _shape;
   QSharedPointer<ShapeControlPainter>  _controlPainter;
   bool _output;
@@ -117,7 +117,7 @@ class ShapeGraphicsItem : public QGraphicsItem
 class ColorGraphicsItem : public ShapeGraphicsItem
 {
 protected:
-  ColorGraphicsItem(Mapping::ptr mapping, bool output=true)
+  ColorGraphicsItem(Layer::ptr mapping, bool output=true)
     : ShapeGraphicsItem(mapping, output) {}
 public:
   virtual ~ColorGraphicsItem() {}
@@ -131,7 +131,7 @@ class ColorGraphicsItem : public ShapeGraphicsItem
 class PolygonColorGraphicsItem : public ColorGraphicsItem
 {
 public:
-  PolygonColorGraphicsItem(Mapping::ptr mapping, bool output=true);
+  PolygonColorGraphicsItem(Layer::ptr mapping, bool output=true);
   virtual ~PolygonColorGraphicsItem() {}
 
   virtual QPainterPath shape() const;
@@ -147,7 +147,7 @@ class PolygonColorGraphicsItem : public ColorGraphicsItem
 class MeshColorGraphicsItem : public PolygonColorGraphicsItem
 {
 public:
-  MeshColorGraphicsItem(Mapping::ptr mapping, bool output=true);
+  MeshColorGraphicsItem(Layer::ptr mapping, bool output=true);
   virtual ~MeshColorGraphicsItem(){}
 
 protected:
@@ -160,7 +160,7 @@ class MeshColorGraphicsItem : public PolygonColorGraphicsItem
 class EllipseColorGraphicsItem : public ColorGraphicsItem
 {
 public:
-  EllipseColorGraphicsItem(Mapping::ptr mapping, bool output=true);
+  EllipseColorGraphicsItem(Layer::ptr mapping, bool output=true);
   virtual ~EllipseColorGraphicsItem() {}
 
   virtual QPainterPath shape() const;
@@ -174,7 +174,7 @@ class EllipseColorGraphicsItem : public ColorGraphicsItem
 class TextureGraphicsItem : public ShapeGraphicsItem
 {
 public:
-  TextureGraphicsItem(Mapping::ptr mapping, bool output=true);
+  TextureGraphicsItem(Layer::ptr mapping, bool output=true);
 
   virtual ~TextureGraphicsItem() {}
 
@@ -187,7 +187,7 @@ class TextureGraphicsItem : public ShapeGraphicsItem
   virtual void _doDrawInput(QPainter* painter);
 
 protected:
-  QWeakPointer<TextureMapping> _textureMapping;
+  QWeakPointer<TextureLayer> _textureMapping;
   QWeakPointer<MShape> _inputShape;
 
 	QSharedPointer<Texture> _getTexture();
@@ -197,7 +197,7 @@ class TextureGraphicsItem : public ShapeGraphicsItem
 class PolygonTextureGraphicsItem : public TextureGraphicsItem
 {
 public:
-  PolygonTextureGraphicsItem(Mapping::ptr mapping, bool output=true);
+  PolygonTextureGraphicsItem(Layer::ptr mapping, bool output=true);
   virtual ~PolygonTextureGraphicsItem(){}
 
 public:
@@ -209,7 +209,7 @@ class PolygonTextureGraphicsItem : public TextureGraphicsItem
 class TriangleTextureGraphicsItem : public PolygonTextureGraphicsItem
 {
 public:
-  TriangleTextureGraphicsItem(Mapping::ptr mapping, bool output=true) : PolygonTextureGraphicsItem(mapping, output) {}
+  TriangleTextureGraphicsItem(Layer::ptr mapping, bool output=true) : PolygonTextureGraphicsItem(mapping, output) {}
   virtual ~TriangleTextureGraphicsItem(){}
 
   virtual void _doDrawOutput(QPainter* painter);
@@ -236,7 +236,7 @@ class MeshTextureGraphicsItem : public PolygonTextureGraphicsItem
     QList<CacheQuadMapping> subQuads;
   };
 public:
-  MeshTextureGraphicsItem(Mapping::ptr mapping, bool output=true);
+  MeshTextureGraphicsItem(Layer::ptr mapping, bool output=true);
   virtual ~MeshTextureGraphicsItem(){}
 
   virtual void _doDrawOutput(QPainter* painter);
@@ -282,7 +282,7 @@ class EllipseTextureGraphicsItem : public TextureGraphicsItem
   };
 
 public:
-  EllipseTextureGraphicsItem(Mapping::ptr mapping, bool output=true);
+  EllipseTextureGraphicsItem(Layer::ptr mapping, bool output=true);
   virtual ~EllipseTextureGraphicsItem(){}
 
   virtual QPainterPath shape() const;
diff --git a/src/gui/PaintGui.cpp b/src/gui/SourceGui.cpp
similarity index 83%
rename from src/gui/PaintGui.cpp
rename to src/gui/SourceGui.cpp
index 2491b28e..cc025f1a 100644
--- a/src/gui/PaintGui.cpp
+++ b/src/gui/SourceGui.cpp
@@ -1,5 +1,5 @@
 /*
- * PaintGui.cpp
+ * SourceGui.cpp
  *
  * (c) 2014 Sofian Audry -- info(@)sofianaudry(.)com
  *
@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <PaintGui.h>
+#include <SourceGui.h>
 
 namespace mmp {
 
-PaintGui::PaintGui(Paint::ptr paint)
-  : _paint(paint)
+SourceGui::SourceGui(Source::ptr source)
+  : _source(source)
 {
   // Create editor.
   _propertyBrowser = new QtTreePropertyBrowser;
@@ -37,51 +37,51 @@ PaintGui::PaintGui(Paint::ptr paint)
   // Mapping UID.
   _idItem = _variantManager->addProperty(QVariant::Int, QObject::tr("ID"));
   _idItem->setEnabled(false);
-  _idItem->setValue(_paint->getId());
+  _idItem->setValue(_source->getId());
   _propertyBrowser->addProperty(_idItem);
 
-  // Paint basic properties.
+  // Source basic properties.
   _opacityItem = _variantManager->addProperty(QVariant::Double, QObject::tr("Opacity (%)"));
   _opacityItem->setAttribute("minimum", 0.0);
   _opacityItem->setAttribute("maximum", 100.0);
   _opacityItem->setAttribute("decimals", 1);
-  _opacityItem->setValue(_paint->getOpacity()*100.0);
+  _opacityItem->setValue(_source->getOpacity()*100.0);
   _propertyBrowser->addProperty(_opacityItem);
 }
 
-PaintGui::~PaintGui()
+SourceGui::~SourceGui()
 {
   delete _propertyBrowser;
 }
 
-QWidget* PaintGui::getPropertiesEditor()
+QWidget* SourceGui::getPropertiesEditor()
 {
   return _propertyBrowser;
 }
 
-void PaintGui::setValue(QtProperty* property, const QVariant& value)
+void SourceGui::setValue(QtProperty* property, const QVariant& value)
 {
   if (property == _opacityItem)
   {
     double opacity = qBound(value.toDouble() / 100.0, 0.0, 1.0);
-    if (opacity != _paint->getOpacity())
+    if (opacity != _source->getOpacity())
     {
-      _paint->setOpacity(opacity);
-      emit valueChanged(_paint);
+      _source->setOpacity(opacity);
+      emit valueChanged(_source);
     }
   }
 }
 
-void PaintGui::setValue(QString propertyName, QVariant value)
+void SourceGui::setValue(QString propertyName, QVariant value)
 {
   if (propertyName == "opacity")
     _opacityItem->setValue(value.toDouble() * 100);
 }
 
-ColorGui::ColorGui(Paint::ptr paint)
-  : PaintGui(paint)
+ColorGui::ColorGui(Source::ptr source)
+  : SourceGui(source)
 {
-  color = qSharedPointerCast<Color>(paint);
+  color = qSharedPointerCast<Color>(source);
   Q_CHECK_PTR(color);
 
   _colorItem = _variantManager->addProperty(QVariant::Color,
@@ -95,10 +95,10 @@ ColorGui::ColorGui(Paint::ptr paint)
 void ColorGui::setValue(QtProperty* property, const QVariant& value) {
   if (property == _colorItem) {
     color->setColor(value.value<QColor>());
-    emit valueChanged(_paint);
+    emit valueChanged(_source);
   }
   else
-    PaintGui::setValue(property, value);
+    SourceGui::setValue(property, value);
 }
 
 void ColorGui::setValue(QString propertyName, QVariant value)
@@ -106,16 +106,16 @@ void ColorGui::setValue(QString propertyName, QVariant value)
   if (propertyName == "color")
     setValue(_colorItem, value);
   else
-    PaintGui::setValue(propertyName, value);
+    SourceGui::setValue(propertyName, value);
 }
 
-TextureGui::TextureGui(Paint::ptr paint) : PaintGui(paint) {
+TextureGui::TextureGui(Source::ptr source) : SourceGui(source) {
 }
 
-ImageGui::ImageGui(Paint::ptr paint)
-  : TextureGui(paint)
+ImageGui::ImageGui(Source::ptr source)
+  : TextureGui(source)
 {
-  image = qSharedPointerCast<Image>(paint);
+  image = qSharedPointerCast<Image>(source);
   Q_CHECK_PTR(image);
 
 _imageFileItem = _variantManager->addProperty(VariantManager::filePathTypeId(),
@@ -138,13 +138,13 @@ _imageFileItem->setValue(image->getUri());
 void ImageGui::setValue(QtProperty* property, const QVariant& value) {
   if (property == _imageFileItem) {
     image->setUri(value.toString());
-    emit valueChanged(_paint);
+    emit valueChanged(_source);
   }
   else if (property == _imageRateItem)
   {
     //double rateSign = (media->getRate() <= 0 ? -1 : +1);
     image->setRate(value.toDouble()/100.0);
-    emit valueChanged(_paint);
+    emit valueChanged(_source);
   }
   else
     TextureGui::setValue(property, value);
@@ -160,10 +160,10 @@ void ImageGui::setValue(QString propertyName, QVariant value)
     TextureGui::setValue(propertyName, value);
 }
 
-VideoGui::VideoGui(Paint::ptr paint)
-: TextureGui(paint)
+VideoGui::VideoGui(Source::ptr source)
+: TextureGui(source)
 {
-  media = qSharedPointerCast<Video>(paint);
+  media = qSharedPointerCast<Video>(source);
   Q_CHECK_PTR(media);
 
   _mediaFileItem = _variantManager->addProperty(VariantManager::filePathTypeId(),
@@ -202,24 +202,24 @@ void VideoGui::setValue(QtProperty* property, const QVariant& value)
   if (property == _mediaFileItem)
   {
     media->setUri(value.toString());
-    emit valueChanged(_paint);
+    emit valueChanged(_source);
   }
   else if (property == _mediaRateItem)
   {
     //double rateSign = (media->getRate() <= 0 ? -1 : +1);
     media->setRate(value.toDouble()/100.0);
-    emit valueChanged(_paint);
+    emit valueChanged(_source);
   }
 //    else if (property == _mediaReverseItem)
 //    {
 //      double absoluteRate = abs( media->getRate() );
 //      media->setRate( (value.toBool() ? -1 : +1) * absoluteRate );
-//      emit valueChanged(_paint);
+//      emit valueChanged(_source);
 //    }
   else if (property == _mediaVolumeItem)
   {
     media->setVolume(value.toDouble()/100.0);
-    emit valueChanged(_paint);
+    emit valueChanged(_source);
   }
   else
     TextureGui::setValue(property, value);
diff --git a/src/gui/PaintGui.h b/src/gui/SourceGui.h
similarity index 78%
rename from src/gui/PaintGui.h
rename to src/gui/SourceGui.h
index afbd8df4..17ddb241 100644
--- a/src/gui/PaintGui.h
+++ b/src/gui/SourceGui.h
@@ -1,5 +1,5 @@
 /*
- * PaintGui.h
+ * SourceGui.h
  *
  * (c) 2014 Sofian Audry -- info(@)sofianaudry(.)com
  *
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PAINTGUI_H_
-#define PAINTGUI_H_
+#ifndef SOURCEGUI_H_
+#define SOURCEGUI_H_
 
 
 #include <QtGlobal>
@@ -31,7 +31,7 @@
 
 #include "MM.h"
 
-#include "Paint.h"
+#include "Source.h"
 
 #include "qtpropertymanager.h"
 #include "qtvariantproperty.h"
@@ -45,22 +45,22 @@
 namespace mmp {
 
 /**
- * The view components corresponding to a Paint (which is the model) in the interface.
- * Mainly manages the property browser for the Paint.
+ * The view components corresponding to a Source (which is the model) in the interface.
+ * Mainly manages the property browser for the Source.
  *
- * In other words the PaintGui is to Paint what MappingGui is to Mapping.
+ * In other words the SourceGui is to Source what MappingGui is to Mapping.
  */
-class PaintGui : public QObject {
+class SourceGui : public QObject {
   Q_OBJECT
 
 public:
-  typedef QSharedPointer<PaintGui> ptr;
+  typedef QSharedPointer<SourceGui> ptr;
 
 public:
   // TODO: should be protected
-  /// Constructor. A paint gui applies to a paint.
-  PaintGui(Paint::ptr paint);
-  virtual ~PaintGui();
+  /// Constructor. A source gui applies to a source.
+  SourceGui(Source::ptr source);
+  virtual ~SourceGui();
 
 public:
   /// Returns a pointer to the properties editor for that mapper.
@@ -71,10 +71,10 @@ public slots:
   virtual void setValue(QString propertyName, QVariant value);
 
 signals:
-  void valueChanged(Paint::ptr);
+  void valueChanged(Source::ptr);
 
 protected:
-  Paint::ptr _paint;
+  Source::ptr _source;
   QtAbstractPropertyBrowser* _propertyBrowser;
   QtVariantEditorFactory* _variantFactory;
   QtVariantPropertyManager* _variantManager;
@@ -83,11 +83,11 @@ public slots:
   QtVariantProperty* _opacityItem;
 };
 
-class ColorGui : public PaintGui {
+class ColorGui : public SourceGui {
   Q_OBJECT
 
 public:
-  ColorGui(Paint::ptr paint);
+  ColorGui(Source::ptr source);
   virtual ~ColorGui() {}
 
 public slots:
@@ -99,11 +99,11 @@ public slots:
   QtVariantProperty* _colorItem;
 };
 
-class TextureGui : public PaintGui {
+class TextureGui : public SourceGui {
   Q_OBJECT
 
 public:
-  TextureGui(Paint::ptr paint);
+  TextureGui(Source::ptr source);
   virtual ~TextureGui() {}
 };
 
@@ -111,7 +111,7 @@ class ImageGui : public TextureGui {
   Q_OBJECT
 
 public:
-  ImageGui(Paint::ptr paint);
+  ImageGui(Source::ptr source);
   virtual ~ImageGui() {}
 
 public slots:
@@ -128,7 +128,7 @@ class VideoGui : public TextureGui {
   Q_OBJECT
 
 public:
-  VideoGui(Paint::ptr paint);
+  VideoGui(Source::ptr source);
   virtual ~VideoGui() {}
 
 public slots:
@@ -145,4 +145,4 @@ public slots:
 
 }
 
-#endif /* PAINTGUI_H_ */
+#endif /* SOURCEGUI_H_ */
diff --git a/src/gui/gui.pri b/src/gui/gui.pri
index 9c68c568..918bd49c 100644
--- a/src/gui/gui.pri
+++ b/src/gui/gui.pri
@@ -10,12 +10,12 @@ HEADERS += $$PWD/AboutDialog.h \
     $$PWD/MainWindow.h \
     $$PWD/MapperGLCanvas.h \
     $$PWD/MapperGLCanvasToolbar.h \
-    $$PWD/MappingGui.h \
-    $$PWD/MappingItemDelegate.h \
-    $$PWD/MappingListModel.h \
+    $$PWD/LayerGui.h \
+    $$PWD/LayerItemDelegate.h \
+    $$PWD/LayerListModel.h \
     $$PWD/OutputGLCanvas.h \
     $$PWD/OutputGLWindow.h \
-    $$PWD/PaintGui.h \
+    $$PWD/SourceGui.h \
     $$PWD/PreferenceDialog.h \
     $$PWD/ShapeControlPainter.h \
     $$PWD/ShapeGraphicsItem.h \
@@ -26,12 +26,12 @@ SOURCES += $$PWD/AboutDialog.cpp \
     $$PWD/MainWindow.cpp \
     $$PWD/MapperGLCanvas.cpp \
     $$PWD/MapperGLCanvasToolbar.cpp \
-    $$PWD/MappingGui.cpp \
-    $$PWD/MappingItemDelegate.cpp \
-    $$PWD/MappingListModel.cpp \
+    $$PWD/LayerGui.cpp \
+    $$PWD/LayerItemDelegate.cpp \
+    $$PWD/LayerListModel.cpp \
     $$PWD/OutputGLCanvas.cpp \
     $$PWD/OutputGLWindow.cpp \
-    $$PWD/PaintGui.cpp \
+    $$PWD/SourceGui.cpp \
     $$PWD/PreferenceDialog.cpp \
     $$PWD/ShapeControlPainter.cpp \
     $$PWD/ShapeGraphicsItem.cpp \

From c1c57f6eb6f2b13daae19f87add892bd38564e10 Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Sat, 23 May 2026 12:20:00 -0400
Subject: [PATCH 7/7] Fix all build warnings in our code

Replace deprecated Qt 5 APIs with Qt 6 equivalents:
- QVariant::Type enum with QMetaType::Type (Int, Double, QColor, QPointF, QSize)
- QVariant::type() with typeId()
- Q_OS_OSX with Q_OS_MACOS
- QMouseEvent::globalPos() with globalPosition().toPoint()

Silence OpenGL deprecation warnings on macOS with GL_SILENCE_DEPRECATION.
Remove QT_DISABLE_DEPRECATED_BEFORE=0 from qtpropertybrowser build config.
Fix unused variables and parameters, suppress nodiscard warnings.

We cannot replace QImage::mirrored() with flipped(), though:
for Qt < 6.8 compatibility
QImage::flipped() requires Qt 6.8+. Use mirrored() with warning
suppression macros to maintain compatibility with older Qt 6 versions.
---
 .gitignore                                       |  3 +++
 src/app/main.cpp                                 |  6 +++---
 src/control/OscInterface.cpp                     | 16 ++++++++--------
 src/control/qosc/oscsender.cpp                   |  2 +-
 src/core/CameraSurface.cpp                       |  3 +++
 src/core/Source.cpp                              |  3 +++
 src/gui/AboutDialog.cpp                          | 12 ++++++------
 src/gui/ConsoleWindow.cpp                        |  2 +-
 src/gui/LayerGui.cpp                             | 12 ++++++------
 src/gui/LayerListModel.cpp                       |  6 +++---
 src/gui/MainWindow.cpp                           |  6 ++----
 src/gui/MapperGLCanvas.cpp                       |  3 ++-
 src/gui/OutputGLCanvas.cpp                       |  4 +++-
 src/gui/PreferenceDialog.cpp                     |  6 +++---
 src/gui/SourceGui.cpp                            | 12 ++++++------
 .../qtpropertybrowser/src/qtpropertybrowser.pri  |  1 -
 src/src.pri                                      |  1 +
 17 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index a39ed2ec..7df723e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,6 @@ trash
 !resources/macOS/MapMap.icns
 
 *.json
+
+# Local development notes
+KNOWN-WARNINGS.txt
diff --git a/src/app/main.cpp b/src/app/main.cpp
index ca8b2994..47d9a987 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -143,12 +143,12 @@ int main(int argc, char *argv[])
     qtTranslator.load(QString("qt_%1").arg(lang),
                       QApplication::applicationDirPath().append("/translations"));
 #else
-    qtTranslator.load(QString("qtbase_%1").arg(lang),
+    (void)qtTranslator.load(QString("qtbase_%1").arg(lang),
                       QLibraryInfo::path(QLibraryInfo::TranslationsPath));
 #endif
     app.installTranslator(&qtTranslator);
 
-    appTranslator.load(QString(":/translations_mapmap_%1").arg(lang));
+    (void)appTranslator.load(QString(":/translations_mapmap_%1").arg(lang));
     app.installTranslator(&appTranslator);
   }
   else {
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
 
   // Load stylesheet.
   QFile stylesheet(":/stylesheet");
-  stylesheet.open(QFile::ReadOnly);
+  (void)stylesheet.open(QFile::ReadOnly);
   app.setStyleSheet(QLatin1String(stylesheet.readAll()));
 
   // read positional argument:
diff --git a/src/control/OscInterface.cpp b/src/control/OscInterface.cpp
index 9400008e..e330bfa8 100644
--- a/src/control/OscInterface.cpp
+++ b/src/control/OscInterface.cpp
@@ -90,7 +90,7 @@ void OscInterface::messageReceivedCb(const QString& oscAddress, const QVariantLi
   QString types = "";
   for (int i = 0; i < arguments.count(); ++ i) {
     QVariant argument = arguments[i];
-    QMetaType::Type type = static_cast<QMetaType::Type>(argument.type());
+    QMetaType::Type type = static_cast<QMetaType::Type>(argument.typeId());
 
     if (type == QMetaType::Int) {
       types += "i";
@@ -126,15 +126,15 @@ static void printCommand(QVariantList &command)
 {
   for (int i = 0; i < command.size(); ++i)
   {
-    if (command.at(i).type() == QVariant::Int)
+    if (command.at(i).typeId() == QMetaType::Int)
     {
       qDebug() << command.at(i).toInt() << " ";
     }
-    else if (command.at(i).type() == QVariant::Double)
+    else if (command.at(i).typeId() == QMetaType::Double)
     {
       qDebug() << command.at(i).toDouble() << " ";
     }
-    else if (command.at(i).type() == QVariant::String)
+    else if (command.at(i).typeId() == QMetaType::QString)
     {
       qDebug() << command.at(i).toString() << " ";
     }
@@ -161,11 +161,11 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
   {
     return;
   }
-  if (command.at(0).type() != QVariant::String)
+  if (command.at(0).typeId() != QMetaType::QString)
   {
     return;
   }
-  if (command.at(1).type() != QVariant::String)
+  if (command.at(1).typeId() != QMetaType::QString)
   {
     return;
   }
@@ -192,7 +192,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
         if (command.size() >= 3)
         {
           QVector<Source::ptr> sources;
-          if (command.at(2).type() == QVariant::String)
+          if (command.at(2).typeId() == QMetaType::QString)
             sources = main_window.getMappingManager().getSourcesByNameRegExp(command.at(2).toString());
           else
           {
@@ -225,7 +225,7 @@ void OscInterface::applyOscCommand(MainWindow &main_window, QVariantList & comma
         if (command.size() >= 3)
         {
           QVector<Layer::ptr> layers;
-          if (command.at(2).type() == QVariant::String)
+          if (command.at(2).typeId() == QMetaType::QString)
             layers = main_window.getMappingManager().getLayersByNameRegExp(command.at(2).toString());
           else
           {
diff --git a/src/control/qosc/oscsender.cpp b/src/control/qosc/oscsender.cpp
index cb750122..e147fed4 100644
--- a/src/control/qosc/oscsender.cpp
+++ b/src/control/qosc/oscsender.cpp
@@ -41,7 +41,7 @@ void OscSender::variantListToByteArray(QByteArray& outputResult, const QString&
 
     for (int i = 0; i < arguments.count(); ++ i) {
         QVariant argument = arguments[i];
-        QMetaType::Type type = static_cast<QMetaType::Type>(argument.type());
+        QMetaType::Type type = static_cast<QMetaType::Type>(argument.typeId());
 
         if (type == QMetaType::Int) {
             packet << argument.toInt();
diff --git a/src/core/CameraSurface.cpp b/src/core/CameraSurface.cpp
index d6ba1272..3843c03d 100644
--- a/src/core/CameraSurface.cpp
+++ b/src/core/CameraSurface.cpp
@@ -41,7 +41,10 @@ void CameraSurface::onVideoFrameChanged(const QVideoFrame& frame)
   _temporaryImage = img;
 #else
   // Straighten the image for OpenGL (bottom-left origin convention).
+  QT_WARNING_PUSH
+  QT_WARNING_DISABLE_DEPRECATED
   _temporaryImage = img.mirrored(true, false).transformed(QTransform().rotate(180));
+  QT_WARNING_POP
 #endif
 }
 
diff --git a/src/core/Source.cpp b/src/core/Source.cpp
index 315f9911..dfd670f5 100644
--- a/src/core/Source.cpp
+++ b/src/core/Source.cpp
@@ -108,7 +108,10 @@ void Image::build()
   _images.clear();
   for (int i = 0; i < reader.imageCount(); i++) {
     QImage raw = reader.read().convertToFormat(QImage::Format_RGBA8888);
+    QT_WARNING_PUSH
+    QT_WARNING_DISABLE_DEPRECATED
     _images.push_back(raw.mirrored(true, false).transformed(QTransform().rotate(180)));
+    QT_WARNING_POP
   }
 
   rewind();
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index 6707ab4a..ca13da11 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -95,11 +95,11 @@ void AboutDialog::createAboutTab()
   QString copyrightText = "<p>" + tr("Copyright &copy; 2013 %1.").arg(MM::COPYRIGHT_OWNERS) + "</p>";
   // License short notice
   QFile licenseShortFile(":/license-short");
-  licenseShortFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)licenseShortFile.open(QIODevice::ReadOnly | QIODevice::Text);
   QString licenseNoticeText = Qt::convertFromPlainText(QString::fromUtf8(licenseShortFile.readAll()), Qt::WhiteSpaceNormal);
   // About projection mapping
   QFile aboutMappingFile(":/projection-mapping");
-  aboutMappingFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)aboutMappingFile.open(QIODevice::ReadOnly | QIODevice::Text);
   QString aboutMappingText = QString::fromUtf8(aboutMappingFile.readAll());
   // Visit our website for more information
   QString projectWebsiteText = "<p>" + tr("See the ") + QString("<a href=\"%1\">").arg(MM::WEBSITE_URL) +
@@ -126,7 +126,7 @@ void AboutDialog::createChangelogTab()
   changelogTextBrowser->setOpenExternalLinks(true);
 
   QFile changelogFile(":/changelog_md");
-  changelogFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)changelogFile.open(QIODevice::ReadOnly | QIODevice::Text);
   changelogTextBrowser->setMarkdown(QString::fromUtf8(changelogFile.readAll()));
   _tabWidget->addTab(changelogTextBrowser, tr("Changelog"));
 }
@@ -152,7 +152,7 @@ void AboutDialog::createContributorsTab()
   contributorsTextBrowser->setOpenExternalLinks(true);
 
   QFile contributorsFile(":/contributors_md");
-  contributorsFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)contributorsFile.open(QIODevice::ReadOnly | QIODevice::Text);
   contributorsTextBrowser->setMarkdown(QString::fromUtf8(contributorsFile.readAll()));
   _tabWidget->addTab(contributorsTextBrowser, tr("Contributors"));
 }
@@ -163,7 +163,7 @@ void AboutDialog::createLicenseTab()
   licenseTextBrowser->setOpenExternalLinks(true);
 
   QFile licenseFile(":/license");
-  licenseFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)licenseFile.open(QIODevice::ReadOnly | QIODevice::Text);
   licenseTextBrowser->setText(QString::fromUtf8(licenseFile.readAll()));
 
   _tabWidget->addTab(licenseTextBrowser, tr("License"));
@@ -176,7 +176,7 @@ void AboutDialog::createOscTab()
   oscBrowser->setOpenExternalLinks(true);
 
   QFile oscFile(":/osc-documentation_md");
-  oscFile.open(QIODevice::ReadOnly | QIODevice::Text);
+  (void)oscFile.open(QIODevice::ReadOnly | QIODevice::Text);
   oscBrowser->setMarkdown(QString::fromUtf8(oscFile.readAll()));
   _tabWidget->addTab(oscBrowser, tr("OSC Commands"));
 }
diff --git a/src/gui/ConsoleWindow.cpp b/src/gui/ConsoleWindow.cpp
index ab815133..e22ccea0 100644
--- a/src/gui/ConsoleWindow.cpp
+++ b/src/gui/ConsoleWindow.cpp
@@ -86,7 +86,7 @@ void ConsoleWindow::writeLogFile(const QString &message)
 {
   QString logFilePath = QDir(QDir::tempPath()).filePath("mapmap.log");
   QFile logFile(logFilePath);
-  logFile.open(QIODevice::Append);
+  (void)logFile.open(QIODevice::Append);
   QTextStream stream(&logFile);
   stream << message << Qt::endl;
 }
diff --git a/src/gui/LayerGui.cpp b/src/gui/LayerGui.cpp
index 5f5f2d38..024aad8b 100644
--- a/src/gui/LayerGui.cpp
+++ b/src/gui/LayerGui.cpp
@@ -41,13 +41,13 @@ LayerGui::LayerGui(Layer::ptr layer)
   _sourceEnumManager = new QtEnumPropertyManager(this);
 
   // Mapping UID.
-  _idItem = _variantManager->addProperty(QVariant::Int, QObject::tr("ID"));
+  _idItem = _variantManager->addProperty(QMetaType::Int, QObject::tr("ID"));
   _idItem->setEnabled(false);
   _idItem->setValue(_layer->getId());
   _propertyBrowser->addProperty(_idItem);
 
   // Mapping basic properties.
-  _opacityItem = _variantManager->addProperty(QVariant::Double, QObject::tr("Opacity (%)"));
+  _opacityItem = _variantManager->addProperty(QMetaType::Double, QObject::tr("Opacity (%)"));
   _opacityItem->setAttribute("minimum", 0.0);
   _opacityItem->setAttribute("maximum", 100.0);
   _opacityItem->setAttribute("decimals", 1);
@@ -147,7 +147,7 @@ void LayerGui::_buildShapeProperty(QtProperty* shapeItem, MShape* shape)
   for (int i=0; i<shape->nVertices(); i++)
   {
     // Add point.
-    QtVariantProperty* pointItem = _variantManager->addProperty(QVariant::PointF,
+    QtVariantProperty* pointItem = _variantManager->addProperty(QMetaType::QPointF,
                                                                 QObject::tr("Point %1").arg(i));
 
     const QPointF& p = shape->getVertex(i);
@@ -192,7 +192,7 @@ MeshColorLayerGui::MeshColorLayerGui(Layer::ptr layer)
 
   // Add mesh sub property.
   QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_layer->getShape());
-  _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Mesh Subdivisions"));
+  _meshItem = _variantManager->addProperty(QMetaType::QSize, QObject::tr("Mesh Subdivisions"));
   _meshItem->setValue(QSize(mesh->nColumns(), mesh->nRows()));
   _meshItem->setAttribute("minimum", QSize(2,2));
   _propertyBrowser->insertProperty(_meshItem, _sourceItem); // insert at the beginning
@@ -228,7 +228,7 @@ EllipseColorLayerGui::EllipseColorLayerGui(Layer::ptr layer) : ColorLayerGui(lay
 //  : ColorLayerGui(layer) {
 //  // Add mesh sub property.
 //  Mesh* mesh = (Mesh*)layer->getShape().get();
-//  _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Mesh Subdivisions"));
+//  _meshItem = _variantManager->addProperty(QMetaType::QSize, QObject::tr("Mesh Subdivisions"));
 //  _meshItem->setValue(QSize(mesh->nColumns(), mesh->nRows()));
 //  _topItem->insertSubProperty(_meshItem, 0); // insert at the beginning
 //}
@@ -421,7 +421,7 @@ MeshTextureLayerGui::MeshTextureLayerGui(QSharedPointer<TextureLayer> mapping)
 
   // Add mesh sub property.
   QSharedPointer<Mesh> mesh = qSharedPointerCast<Mesh>(_layer->getShape());
-  _meshItem = _variantManager->addProperty(QVariant::Size, QObject::tr("Subdivisions"));
+  _meshItem = _variantManager->addProperty(QMetaType::QSize, QObject::tr("Subdivisions"));
 
   // Rename subdivision subproperties.
   QList<QtProperty *> subList = _meshItem->subProperties();
diff --git a/src/gui/LayerListModel.cpp b/src/gui/LayerListModel.cpp
index c9e35620..d527fa8b 100644
--- a/src/gui/LayerListModel.cpp
+++ b/src/gui/LayerListModel.cpp
@@ -170,7 +170,7 @@ bool LayerListModel::setData(const QModelIndex &index, const QVariant &value, in
   if (!index.isValid())
     return false;
 
-  if (role == Qt::CheckStateRole && value.type() == QVariant::Bool) {
+  if (role == Qt::CheckStateRole && value.typeId() == QMetaType::Bool) {
     if (layerList[index.row()].isVisible != value.toBool()) {
       layerList[index.row()].isVisible = value.toBool();
       emit dataChanged(index, index);
@@ -178,7 +178,7 @@ bool LayerListModel::setData(const QModelIndex &index, const QVariant &value, in
     }
   }
 
-  if (role == Qt::CheckStateRole + 1 && value.type() == QVariant::Bool) {
+  if (role == Qt::CheckStateRole + 1 && value.typeId() == QMetaType::Bool) {
     if (layerList[index.row()].isSolo != value.toBool()) {
       layerList[index.row()].isSolo = value.toBool();
       emit dataChanged(index, index);
@@ -186,7 +186,7 @@ bool LayerListModel::setData(const QModelIndex &index, const QVariant &value, in
     }
   }
 
-  if (role == Qt::CheckStateRole + 2 && value.type() == QVariant::Bool) {
+  if (role == Qt::CheckStateRole + 2 && value.typeId() == QMetaType::Bool) {
     if (layerList[index.row()].isLocked != value.toBool()) {
       layerList[index.row()].isLocked = value.toBool();
       emit dataChanged(index, index);
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 37675d0e..0ecd079e 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -386,7 +386,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::keyPressEvent(QKeyEvent *event)
 {
-#ifdef Q_OS_OSX // On Mac OS X
+#ifdef Q_OS_MACOS // On Mac OS X
   Q_UNUSED(event);
   // Do nothing
 #endif
@@ -850,7 +850,7 @@ void MainWindow::showMenuBar(bool shown)
 {
   _showMenuBar = shown;
 
-#ifdef Q_OS_OSX // On Mac OS X
+#ifdef Q_OS_MACOS // On Mac OS X
   // Do nothing
 #endif
 #ifdef Q_OS_LINUX // On Linux
@@ -3147,12 +3147,10 @@ void MainWindow::moveLayerItem(uid layerId, int idx)
   Q_CHECK_PTR(layer);
 
   // Remove mapping from model.
-  uid exchangeLayerId = mappingManager->getLayer(idx)->getId();
   mappingManager->moveLayer(layerId, idx);
 
   // Remove widget from layerList.
   int row = layerListModel->getItemRowFromId(layerId);
-  int rowTo = layerListModel->getItemRowFromId(exchangeLayerId);
   Q_ASSERT( row >= 0 );
   layerListModel->moveItem(row, idx);
 
diff --git a/src/gui/MapperGLCanvas.cpp b/src/gui/MapperGLCanvas.cpp
index 835bcb10..fee773b1 100644
--- a/src/gui/MapperGLCanvas.cpp
+++ b/src/gui/MapperGLCanvas.cpp
@@ -45,6 +45,7 @@ MapperGLCanvas::MapperGLCanvas(MainWindow* mainWindow,
     _zoomLevel(0),
     _shapeIsAdapted(false)
 {
+  Q_UNUSED(shareWidget);
   // For now clicking on the window doesn't do anything.
   setDragMode(QGraphicsView::NoDrag);
 
@@ -383,7 +384,7 @@ void MapperGLCanvas::mouseReleaseEvent(QMouseEvent* event)
   if (event->buttons() & Qt::MiddleButton)
   {
     QMouseEvent fakeEvent(
-          event->type(), event->pos(), event->globalPos(),
+          event->type(), event->pos(), event->globalPosition().toPoint(),
           Qt::LeftButton, event->buttons() & ~Qt::LeftButton,
           event->modifiers());
     QGraphicsView::mouseReleaseEvent(&fakeEvent);
diff --git a/src/gui/OutputGLCanvas.cpp b/src/gui/OutputGLCanvas.cpp
index aa091135..cf6185b3 100644
--- a/src/gui/OutputGLCanvas.cpp
+++ b/src/gui/OutputGLCanvas.cpp
@@ -80,7 +80,7 @@ void OutputGLCanvas::drawForeground(QPainter *painter , const QRectF &rect)
     // Display crosshair cursor.
     if (_displayCrosshair)
     {
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
       QPoint globalCursorPos = QCursor::pos();
       QScreen* mouseScreenPtr = QGuiApplication::screenAt(globalCursorPos);
       QRect mouseScreenGeometry = mouseScreenPtr ? mouseScreenPtr->geometry() : QRect();
@@ -250,6 +250,8 @@ void OutputGLCanvas::_drawResolutionText(QPainter *painter, const QRect &rect, i
 
 void OutputGLCanvas::resizeGL(int width, int height)
 {
+  Q_UNUSED(width);
+  Q_UNUSED(height);
   setSceneRectToViewportGeometry();
 }
 
diff --git a/src/gui/PreferenceDialog.cpp b/src/gui/PreferenceDialog.cpp
index 5ed88b93..155c0d70 100644
--- a/src/gui/PreferenceDialog.cpp
+++ b/src/gui/PreferenceDialog.cpp
@@ -307,9 +307,9 @@ void PreferenceDialog::createControlsPage()
   QFont bold;
   bold.setWeight(QFont::Bold);
   // Set IP Address validator
-  QString octet("(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])");
-  QRegularExpression rx(octet + "\\." + octet + "\\." + octet + "\\." + octet);
-  QRegularExpressionValidator *ipValidator = new QRegularExpressionValidator(rx);
+  // QString octet("(?:[0-1]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])");
+  // QRegularExpression rx(octet + "\\." + octet + "\\." + octet + "\\." + octet);
+  // QRegularExpressionValidator *ipValidator = new QRegularExpressionValidator(rx);
   QMargins margins(40, 0, 0, 0);
 
   // _sendMessageBox = new QCheckBox;
diff --git a/src/gui/SourceGui.cpp b/src/gui/SourceGui.cpp
index cc025f1a..9f7cc231 100644
--- a/src/gui/SourceGui.cpp
+++ b/src/gui/SourceGui.cpp
@@ -35,13 +35,13 @@ SourceGui::SourceGui(Source::ptr source)
           this,            SLOT(setValue(QtProperty*, const QVariant&)));
 
   // Mapping UID.
-  _idItem = _variantManager->addProperty(QVariant::Int, QObject::tr("ID"));
+  _idItem = _variantManager->addProperty(QMetaType::Int, QObject::tr("ID"));
   _idItem->setEnabled(false);
   _idItem->setValue(_source->getId());
   _propertyBrowser->addProperty(_idItem);
 
   // Source basic properties.
-  _opacityItem = _variantManager->addProperty(QVariant::Double, QObject::tr("Opacity (%)"));
+  _opacityItem = _variantManager->addProperty(QMetaType::Double, QObject::tr("Opacity (%)"));
   _opacityItem->setAttribute("minimum", 0.0);
   _opacityItem->setAttribute("maximum", 100.0);
   _opacityItem->setAttribute("decimals", 1);
@@ -84,7 +84,7 @@ ColorGui::ColorGui(Source::ptr source)
   color = qSharedPointerCast<Color>(source);
   Q_CHECK_PTR(color);
 
-  _colorItem = _variantManager->addProperty(QVariant::Color,
+  _colorItem = _variantManager->addProperty(QMetaType::QColor,
                                             QObject::tr("Color"));
 
   _colorItem->setValue(color->getColor());
@@ -124,7 +124,7 @@ _imageFileItem = _variantManager->addProperty(VariantManager::filePathTypeId(),
 _imageFileItem->setAttribute("filter", tr("Image files (%1);;All files (*)").arg(MM::IMAGE_FILES_FILTER));
 _imageFileItem->setValue(image->getUri());
 
-  _imageRateItem = _variantManager->addProperty(QVariant::Double,
+  _imageRateItem = _variantManager->addProperty(QMetaType::Double,
                                                 tr("Speed (%)"));
   // we need to save it because the call to setAttribute will set it to minimum
   double rate = image->getRate()*100;
@@ -172,14 +172,14 @@ VideoGui::VideoGui(Source::ptr source)
   _mediaFileItem->setAttribute("filter", tr("Video files (%1);;All files (*)").arg(MM::VIDEO_FILES_FILTER));
   _mediaFileItem->setValue(media->getUri());
 
-  _mediaRateItem = _variantManager->addProperty(QVariant::Double,
+  _mediaRateItem = _variantManager->addProperty(QMetaType::Double,
                                                 tr("Speed (%)"));
   // we need to save it because the call to setAttribute will set it to minimum
   double rate = media->getRate()*100;
   _mediaRateItem->setAttribute("decimals", 1);
   _mediaRateItem->setValue(rate);
 
-  _mediaVolumeItem = _variantManager->addProperty(QVariant::Double,
+  _mediaVolumeItem = _variantManager->addProperty(QMetaType::Double,
                                                 tr("Volume (%)"));
   double volume = media->getVolume()*100;
   _mediaVolumeItem->setAttribute("minimum", 0.0);
diff --git a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri
index 27978278..4ae6e103 100644
--- a/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri
+++ b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri
@@ -6,7 +6,6 @@ DEPENDPATH += $$PWD
 qtpropertybrowser-uselib:!qtpropertybrowser-buildlib {
     LIBS += -L$$QTPROPERTYBROWSER_LIBDIR -l$$QTPROPERTYBROWSER_LIBNAME
 } else {
-    DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
     SOURCES += $$PWD/qtpropertybrowser.cpp \
             $$PWD/qtpropertymanager.cpp \
             $$PWD/qteditorfactory.cpp \
diff --git a/src/src.pri b/src/src.pri
index 460b050c..96369375 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -28,6 +28,7 @@ macx {
   DEFINES += MACOSX
   QMAKE_CXXFLAGS += -D__MACOSX_CORE__
   QMAKE_CXXFLAGS += -stdlib=libc++
+  QMAKE_CXXFLAGS += -DGL_SILENCE_DEPRECATION
   LIBS += -framework OpenGL -framework GLUT
   # With Xcode Tools > 1.5, to reduce the size of your binary even more:
   # LIBS += -dead_strip