Commit 2f9291f59a0dfb4d01185dc00b3b2dec2c9757d4

Daniel Beames <dbeames @beames…ptop.(none)>
Wed Oct 28 16:10:31 CET 2009

Tree SHA1: ff38a21
Parent SHA1: be00027 (Renamed music-player-headset-track-advance-vibrate.*)
raw diff | raw patch

Fixed camera-improved-filename-format

Diff rendering mode:
inline
side by side


1		k--- .orig/usr/palm/applications/com.palm.app.camera/javascripts/camera-control.js
2		+++ /usr/palm/applications/com.palm.app.camera/javascripts/camera-control.js
3		@@ -70,8 +70,14 @@
	1	diff --git a/usr/palm/applications/com.palm.app.camera/camera-prefs-defaults.json b/usr/palm/applications/com.palm.app.camera/camera-prefs-defaults.json
	2	index 9b13336..6bf1ccc 100644
	3	--- a/usr/palm/applications/com.palm.app.camera/camera-prefs-defaults.json
	4	+++ b/usr/palm/applications/com.palm.app.camera/camera-prefs-defaults.json
	5	@@ -7,7 +7,7 @@ CameraPrefsDefaultPrefs = {
	6	'CAMERA-MAKE': 'Palm',
	7	'CAMERA-MODEL': 'Pre ',
	8	'COUNT': '1',
	9	- 'FILE-PREFIX': 'CIMG',
	10	+ 'FILE-PREFIX': 'PRE_',
	11	'GEOTAGGING': 'enabled',
	12	'GPS-ACCURACY-METER': 'disabled',
	13	'GPS-FIX-MAX-AGE': '120',
	14	diff --git a/usr/palm/applications/com.palm.app.camera/javascripts/camera-control.js b/usr/palm/applications/com.palm.app.camera/javascripts/camera-control.js
	15	index 951d7ce..746e54f 100644
	16	--- a/usr/palm/applications/com.palm.app.camera/javascripts/camera-control.js
	17	+++ b/usr/palm/applications/com.palm.app.camera/javascripts/camera-control.js
	18	@@ -70,8 +70,14 @@ CameraControl = Class.create({
4	19
5	20	// Create a filename using the image count and path info stored in preferences.
6	21	var imgNum = this.prefs[CameraControl.PREFS.COUNT];
…	…
32	32
33	33	// Set file destination image
34	34	cam.dst = this.prefs[CameraControl.PREFS.PATH]
35		@@ -79,25 +85,11 @@
	35	@@ -79,25 +85,11 @@ CameraControl = Class.create({
36	36	+ this.prefs[CameraControl.PREFS.MAKE].toUpperCase().substring(0,4)
37	37	+ "/"
38	38	+ this.prefs[CameraControl.PREFS.FILE]
…	…
59	59	CameraPrefs.updatePref(this.prefs, CameraControl.PREFS.COUNT, imgNum);
60	60	}
61	61
62		@@ -215,19 +207,6 @@
	62	@@ -215,19 +207,6 @@ CameraControl = Class.create({
63	63
64	64	// Increment image count - after all, the image we got from the adapter was the LAST CAPTURED
65	65	++image;
…	…
79	79	CameraPrefs.updatePref(this.prefs, CameraControl.PREFS.COUNT, image);
80	80
81	81	llog("ALBUM: " + album);
82		--- .orig/usr/palm/applications/com.palm.app.camera/camera-prefs-defaults.json
83		+++ /usr/palm/applications/com.palm.app.camera/camera-prefs-defaults.json
84		@@ -7,7 +7,7 @@
85		'CAMERA-MAKE': 'Palm',
86		'CAMERA-MODEL': 'Pre ',
87		'COUNT': '1',
88		- 'FILE-PREFIX': 'CIMG',
89		+ 'FILE-PREFIX': 'PRE_',
90		'GEOTAGGING': 'enabled',
91		'GPS-ACCURACY-METER': 'disabled',
92		'GPS-FIX-MAX-AGE': '120',
93

Commit 2f9291f59a0dfb4d01185dc00b3b2dec2c9757d4

Gitorious