Commit 1f2c81099735adc2cd408a702a323c507b4f4766

  • avatar
  • dBsooner's Stuff <dbsooner @del…ge.vision5.com>
  • Tue Mar 02 19:45:38 CET 2010
13 ported and 1 new for 1.4.0.
  
1diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
2index bebbad2..db5ecfd 100644
3--- a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
4+++ b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
5@@ -10,7 +10,7 @@ var LauncherAssistant = Class.create({
6 */
7 kQuickLaunchHeight: 67,
8
9- kPageIndicatorSpacing: 6, /* spacing between each page indicator */
10+ kPageIndicatorSpacing: 1, /* spacing between each page indicator */
11 kPageMargin: 10, /* 10 pixel margin on each side of a page */
12 kPageWidthNoMargin: NaN,
13 kPageWidth: NaN,
14@@ -341,9 +341,9 @@ var LauncherAssistant = Class.create({
15 newAppDiv = $(newAppInfo.launchPointId);
16 Mojo.assert(newAppDiv !== undefined, "Application (%d) was inserted into the DOM but unable to be retrieved!", newAppInfo.launchPointId);
17 if (isNaN(this.kAppWidth) || isNaN(this.kAppHeight)) {
18- this.kAppWidth = newAppDiv.getWidth();
19- this.kAppHeight = newAppDiv.getHeight();
20- this.kAppsPerRow = Math.round(this.kPageWidthNoMargin / this.kAppWidth);
21+ this.kAppWidth = 64;
22+ this.kAppHeight = 75;
23+ this.kAppsPerRow = 5;
24 }
25
26 Mojo.listen(newAppDiv, Mojo.Event.tap, this.onAppTapped.bindAsEventListener(this));
27@@ -541,8 +541,8 @@ var LauncherAssistant = Class.create({
28 /* determines the position of an app element at appIndex within a page */
29 calculateAppPosition: function(appIndex) {
30 return {
31- left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) + this.kPageMargin),
32- top: (Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight)
33+ left: (((appIndex % this.kAppsPerRow) * this.kAppWidth) - 20),
34+ top: ((Math.floor(appIndex/this.kAppsPerRow) * this.kAppHeight) - 10)
35 };
36 },
37
38diff --git a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
39index 545460c..3266451 100644
40--- a/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
41+++ b/usr/lib/luna/system/luna-applauncher/stylesheets/launcher.css
42@@ -125,16 +125,17 @@ body.palm-default
43
44 .launcher_page .name {
45 position:absolute;
46- top: 68px;
47- width:100px;
48+ top: 48px;
49+ left:20px;
50+ width:65px;
51 height: 34px;
52 max-height: 34px;
53 clear:both;
54- line-height:16px;
55+ line-height:13px;
56 color:white;
57 text-align:center;
58 font-weight:bold;
59- font-size: 14px;
60+ font-size: 12px;
61 overflow: hidden;
62 text-overflow: ellipsis;
63 z-index:5;
64@@ -263,8 +264,8 @@ body.palm-default
65 }
66
67 .draggable {
68- width:64px;
69- height:64px;
70+ width:48px;
71+ height:48px;
72 margin: 0 auto;
73 -webkit-user-drag: any;
74 -webkit-user-select: none;
75@@ -312,8 +313,8 @@ body.palm-default
76
77 #app-icon {
78 float:left;
79- width:64px;
80- height:64px;
81+ width:32px;
82+ height:32px;
83 background: center center no-repeat;
84 }
85
  
1diff --git a/usr/palm/applications/com.palm.app.phoneprefs/app/controllers/preflist-assistant.js b/usr/palm/applications/com.palm.app.phoneprefs/app/controllers/preflist-assistant.js
2index f46326e..d207719 100644
3--- a/usr/palm/applications/com.palm.app.phoneprefs/app/controllers/preflist-assistant.js
4+++ b/usr/palm/applications/com.palm.app.phoneprefs/app/controllers/preflist-assistant.js
5@@ -95,6 +95,10 @@ var PreflistAssistant = Class.create({
6 value: true
7 };
8
9+ this.phoneAppHideCallDurationModel = {
10+ value: false
11+ };
12+
13 this.callFwdModel = {
14 value: false
15 };
16@@ -137,6 +141,13 @@ var PreflistAssistant = Class.create({
17 }, this.showContactMatchModel);
18 this.controller.get('showContactMatch').addEventListener(Mojo.Event.propertyChange, this.doPropertyChanged.bindAsEventListener(this, 'showContactMatch'));
19
20+ this.controller.setupWidget('phoneAppHideCallDuration', {
21+ modelProperty: 'value',
22+ trueLabel: $L('Yes'),
23+ falseLabel: $L('No')
24+ }, this.phoneAppHideCallDurationModel);
25+ this.controller.get('phoneAppHideCallDuration').addEventListener(Mojo.Event.propertyChange, this.doPropertyChanged.bindAsEventListener(this, 'phoneAppHideCallDuration'));
26+
27 this.controller.setupWidget('callfwd', {
28 modelProperty: 'value'
29 }, this.callFwdModel);
30@@ -378,6 +389,7 @@ var PreflistAssistant = Class.create({
31 ['phoneInternationalDialingActive', 'phoneInternationalDialingRegionId'],this.updateInternationalDialingSettings.bind(this));
32 this.networkStatusQueryReq = TelephonyService.networkStatusQuery(this.updateNetworkname.bind(this));
33 this.getSystemPreferencesServiceShowcontactmatchReq = SystemService.getSystemPreferencesService('showcontactmatch',this.updateShowcontactmatch.bind(this));
34+ this.getSystemPreferencesServicephoneAppHideCallDurationReq = SystemService.getSystemPreferencesService('phoneAppHideCallDuration',this.updatephoneAppHideCallDuration.bind(this));
35 this.updateManualDataSettingsReq = SystemService.getManualDataSettings(this.updateManualDataSettings.bind(this));
36 this.getVoiceNumberEditableReq = SystemService.getSystemPreferencesService('allowEditVoicemail',this.updateVoicenumberEditableQueryDone.bind(this));
37 this.getSystemPreferencesNetworkSettingReq = SystemService.getSystemPreferencesService(['showUpdateNetworkSettings','showUpdatePRL'],this.updateNetworkSettingDone.bind(this));
38@@ -972,7 +984,14 @@ voiceNumberSetDone: function(payload){
39
40 },
41
42+ //phoneAppHideCallDuration
43+ updatephoneAppHideCallDuration: function(payload){
44+ if(payload.phoneAppHideCallDuration == undefined)
45+ return;
46+ this.phoneAppHideCallDurationModel.value = payload.phoneAppHideCallDuration;
47+ this.controller.modelChanged(this.phoneAppHideCallDurationModel);
48
49+ },
50
51 //DTMF
52 updateDTMF: function(payload){
53@@ -2069,6 +2088,16 @@ break;
54 case 'showContactMatch':
55 this.setSystemPreferencesServiceReq = SystemService.setSystemPreferencesService('showcontactmatch',value,null);
56 break;
57+ case 'phoneAppHideCallDuration':
58+ this.setSystemPreferencesServiceReq = SystemService.setSystemPreferencesService('phoneAppHideCallDuration',value,null);
59+ this.controller.showAlertDialog({
60+ title: $L('Luna Restart Required'),
61+ preventCancel: true,
62+ message: $L('You must restart Luna for this setting to take effect. Restart takes approximately 30 seconds. Restart Now?'),
63+ choices: [{label:$L('OK'), value:'ok'},{label:$L('Later'), value:'later'}],
64+ onChoose: this.LunaRestartOK.bindAsEventListener(this)
65+ });
66+ break;
67 case 'showOutgoingCallerID':
68 this.clirSetReq = TelephonyService.clirSet(!value, this.handleError.bind(this));
69 break;
70@@ -2148,6 +2177,24 @@ break;
71 break;
72 }
73 },
74+
75+ LunaRestartOK: function(payload) {
76+ if(payload == 'ok') {
77+ this.controller.serviceRequest('palm://org.webosinternals.ipkgservice', {
78+ method: "restartluna",
79+ parameters: {}
80+ });
81+ } else {
82+ this.controller.showAlertDialog({
83+ title: $L('Luna Restart Required'),
84+ preventCancel: true,
85+ message: $L('Remember, you must restart Luna (or the phone) for this setting to take effect.'),
86+ choices: [{label:$L('OK'), value:'ok'}],
87+ onChoose: function(value) { return }
88+ });
89+ }
90+
91+ },
92
93 handleError: function(payload) {
94
95diff --git a/usr/palm/applications/com.palm.app.phoneprefs/app/views/preflist/preflist-scene.html b/usr/palm/applications/com.palm.app.phoneprefs/app/views/preflist/preflist-scene.html
96index 9912c08..2a92355 100644
97--- a/usr/palm/applications/com.palm.app.phoneprefs/app/views/preflist/preflist-scene.html
98+++ b/usr/palm/applications/com.palm.app.phoneprefs/app/views/preflist/preflist-scene.html
99@@ -42,6 +42,22 @@
100 </div>
101 </div>
102
103+ <div class="palm-group">
104+ <div x-mojo-loc="" class="palm-group-title">
105+ Call Log
106+ </div>
107+ <div class="palm-list">
108+ <div class="palm-row single">
109+ <div class="palm-row-wrapper">
110+ <div id="phoneAppHideCallDuration" x-mojo-element="ToggleButton"></div>
111+ <div class="title capitalize" x-mojo-loc="">
112+ Hide Call Durations
113+ </div>
114+ </div>
115+ </div>
116+ </div>
117+ </div>
118+
119 <div class="palm-group" id="calls">
120 <div x-mojo-loc="" class="palm-group-title">
121 Calls
1221diff --git a/usr/palm/applications/com.palm.app.phoneprefs/resources/de_de/strings.json.rej b/usr/palm/applications/com.palm.app.phoneprefs/resources/de_de/strings.json.rej
1232new file mode 100644
1243index 0000000..a04365f