Commit fcd7b4667bb3a8877c0ebc66d89792319d3e0437

  • avatar
  • dBsooner's Stuff <dbsooner @del…ge.vision5.com>
  • Fri Feb 26 18:05:54 CET 2010
  • Tree SHA1: e0f6f68
  • Parent SHA1: ba3676e (Merge branch 'webos-1.3.5' of gitorious.org:/webos-internals/modifications into webos-1.3.5)
  • raw diff | raw patch 
2 New, 4 Updated patches.
messaging/messaging-audio-video-attachments.patch
(11 / 26)
  
1--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
2+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
3@@ -60,7 +60,7 @@
4 this.messageTemplatePath = 'chatview/message/';
5
6 this.appMenuAddPictureItem = {
7- label: $L('Add picture...'),
8+ label: $L('Attach...'),
9 command: 'addPicture',
10 disabled: false
11 };
12@@ -2422,7 +2422,7 @@
13 attachFilePicker: function(event){
1diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
2index 98ab9b2..3362d61 100644
3--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
4+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
5@@ -2391,7 +2391,7 @@ var ChatviewAssistant = Class.create({
6 attachFilePicker: function(event) {
147 var params = {
158 actionType: 'attach',
169- kinds: ['image'], // TODO: integrate other media types
……
1111 defaultKind: 'image',
1212 onSelect: this.handleFilePickerSelect.bind(this)
1313 };
14\ No newline at end of file
15--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
16+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
17@@ -15,7 +15,7 @@
18 this.toggleDebugMenu = listviewSceneAssistant.toggleDebugMenu.bind(listviewSceneAssistant,true);
19 }
20
21- this.appMenuAddPictureItem = {label: $L('Add picture...'), command:'addPicture', enabled:true};
22+ this.appMenuAddPictureItem = {label: $L('Attach...'), command:'addPicture', enabled:true};
23
24 this.appMenuAttrs = {omitDefaultItems: true};
25 this.appMenuModel = { visible:true, label: $L('Chat view menu'), items: [Mojo.Menu.editItem,this.appMenuAddPictureItem,Mojo.Menu.helpItem]};
26@@ -330,7 +330,7 @@
14diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
15index 9715c78..19346cc 100644
16--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
17+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/compose-assistant.js
18@@ -330,7 +330,7 @@ var ComposeAssistant = Class.create({
2719 attachFilePicker: function(event) {
2820 var params = {
2921 actionType: 'attach',
misc/misc-scrim-multi-o2.patch
(143 / 0)
  
1diff --git a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
2index baf23e2..3ae126e 100644
3--- a/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
4+++ b/usr/palm/applications/com.palm.app.browser/stylesheets/browser.css
5@@ -1,6 +1,7 @@
6 /*
7 * Copyright 2008-2009 Palm, Inc. All rights reserved.
8 */
9+
10 body {
11 margin: 0px;
12 padding: 0px;
13@@ -279,7 +280,7 @@ span#error-code {
14 }
15
16 #start-page-background {
17- background: url(../images/background-bookmarks-grid.png) center center no-repeat;
18+ background: #000 url(/media/internal/scrims/browser-scrim.png) center center no-repeat;
19 position: fixed;
20 top: 0px;
21 left: 0px;
22diff --git a/usr/palm/applications/com.palm.app.contacts/stylesheets/list.css b/usr/palm/applications/com.palm.app.contacts/stylesheets/list.css
23index 1739dcc..637edca 100644
24--- a/usr/palm/applications/com.palm.app.contacts/stylesheets/list.css
25+++ b/usr/palm/applications/com.palm.app.contacts/stylesheets/list.css
26@@ -4,6 +4,11 @@ Copyright 2009 Palm, Inc. All rights reserved.
27 */
28
29 /* List Common */
30+body.wallpaper,
31+ body.palm-default {
32+ background: #000 url(/media/internal/scrims/contacts-scrim.png);
33+ color:#fff;
34+}
35
36 div.hidden {
37 display: none;
38diff --git a/usr/palm/applications/com.palm.app.email/stylesheets/email.css b/usr/palm/applications/com.palm.app.email/stylesheets/email.css
39index 76deaa4..87c0f80 100644
40--- a/usr/palm/applications/com.palm.app.email/stylesheets/email.css
41+++ b/usr/palm/applications/com.palm.app.email/stylesheets/email.css
42@@ -21,6 +21,11 @@
43 * email folder-list specifics
44 *
45 **************************************************************************************************/
46+body.wallpaper,
47+ body.palm-default {
48+ background: #000 url(/media/internal/scrims/email-scrim.png);
49+ color:#fff;
50+}
51
52 .email-folder-list .palm-row-wrapper {
53 min-height: 50px;
54diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
55index 73af153..a1f3aeb 100644
56--- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
57+++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
58@@ -6,7 +6,11 @@
59 /**************************************************************************************************
60 * First Launch
61 **************************************************************************************************/
62-
63+body.wallpaper,
64+ body.palm-default {
65+ background: url(/media/internal/scrims/messaging-scrim.png) 0 0 fixed no-repeat;
66+ color:#fff;
67+}
68 .palm-button.accountType {
69 text-align: left;
70 }
71@@ -627,6 +631,7 @@ img.avatar-overlay {
72 padding: 1px 0;
73 font-size: 18px;
74 word-wrap: break-word !important;
75+color: #fff;
76 }
77 .their-chat .chat-balloon-wrapper {
78 padding-right: 8px;
79diff --git a/usr/palm/applications/com.palm.app.musicplayer/stylesheets/music-player.css b/usr/palm/applications/com.palm.app.musicplayer/stylesheets/music-player.css
80index 25f4150..37438ac 100644
81--- a/usr/palm/applications/com.palm.app.musicplayer/stylesheets/music-player.css
82+++ b/usr/palm/applications/com.palm.app.musicplayer/stylesheets/music-player.css
83@@ -9,7 +9,7 @@ Copyright 2009 Palm, Inc. All rights reserved.
84
85 body.wallpaper,
86 body.palm-default {
87- background: url(../images/background.png) 0 0 fixed;
88+ background:#000 url(/media/internal/scrims/music-player-scrim.png) 0 0 fixed;
89 color: white;
90 }
91
92diff --git a/usr/palm/applications/com.palm.app.notes/stylesheets/notes-app.css b/usr/palm/applications/com.palm.app.notes/stylesheets/notes-app.css
93index e01a674..4689649 100644
94--- a/usr/palm/applications/com.palm.app.notes/stylesheets/notes-app.css
95+++ b/usr/palm/applications/com.palm.app.notes/stylesheets/notes-app.css
96@@ -6,7 +6,7 @@ Copyright 2009 Palm, Inc. All rights reserved.
97 */
98
99 .notes-background {
100- background: url(../images/notes-background.png) top left no-repeat !important;
101+ background:#000 url(/media/internal/scrims/notes-scrim.png) top left no-repeat !important;
102 position: fixed;
103 width: 100%;
104 height: 100%;
105diff --git a/usr/palm/applications/com.palm.app.phone/stylesheets/phone.css b/usr/palm/applications/com.palm.app.phone/stylesheets/phone.css
106index c1408c1..8c538d2 100644
107--- a/usr/palm/applications/com.palm.app.phone/stylesheets/phone.css
108+++ b/usr/palm/applications/com.palm.app.phone/stylesheets/phone.css
109@@ -31,7 +31,7 @@ body {
110 }
111
112 body.palm-default {
113- background: #000 url(../images/backdrop-phone.png) 0 0 fixed no-repeat;
114+ background: #000 url(/media/internal/scrims/phone-scrim.png) 0 0 fixed no-repeat;
115 }
116
117 body.no-wallpaper {
118diff --git a/usr/palm/applications/com.palm.app.photos/stylesheets/photos.css b/usr/palm/applications/com.palm.app.photos/stylesheets/photos.css
119index d779167..7243fa9 100644
120--- a/usr/palm/applications/com.palm.app.photos/stylesheets/photos.css
121+++ b/usr/palm/applications/com.palm.app.photos/stylesheets/photos.css
122@@ -297,7 +297,7 @@
123 top: 0;
124 left: 0;
125 z-index: -100;
126- background: #000 url(../images/background.png) no-repeat;
127+ background: #000 url(/media/internal/scrims/photos-scrim.png) no-repeat;
128 }
129
130 /*Album List View Specific Styles*/
131diff --git a/usr/palm/applications/com.palm.app.videoplayer.launcher/stylesheets/media-video.css b/usr/palm/applications/com.palm.app.videoplayer.launcher/stylesheets/media-video.css
132index b3827a9..43fb4b7 100644
133--- a/usr/palm/applications/com.palm.app.videoplayer.launcher/stylesheets/media-video.css
134+++ b/usr/palm/applications/com.palm.app.videoplayer.launcher/stylesheets/media-video.css
135@@ -4,7 +4,7 @@
136 */
137
138 body.palm-default {
139- background: url(../images/background.png) 0 0 fixed no-repeat;
140+ background: #000 url(/media/internal/scrims/video-player-scrim.png) 0 0 fixed no-repeat;
141 color: white;
142 }
143
top-bar/top-bar-battery-percent-and-icon-white-red-teal.patch
(152 / 0)
  
1diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js
2index 6fdbb39..c7f8fc7 100644
3--- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js
4+++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js
5@@ -1567,10 +1567,36 @@ closePbapAlert: function() {
6 }
7 },
8
9+/* Format battery level percent */
10+getBatteryLevelPercent: function(percent, color, image, charging) {
11+ if (color) {
12+ if (charging == 1)
13+ bColor = '#00FFCC'; //teal
14+ else if (percent >= 13)
15+ bColor = '#FFFFFF'; //white
16+ else if(percent <= 12)
17+ bColor = '#FF0000'; //red
18+ else
19+ bColor = 'white';
20+
21+ if (image != undefined)
22+ var fPercent = '<span style="color: ' + bColor + ';">' + percent + unescape('%') + '</span>';
23+ else
24+ var fPercent = '<span style="position: relative; bottom: 2px; color: ' + bColor + ';">' + percent + unescape('%') + '</span>';
25+ }
26+ else {
27+ var fPercent = percent + unescape('%');
28+ }
29+ return fPercent;
30+},
31+
32 /*
33 * Handle power and charging notifications
34 */
35 handlePowerNotifications: function(payload) {
36+ // user definable setting
37+ var batteryLevelImage = 2; // 2 displays the image on left and numerical percentage on right
38+ var batteryLevelColor = 1; // Set to 0 for white, 1 for color
39
40 Mojo.Log.info("SystemUI Power Payload "+ Object.toJSON(payload));
41 if(!this.powerdServiceUp) {
42@@ -1590,7 +1616,15 @@ handlePowerNotifications: function(payload) {
43 // Show the battery level if not charging
44 if (!this.isCharging) {
45 Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging + " Battery level "+ i);
46+ if (batteryLevelImage == 0) {
47 $('power').className = 'battery-' + i;
48+ } else if(batteryLevelImage == 1) {
49+ $('power').className = 'battery-percent';
50+ $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 0);
51+ } else if(batteryLevelImage == 2) {
52+ $('power').className = 'battery-percentimage';
53+ $('power').innerHTML = '<img src="images/battery-' + i + '.png" />' + this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor);
54+ }
55
56 //Show Banner Message if the Battery level is below 20%
57 var batteryalert = $L("#{percent_ui}% battery remaining").interpolate(payload);
58@@ -1622,10 +1656,23 @@ handlePowerNotifications: function(payload) {
59 }
60 else {
61 Mojo.Log.info("SystemUI- Is Charging "+ this.isCharging );
62- if(payload.percent_ui == 100)
63+ if (batteryLevelImage == 0) {
64+ if (payload.percent_ui == 100)
65 $('power').className = 'battery-charged';
66 else
67 $('power').className = 'battery-charging-' + i;
68+ } else if (batteryLevelImage == 1) {
69+ $('power').className = 'battery-percent';
70+ $('power').innerHTML = this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 1);
71+ } else if(batteryLevelImage == 2) {
72+ if (payload.percent_ui == 100) {
73+ $('power').className = 'battery-percentimage-charged';
74+ $('power').innerHTML = '<img src="images/battery-charged.png" />' + this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 1);
75+ } else {
76+ $('power').className = 'battery-percentimage';
77+ $('power').innerHTML = '<img src="images/battery-charging-' + i + '.png" />' + this.getBatteryLevelPercent(payload.percent_ui, batteryLevelColor, true, 1);
78+ }
79+ }
80
81 }
82
83@@ -1662,10 +1709,23 @@ handlePowerNotifications: function(payload) {
84
85 if (this.isCharging) {
86 Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel);
87- if(this.batteryLevel == 100)
88+ if (batteryLevelImage == 0) {
89+ if (this.batteryLevel == 100)
90 $('power').className = 'battery-charged';
91 else
92 $('power').className = 'battery-charging-' + this.lastBatteryLevel;
93+ } else if(batteryLevelImage == 1) {
94+ $('power').className = 'battery-percent';
95+ $('power').innerHTML = this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true, 1);
96+ } else if(batteryLevelImage == 2) {
97+ if (this.batteryLevel == 100) {
98+ $('power').className = 'battery-percentimage-charged';
99+ $('power').innerHTML = '<img src="images/battery-charged.png" />' + this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true, 1);
100+ } else {
101+ $('power').className = 'battery-percentimage';
102+ $('power').innerHTML = '<img src="images/battery-charging-' + this.lastBatteryLevel + '.png" />' + this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true, 1);
103+ }
104+ }
105
106 var stageController = Mojo.Controller.getAppController().getStageProxy("LowBatteryAlert");
107 if (stageController) {
108@@ -1686,7 +1746,17 @@ handlePowerNotifications: function(payload) {
109 else {
110 this.chargingBannerShown = false;
111 Mojo.Log.info("SystemUI- Charger Notification "+ this.isCharging + " Last battery level "+ this.lastBatteryLevel);
112+ if (batteryLevelImage == 0) {
113 $('power').className = 'battery-' + this.lastBatteryLevel;
114+ }
115+ else if (batteryLevelImage == 1) {
116+ $('power').className = 'battery-percent';
117+ $('power').innerHTML = this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor, true);
118+ }
119+ else if(batteryLevelImage == 2) {
120+ $('power').className = 'battery-percentimage';
121+ $('power').innerHTML = '<img src="images/battery-' + this.lastBatteryLevel + '.png" />' + this.getBatteryLevelPercent(this.batteryLevel, batteryLevelColor);
122+ }
123 Mojo.Controller.getAppController().removeBanner('chargingAlert');
124 }
125 }
126diff --git a/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css b/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css
127index 0917ee7..a6862a2 100644
128--- a/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css
129+++ b/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css
130@@ -136,6 +136,22 @@ body.palm-default {
131 margin-left: 2px;
132 width: 17px;
133 }
134+
135+/* Begin: Battery Percent / Image w/ Percent */
136+#power.battery-percent {
137+ width: 38px;
138+ background-color: black;
139+}
140+#power.battery-percentimage {
141+ width: 49px;
142+ background-color: black;
143+}
144+#power.battery-percentimage-charged {
145+ width: 49px;
146+ background-color: black;
147+}
148+/* End: Battery Percent / Image w/ Percent */
149+
150 #power.error {
151 background: url(../images/battery-error.png) center center no-repeat;
152 }