Commit b8bd935930e07bbb4b5bf1e13a57e94ae892fc6e

egaudet
Thu Oct 01 07:56:42 CEST 2009

Tree SHA1: 56820b0
Parent SHA1: 7f6fcfc (update to 1.2)
raw diff | raw patch

fix patch to not include image binary

Diff rendering mode:
inline
side by side


1	1	diff --git a/usr/palm/applications/com.palm.app.camera/app/controllers/capture-assistant.js b/usr/palm/applications/com.palm.app.camera/app/controllers/capture-assistant.js
2		index 118e532..bae4b1d 100644
	2	index 2952de4..f11abf1 100644
3	3	--- a/usr/palm/applications/com.palm.app.camera/app/controllers/capture-assistant.js
4	4	+++ b/usr/palm/applications/com.palm.app.camera/app/controllers/capture-assistant.js
5		@@ -78,6 +78,10 @@ CaptureAssistant = Class.create({
6		this.controller.get('flashButtonState').observe(Mojo.Event.tap, function(){
	5	@@ -79,6 +79,10 @@ CaptureAssistant = Class.create({
7	6	this._handleFlashButton();
8	7	}.bind(this));
9		+
	8
10	9	+ this.controller.get('shutterSoundButtonState').observe(Mojo.Event.tap, function(){
11	10	+ this._handleShutterSoundButton();
12	11	+ }.bind(this));
13
	12	+
14	13	this.onKeyPressHandler = this.onKeyPress.bindAsEventListener(this);
15		Mojo.listen(this.controller.sceneElement, Mojo.Event.keypress, this.onKeyPressHandler);
16		@@ -137,7 +141,12 @@ CaptureAssistant = Class.create({
17		if (undefined === this.flashState){
18		var prefFlashState = +this.cameraControl.prefs[CameraControl.PREFS.FLASH];
	14	Mojo.listen(this.controller.sceneElement, Mojo.Event.keydown, this.onKeyPressHandler);
	15	Mojo.listen(this.controller.sceneElement, Mojo.Event.keyup, this.onKeyPressHandler);
	16	@@ -140,6 +144,11 @@ CaptureAssistant = Class.create({
19	17	this.setFlashState(prefFlashState);
20		- }
21		+ }
22		+
	18	}
	19
23	20	+ if (undefined === this.shutterSoundState){
24	21	+ var prefShutterSoundState = this.cameraControl.prefs[CameraControl.PREFS.SOUNDS];
25	22	+ this.setShutterSoundState(prefShutterSoundState);
26	23	+ }
27
	24	+
28	25	try {
29	26	var initialOrientation = PalmSystem.screenOrientation;
30		@@ -600,6 +609,45 @@ CaptureAssistant = Class.create({
31
32		llog("Set Flash Mode to "+camera.flash);
	27	this.orientationChanged(initialOrientation);
	28	@@ -629,6 +638,45 @@ CaptureAssistant = Class.create({
33	29	},
34		+
35		+ /**
	30
	31	/**
36	32	+ * Click handler for the shutter sound button.
37	33	+ *
38	34	+ * @param {Event} event The click event
…	…
66	66	+ this.controller.get('shutterSoundButtonState').className = "shutter-sound-button shutter-sound-off";
67	67	+ }
68	68	+ },
69
70		/**
	69	+
	70	+ /**
71	71	* Handler for click of photoroll button.
	72	*
	73	* The photoroll scene will be pushed on.
72	74	diff --git a/usr/palm/applications/com.palm.app.camera/app/views/capture/capture-scene.html b/usr/palm/applications/com.palm.app.camera/app/views/capture/capture-scene.html
73	75	index a586aba..e8243d2 100644
74	76	--- a/usr/palm/applications/com.palm.app.camera/app/views/capture/capture-scene.html
…	…
93	93	<div id="gpsMeter" style="z-index: 100; position: fixed; top: 10px; right: 10px; width: 90px; height: 20px; background-color: #a0a0a0; display: none" ></div> -->
94	94
95	95	<div id="palmScrim" class="palm-scrim" style="z-index: 1001; display: none;">
96		diff --git a/usr/palm/applications/com.palm.app.camera/images/menu-shutter-sound.png b/usr/palm/applications/com.palm.app.camera/images/menu-shutter-sound.png
97		new file mode 100644
98		index 0000000000000000000000000000000000000000..8bdf2e94c31d9df827ca2f21bcdab4dca4958bbc
99		GIT binary patch
100		literal 5821
101		zcmc(j^<es_s8`WSI4gI9<H3OtEU+zrkT9r>b\|(TJFa$F~jr~!<d?`nV2@+J;P^z
102		z#rONec\|L!A{qj1G$2oDj+Ny;3H27#}XoTu&O8WmS^lyf7asKh6SmVS$QNxr?U<ObJ
103		zn4h(mJ(_\|Y)W)7k-Obw3Uf<r@F2HldUK$OJ%2HiP!O(x{$kZv(+}KDKS`%1*^P#4u
104		z^Vcf<vbw8dy5=zWt%xEkbGd?IIEeI\|{4OF2p`f_A7AqGXr5goe{uY%+g3C>ct`Zwz
105		zong~REuEn$g\|FS!x_s>JXY6-;{qD>01@htJ(mYaoQ=AI6o_%Hb2Kr^U$h-Rz`5>!>
106		ztB_wYZ4u&;U+2PRqkz(UH?(lrp^dQCCBeE7nH6a<<YDg#SzC~v+ycZ-TMVw9$H=Pa
107		zOpw7({@Bhu-k-@6g0ctv=+_>sSERdZlDF&{&d;ss65K(5YQXLiz%sL+3w=t!bNbLs
108		z>t}Mr9>\|rS2\|O>vKX14A1IbHTI@v^#Gj>Mc7`kcq2IfU{e_aAk~PTv>fvz\|sl6#
109		zF#fwH^6NSP{GPHvO6VYCa$5#LRapN9Jmp9b-RJ#5\|9;5(&O_WYcjS&#(fvXwsa$Z2
110		zWIHKoJLo=?$!e_c;Nbh{-4lOe7hLa}#B_rbuQo`Kt<2@mY<uvNaZOfr{r2U3?bjjC
111		zu9i3pm9LW<-T}6dm!m9VvPkWbt?}{kngytNSn0g;qZ=qH0TnHkW^g-BBI_jURvFrE
112		zS{+(z_;EXcBv>Y9v>f0YszW2RDtAK^b{XQjT%pMUX^7qbJu}n8w~BfKob-keR<@pU
113		ztepHHnTVcTOnx+Lsov)kNOTPQOIplE#UZ<;3n@~!MI)MXcB\|{UT^(3+6I%}JzmJ@S
114		z>$u?3p2Nfng1W`t1SK+l>!uE}YWsRwS9{h+mGBLTX(=\|Fw+V%#\|dFvtXP=KGJ-F
115		z{$1DI$!TqEZ5ZvX>7dio7aBNZNf@=yIPcsNv-p^Sx#pxqfsytfsET5Etsz#WN)lgG
116		z0uz^;9*>wf_cyY<c#L^<h#ZG0?Y6^X1G(ld^5dCe((Dg-GPsc0v2pQ;;5zUTZ`rps
117		zdU~64a6JZ6jF8oU\|2DvxFE<gbG7;o1fGAcHf\|!RdZ4TNno!t;~tBJ$3pY;mQoLsX-
118		z-b+)7;Y?Q8G{hcut@lMoL(%4+fH6OONApsI?8K0*Jrcsgm$TARoiV9QYXrme9pwd(
119		zkCO$kZU5}w#P-!fJE<8v3O3n<e0W2+yAR-s7c+xyDRq{\|Gg%2TOD0KzB!#Et?CI<t
120		zwIgePkMyf!3!Ox%sHnP=Js$X9%pkF^`hg9E{eN3b-TwG}-<hdXDbbj<T2E)ZadLQ9
121		zW{{G#zjw}(_0g%Z35P7FKc<{CUsg!k;j~oVN2>{YKpMB;rDbHpXHDJyFYoXo;~3
122		zjmQM+1a&5tP54`LbLp`CnGf~KdUueOy61*0`d9vRFP;KRQ`bZ@SwPc=H-f{m$ot@I
123		zhJZ$u>qVfwmplU}$85Y>6Al<{<I{l9qWx+{GNFXRS!Obw!n{tUmtn2L-ug7rm;3KL
124		z7NKpt5b+^?Iw9gur(&Nv$wZF;s-cQn?%ag<2c&(;Yz}NYJCtljWSqBK3tdCGqnS
125		zy3EZ088Q?`^G;sRn`Oqp4ZoQIJ8iO#V;rqH9}XlaEn\|I+frOXhF!fSxOqV9bj;3e%
126		z?yYaIT%b2untzCX)rlo7\|K2fjDa`-cSpZQ0Ve{OZC0IKe)d6ibm-j;FZixo+wp$
127		zYI}%NSEI{Js7Q-xwPPH_{ism*`K<&4zw_;d>FoCHYZQhsG$ym)K;N@N-Pbz&+roQX
128		zp`&60CYv~uWR\|!!sJ00^(O!DaVo1qgOXBGQIWM)I-?}9k!ZIAN8yM&K(>ah<Cw%
129		z0Y`eHCk5S>_{u?feO0QC43pC%vv0=Ab=-S#VCo4koh^`+*Djaae(@u<5sD?knXRJV
130		z7bFekJhKjlepqS7s-rt5psG~1Z<gk612f@*`-XYlXGbr)x\|MQP;k%@iMoTvTaVIq#
131		zi=Zoq@T2VDud&%iG{aunNE4lt>scsOc{p&UW`xA*J6a{6x)pzZz+l5#oZh@iUaS
132		z@IFKc5!olK8{mv6;BrhCXASk={Y`%xUF<4?z{!@pS\|x_eY?DJ!52=qZN^_lm2e+
133		zauqG0Ww3Qa<`eE7Fq+9UaK9M<sS_{&?Fw5>9%V5w7K(h67YtnT6lxK~TRBN89gEDU
134		zbjIZ)CjM1U@kHwx?`~04x\|~Bi1(Qjku}R$pq=$XbOlaid2?g8TmCGKe?8XSgj*lg8
135		zq{x1Gv1=;rTL>MogUW0hJ8-\|C1sIo2hBT--_RJ#C#iXrAg1jyVKb!OC6z}_X3b3ru
136		zf{I=_#f~@Awb_m9%#k7#Y`chET2x&Gtr;ij4r;jJ%s0#C5Lo$jFu}X<zdS0m(Yt
137		z(+N+FK2qiv6@AFcvhQu-1@KG_DyhNZdA9xKG`fY$4MVX@-;Z=Cjf+YKcPYIfzJ7oF
138		z5dad~Hu*^+hFcYgPaX>DssGHJVPF\|SnqoSWWJ3$sBp8P&&3bbXrp;ksM`&HACXSnl
139		zdd<8k+(X~ZvCEpYk9b(uFweXHlcWMcERKzRiqcbQ@eRU^q\|tT!4D6q!@MEmFQOSQG
140		zk3uTE?>dVTqnC+<&F5XPU8iuy4Pk<L&@32x`SIK`5M%xJ0FHj1dqPM!O*;mU{PzLq
141		zHWkCSR}3(HimS?DUzn+x87qNEWWtM1S?lKEB07>0jfniU%sqozqqM)RiMJ$81P^xZ
142		zxu(c2ZEE$Rvlh_V3M0(Pxktx0?N-?<^q#>LH;A@9I1ycg$Opc`(2G_$!Xuzw_;OTm
143		zF;D)2%L$8tV!aYjHLskE5tYCgRW(c<^}-ltk-+xoi3D=HRIL#pgKy{r5-@>\|bbb
144		zYax=>#H&)X\|3YKflHzm^Hs#A;tvb<8y@3?&S(rEY#N@YYDS{4mp=;D4^M0?rEcByE
145		zR?qCk1)+9Opp5iqVn`xIz@2U052Ld3!wR+tIu%F>P)8-CLmSgi9s=Ytewl`C8;Ek>
146		zV\|Fx8=\|B<@0%%G=0cc-4O^@gTKx00ACUfghwTLR*0t05vjM$&7~CKG}#RTgK`vq
147		z{3m1dih0S9yblpZa}CW1%0Ynb7mFMrg{+vJ$xTNI9d0yTY%zK^uWo{u\|5$LlW(bPX
148		z`}MIq;Fe_0@d8hS9BU+yWNow$^WV0APRcGl`NZRtKcV7L3m%gquQ%KB`RM82U`<DJ
149		z^r\|(@kr\|jFS_`(ZJ?keUqq)mX$$drQ3j`GkIBmxhJNHaGr)P}n6EbtuS!N+9J^L~G
150		zz<m-NiOwy5<_@9yKQ=zw)Z?o\|2?-VpckfqL0ZG6{m4G^(KIoVc$50z>8EwZACn)VF
151		zd2mK*jZhz(SgtC2&mv\|;R`VxBcGTOJcRBN@DW\|km6TrenE}225E>y^ByOeck-<d%Z
152		zwLDlQ?yG)tf^_lVWTTf%@I)BK1Pz8vsS++rj8sC?cVj#7M_^Wu{U9s?{0bC!>GY
153		zyDmz%Jx@Xqz}!x%tKN^LIqz(!pii7#XKk@>V<~3y7T(tWFjtxYtKi`tW)b@P%*J
154		z#bP=l5hVwxNJ9wvzT}p}{Y7-~eUGw(ZagDPX7J^!0FR7X^~R;Isj2BIQEFa<!nFe<
155		z4Z1MB0f6D>%R9N$>#xvC}=^Bf9hYsmqqB#h5scgC@JL5J~BpjogsGSU_{OFrTc7
156		z^^L{v=%$A)U<tueWT_$1YB+ObU22Q{%AGeS9&74rX0Udhp-M)n4=>iBb@*?3Tq-ip
157		zmmIGxjpmeR@*(n5@(Ny\|2zwSpo?lLbet<e>~3UsVnq)61vX0qj5$p?$F}^j4Th\|
158		z)T!qqc~5809uumVL10Dx-At!N9lcE7X^uTK+^7@=y&yvCk9o_c)(ER@#`?OmCF4(P
159		zdBL9KJ7GwdZ>{B<i9+;bd-N<;He*G2QBkUOyzZYhzO16z3Gz-SqzyCz^K`69G$>L@
160		z7;d@U`3w>jOQovr_OP(=i&ozbY+u=D24w!y-Q^Gp9Bat#G&0eQ>}hw\|C>yKf@9X
161		zP\|~xYp(fiW=iPQ;LY$skWxSzlc%!T}hg;-RtQRA`LA{$Ho$wyB3icZDu00d5dAGL}
162		z<8^I\|+X%t{VH4pWO-lb^&6M<w$4SU>LIp<)5z8s=s}_~uN>H$}6`Z\|`-Iclr0jWjG
163		zX{Kl1BOZ$VMQumf@d6v;iQvGze%59@ZPXUN1qwiu{8fVjpq@`_&E%nJ)Pg$%f~@
164		zMt!kLGcq<RZ$k\|^HruqWsHR;i=zRK4v7b&MF0x\|6dirZ&By5*5eyM;0cT8lx70_$q
165		zBrw`qB3ZAugLa{nuy-K=T8\|Vo8B}^r3QxFpw+c2^MYtZSV$k`IUz#)82@FK$;3X~E
166		zz1J!TKzYY+@-SqJ*;6_cvFVLD>(_)u_wA%QTXnoWtI-sLm`DGNbPq{(713EW+l_TW
167		zG6b0mRX=>cRijnO%#%\|jP$=kl;*klz$_tX$4Hc`n+)YCfP&e{%zKx>}$z8H~kPY=p
168		z_Lm~uPznR^OBr+BO@fh(F*zytuKC;=aT1`WxVMh(nK%oZS)^J<AwmmP^N_8rA74X9
169		ztLVA!HNG;!$1%Jdd7BIoewzMDsmLx}g}x#0hxg20`!j!}4CS_`8&nDNr5FrmllK1l
170		z0ZIMhO?ja1f`kkP^$S~{12H?rhH6qW5FS&nQso71A0i$7r(J`Yh35_9(>Qe$cA28H
171		z5)7-#wBK`kNreyQN\|1&#JO5{YY~Ys);rb0uaF`iolA}sW<ryxOR21mP#Y*u@Q{^3J
172		zcP4_)jD@CX%h^w*sd^SGD%C$p#AThnXfc;;+970^Bq^CX^jYgep`?xy7utMVI~b(T
173		z1jId=3&snr>k\|{$hPtja#9u$QFh~qRXXZ%H%FRlawV3nZY?MnRN~zPIlpE?fUn>B~
174		zOyz56CEadFPTv>Z;g^=>dHsQ1iA+Ou4q!(Ox%$_+6QMe>ZI%;yrkPW{)Mf*DLo@Dv
175		zSR6N}4Yp2RZZ4I~=Il_bsWte+Q\|d!37JGW=;?%?Y?2B@r6g_X!q?u~U{2*\|}#7E_0
176		zoc9un;~JPCSAX<\|$yiQw1)XeppNwjqly#CuI)#CcC5!!%^pYQ@yEDLiFQ#3dHDEVp
177		z)LJgudKI~=Jn+H<^GZqNjmz2KA)QRdVQ)x3nBO{Oy2g{Z?7@D8U_S9xm;#3;;Ul
178		zj#PWX-Fs\|j#`4%d%Fe4u+?iTHR!=^vnlE;ExMw(kMs;eQ5@<w6zIW8lcJl6reB*
179		zz@l_uaSnh_bgOO3JqcCD4N}lZIJ!iqb7mB;xw?x9mI_!eWKI9qKg6Hs^>9a#Um{mM
180		zUqS30nb}1)#h&9uS3oDl`Al%Nn3Z8HSjJB&\|B-cptv<#ChYJzfsQDce?maSr\|D7WC
181		zg0f_Wf&u>DZY0X0L+$FfCGF<YVxt2v4f57yH1^!l+dGmbX^_!2-LiM>_TTZhs;4M(
182		z$CLkex3Z$bl\|O!Kaf9lIFC8c&O<FTIq_HBWI?yKiKs8u#kx9L!xm++Km@oP;7pr2s
183		z0Q=zURKWuHzgL<aPk\|9Qyx8)=Du{\|;dghZTiVOIU1?V$5YW~!A!R)8li7%-cKe2T\|
184		zgkX;$Pgb`czp-5*bf7%%ijGK^-TuQ4xvjUnigkuilNQgIFPAYyR5hzLJxj+h7&J9g
185		z)m~U}T_Yx1U#jIU>7SbPz}}p{yg5QS!B5k4eJx7i{2cIiX9e}BZpoWSn-kES<->
186		z5!z(Vf0$83-IKX7Ws4F^DpyUJrXeWF0SkJO`zR5!10x%TrxJo87jLxA+BH9vmG_XG
187		zx8A16>kw6XqZLDK7HWPPsU$4iUL7Qn+cDxiUaI\|Ft1\|q~&TwUCR`\|(!-^)HSZQ@&-
188		zm}yBGnD>E^c~RKlaeK!}$fJUGYXP>^;9-O5D&GD~t#q@Dx?35>J)P\|awy4A-1TaUs
189		z-@VMf)5;dHx-ea&Nm<2C4ug`r4G(grMPSoQV!?na~b=>9T?A^$$(G1bRFQpP>mP
190		z^_3C\|{&9~KIDZJ_n~O(xE&\|@Q>_()Zhb<FKoOgc311>H`CljtyDgldRJQ)VNqCAlU
191		z8!lzWfTu@FAX}1b<;lys05Y7viCf~92)%&Nq2Y~zr1=TuMB;8Wjcn^71~hgXu^{yJ
192		zvlP?`W#PqBEXmEOQQ3t$VIEMlE>jqFBho6syipAIV~~FmFXW8V`_t;c#jq25^aj!0
193		z+Y7Zelh^iWaS-bi$1j^0`eNK;iO\|GAujivwRiPia^#plft>*Xp;T@yZ#~=D@hp$!;
194		z+x}?y_3e4\|r#Q?#`9Lwqa2wv4<+h>&;c(FoY(DR8DjP2{35r*3kfjraL{9%szELgK
195		zaP%n#E{@<\|O<ra51n#v;<_G3kZjWU77k-mXLF$3wm)3`dyLYOO{f=G!!cT-_hnr
196		z0sHFsRv{<4wB6N6n?!uh7aMs?tveObq%LEOYgDMv^L6M>60ZhawfqR=+WT33gqQsw
197		z=xF2b2t9vDF=}GJ<h&9+=)\|mESPH_I^yluKtNYc#_x5E^2#+yOy7OmM6ZPGTb)Qhr
198		zC5WEuW>=8G)P5)T9!K>EfD+a)=hmQbzQ>+qI5pzZ%DX3SIhCqDi1IqjzQW~1wbo7{
199		zgbX{saNO&WZ?KSMcm0bBp?3eEpO;)Lt^Nx7l6k{oF(qbXDf_B?u7e5s=ZQyx-IC>(
200		zKPX5^At!qmEBtM$G}D`Rzp-}J0L)ZqH~xw-4CykiX(uAnu}(Ao5\|d\|x&)x6\|@J`st
201		za=_Nqc4E%yp&+i`RE`a;N^{Y2@29q}#qxY~w#~nJd+9d6l$O{&#xdfkgGvWs%Wl>A
202		zRueytZ_52=uNS~uw0p<c()Jgd4N5%yO15v}Z^Ge3ky)acICoy_78<2X!YPm#)kl6%
203		z!vcqOt5p;c>&r#5OFHLRvjR$(@cF9ll;^xd1Ske=SDD{3wcN9*K^?P=0Q!lQ6H7X8
204		zSQM4BtFEyVm5FXde8P^6RFZCP%Pm}Ps~_1MvUpe122`R+#bgyX6)!\|l`U-(<RCFJ?
205		zejb}Q=TN{9g)$Qa3p=$0tqG0=^7Wti?P<M)JiZ{U6)H=w<%O?6EDnZYf~aW125S
206		zITicNWbFwCvr9A~Hd4w81`k-{a-i8zR}6`Z1Ir@`Y-H*iQ$S(`sig0ZOqnk1{`;^x
207		zO+#dg(^_2aZ=L_rjc-50lP`yxVeRmAI4L*aKGpV\|TH2GTVzCVVuT4UY#n{;N!ymG!
208		z^n<hcw7B+ehBE63wxdeIo?UtNtPH7(AoA}5Q}$M#v9W)(ED&t-U?cUXxc^V_C}%wN
209		d*oKCQ)<>9#34-RB\|NBRysVi$M)hSxR{\|5&c?QZ}8
210
211		literal 0
212		HcmV?d00001
213
214	96	diff --git a/usr/palm/applications/com.palm.app.camera/stylesheets/camera.css b/usr/palm/applications/com.palm.app.camera/stylesheets/camera.css
215		index 6c7d077..ed63c68 100644
	97	index 9480ffa..f0e242d 100644
216	98	--- a/usr/palm/applications/com.palm.app.camera/stylesheets/camera.css
217	99	+++ b/usr/palm/applications/com.palm.app.camera/stylesheets/camera.css
218	100	@@ -119,6 +119,28 @@ body.palm-default {

Commit b8bd935930e07bbb4b5bf1e13a57e94ae892fc6e

Gitorious