Skip to content

Commit

Permalink
21 New Patches.
Browse files Browse the repository at this point in the history
  • Loading branch information
dBsooner's Stuff committed Apr 19, 2010
1 parent b689412 commit 8621cda
Show file tree
Hide file tree
Showing 10 changed files with 438 additions and 0 deletions.
@@ -0,0 +1,105 @@
diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js
index 6f3368e..751ce0f 100644
--- a/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js
+++ b/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js
@@ -247,9 +247,6 @@ GlobalSearchAssistant = Class.create({
SystemManagerService.showLauncher(false);
this.launcherHiddenAtFirstKeydown = false;
}
- else {
- SystemManagerService.showQuickLaunch(true);
- }

this.galInit();
},
diff --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
index 9057138..13e79b7 100644
--- a/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
+++ b/usr/lib/luna/system/luna-applauncher/app/controllers/launcher-assistant.js
@@ -8,7 +8,7 @@ var LauncherAssistant = Class.create({
* hardcoding the quick launch height until we can find a better way.
* This value = ql graphic height - the offset from the top (small fade area)
*/
- kQuickLaunchHeight: 67,
+ kQuickLaunchHeight: 0,

kPageIndicatorSpacing: 6, /* spacing between each page indicator */
kPageMargin: 10, /* 10 pixel margin on each side of a page */
@@ -23,10 +23,15 @@ var LauncherAssistant = Class.create({
visible: true,
label: $L('Launcher'),
items: [
- /*{ label: $L('New page'), command: 'newpage' },
- { label: $L('Delete page'), command: 'deletepage' },*/
Mojo.Menu.editItem,
- { label: $L('List Apps...'), command: 'listapps' },
+ { label: $L('Edit Pages'),
+ items: [
+ { label: $L('New page'), command: 'newpage' },
+ { label: $L('Delete page'), command: 'deletepage' }
+ ]
+ },
+ { label: $L('Edit Quick Launch'), command: 'quicklaunch' },
+ { label: $L('List All Applications'), command: 'listapps' },
{ label: $L('Default Applications'), command: 'defaultapps'},
Mojo.Menu.helpItem
]
@@ -63,6 +68,7 @@ var LauncherAssistant = Class.create({

setup: function() {

+ Mojo.listen(this.controller.document, Mojo.Event.activate, this.onActivate.bindAsEventListener(this));
Mojo.listen(this.controller.document, Mojo.Event.deactivate, this.onDeactivate.bindAsEventListener(this));
Mojo.listen(this.controller.window, 'resize', this.onResize.bindAsEventListener(this));

@@ -121,7 +127,11 @@ var LauncherAssistant = Class.create({
case 'defaultapps':
ApplicationService.launch(this.deviceInfo.id, this.deviceInfo.defaultAppParams);
break;
- /*
+ case 'quicklaunch':
+ SystemManagerService.showQuickLaunch(true);
+ this.kQuickLaunchHeight = 67;
+ this.adjustLayout();
+ break;
case 'newpage':
if (this.pageDivs.length < 10) {
this.insertPage(this.activePageIndex, true);
@@ -135,7 +145,6 @@ var LauncherAssistant = Class.create({
}
}
break;
- */
}
}
else if (event.type === Mojo.Event.commandEnable) {
@@ -164,6 +173,14 @@ var LauncherAssistant = Class.create({
this.updatePageIndicators();
},

+ /* hide quick launch */
+ onActivate: function(event) {
+ this.kQuickLaunchHeight = 0;
+ this.adjustLayout();
+
+ SystemManagerService.showQuickLaunch(false);
+ },
+
/* clean and hide global search */
onDeactivate: function(event) {

@@ -578,14 +595,12 @@ var LauncherAssistant = Class.create({
}
}

- SystemManagerService.showQuickLaunch(false);
this.globalSearchAssistant.enable(false);

var appInfoAssistant = new AppInfoAssistant(appInfo,
this.controller,
function() {
this.appDialog = undefined;
- SystemManagerService.showQuickLaunch(true);
this.globalSearchAssistant.enable(true);
}.bind(this));

57 changes: 57 additions & 0 deletions calendar/calendar-notification-repeat-german-localisation.patch
@@ -0,0 +1,57 @@
diff --git a/usr/palm/applications/com.palm.app.calendar/resources/de_de/strings.json b/usr/palm/applications/com.palm.app.calendar/resources/de_de/strings.json
index 69685ee..15767af 100644
--- a/usr/palm/applications/com.palm.app.calendar/resources/de_de/strings.json
+++ b/usr/palm/applications/com.palm.app.calendar/resources/de_de/strings.json
@@ -244,5 +244,20 @@
"{0}nd": "{0}.",
"{0}rd": "{0}.",
"{0}st": "{0}.",
- "{0}th": "{0}."
+ "{0}th": "{0}.",
+ "Disabled" : "Deaktiviert",
+ "5 Seconds" : "5 Sekunden",
+ "10 Seconds" : "10 Sekunden",
+ "15 Seconds" : "15 Sekunden",
+ "20 Seconds" : "20 Sekunden",
+ "25 Seconds" : "25 Sekunden",
+ "30 Seconds" : "30 Sekunden",
+ "1 Minutes" : "1 Minute",
+ "2 Minutes" : "2 Minuten",
+ "3 Minutes" : "3 Minuten",
+ "4 Minutes" : "4 Minuten",
+ "5 Minutes" : "5 Minuten",
+ "10 Minutes" : "10 Minuten",
+ "15 Minutes" : "15 Minuten",
+ "Unlimited" : "Unbegrenzt"
}
\ No newline at end of file
diff --git a/usr/palm/applications/com.palm.app.calendar/resources/de_de/views/prefs/prefs-scene.html b/usr/palm/applications/com.palm.app.calendar/resources/de_de/views/prefs/prefs-scene.html
index 49bda59..0a09c64 100644
--- a/usr/palm/applications/com.palm.app.calendar/resources/de_de/views/prefs/prefs-scene.html
+++ b/usr/palm/applications/com.palm.app.calendar/resources/de_de/views/prefs/prefs-scene.html
@@ -42,6 +42,25 @@
</div>
</div>

+<div id='pv_notificationrepeat_div' class="palm-group">
+ <div class="palm-group-title" x-mojo-loc="">Erinnerung wiederholen</div>
+ <div class="palm-list">
+ <div id="pv_notification_repeat_interval" class="palm-row">
+ <div class="palm-row-wrapper">
+ <div class="label" x-mojo-loc="">Wiederholungsinterval</div>
+ <div id="pv_notification_repeat_interval_value" class="title"></div>
+ </div>
+ </div>
+
+ <div id="pv_notification_max_repeat" class="palm-row">
+ <div class="palm-row-wrapper">
+ <div class="label" x-mojo-loc="">Maximale Wiederholungen</div>
+ <div id="pv_notification_max_repeat_value" class="title"></div>
+ </div>
+ </div>
+ </div>
+</div>
+
<div id='pv_defaulteventalarm_div' class="palm-group">
<div class="palm-group-title">Standarderinnerung für Ereignisse</div>
<div class="palm-list">
37 changes: 37 additions & 0 deletions contacts/contacts-add-sync-now.patch
@@ -0,0 +1,37 @@
diff --git a/usr/palm/applications/com.palm.app.contacts/app/controllers/list-assistant.js b/usr/palm/applications/com.palm.app.contacts/app/controllers/list-assistant.js
index fbb9529..43f4f60 100644
--- a/usr/palm/applications/com.palm.app.contacts/app/controllers/list-assistant.js
+++ b/usr/palm/applications/com.palm.app.contacts/app/controllers/list-assistant.js
@@ -287,6 +287,8 @@ ListAssistant = Class.create(App.Scene,{
items: [Mojo.Menu.editItem,{
label:$L("Send All to Car Kit"),
command:"sendcontacts"
+ }, {label:$L("Sync Now"),
+ command:"syncnow"
}, prefsItem, {
label: $LL('Help'),
command: Mojo.Menu.helpCmd
@@ -466,6 +468,8 @@ ListAssistant = Class.create(App.Scene,{
this.controller.stageController.pushScene('prefs');
}else if (event.type == Mojo.Event.command && event.command == "sendcontacts") {
this.sendContacts();
+ }else if (event.type == Mojo.Event.command && event.command == "syncnow") {
+ this.syncAccounts();
}
if (event.type == Mojo.Event.commandEnable && event.command == Mojo.Menu.prefsCmd) {
// funkay! this is apparently how you declare you want to activate the prefs menu item
@@ -691,6 +695,14 @@ ListAssistant = Class.create(App.Scene,{

}.bind(this)
});
+ },
+
+ syncAccounts: function() {
+ AppAssistant.pimSyncService.syncAll(this.controller, this.easAccounts, this.showSyncing.bind(this));
+ },
+
+ showSyncing: function() {
+ this.controller.showBanner($L("Syncing Accounts..."), {});
}


41 changes: 41 additions & 0 deletions messaging/messaging-history-chat-ballon-color.patch
@@ -0,0 +1,41 @@
diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
index c301f25..668f2a3 100644
--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
@@ -829,8 +829,11 @@ var ListviewAssistant = Class.create(App.Scene, {
// Runs on all history list item models when received from the service, before giving them to the List widget.
preformatHistoryItem: function(item) {
if (ChatFlags.isOutgoing(item.flags)) {
+ item.css_class = "my-history-chat";
item.messageActionImage = "images/outgoing.png";
+
} else {
+ item.css_class = "their-chat";
item.messageActionImage = "images/incoming.png";
}

diff --git a/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html b/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html
index 355c0f4..18b4480 100644
--- a/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html
+++ b/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html
@@ -1,4 +1,4 @@
-<div id="#{id}" class="palm-row chat-entry historyRow removable #{classNames}">
+<div id="#{id}" class="palm-row chat-entry historyRow removable #{css_class} #{classNames}">
<div class="palm-row-wrapper">
<div class="chat-balloon" x-mojo-tap-highlight="momentary">
<div class="chat-balloon-wrapper">
diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
index 5444b11..aa5cd72 100644
--- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
+++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
@@ -608,6 +608,10 @@ img.avatar-overlay {
-webkit-border-image: url(../images/chatview/chat-balloon-right-error.png) 10 10 10 10 stretch stretch;
}

+.chat-entry.my-history-chat .chat-balloon {
+ -webkit-border-image: url(../images/chatview/chat-balloon-right.png) 10 10 10 10 stretch stretch;
+}
+
.palm-row.chat-entry.historyRow .chat-balloon.selected {
border-width: 10px;
-webkit-border-image: url(../images/chatview/chat-balloon-left-selected.png) 10 10 10 10 stretch stretch;
41 changes: 41 additions & 0 deletions messaging/messaging-history-chat-balloon-color--with-scrim.patch
@@ -0,0 +1,41 @@
diff --git a/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js b/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
index c301f25..668f2a3 100644
--- a/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
+++ b/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
@@ -829,8 +829,11 @@ var ListviewAssistant = Class.create(App.Scene, {
// Runs on all history list item models when received from the service, before giving them to the List widget.
preformatHistoryItem: function(item) {
if (ChatFlags.isOutgoing(item.flags)) {
+ item.css_class = "my-history-chat";
item.messageActionImage = "images/outgoing.png";
+
} else {
+ item.css_class = "their-chat";
item.messageActionImage = "images/incoming.png";
}

diff --git a/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html b/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html
index 355c0f4..18b4480 100644
--- a/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html
+++ b/usr/palm/applications/com.palm.app.messaging/app/views/listview/historyList-row.html
@@ -1,4 +1,4 @@
-<div id="#{id}" class="palm-row chat-entry historyRow removable #{classNames}">
+<div id="#{id}" class="palm-row chat-entry historyRow removable #{css_class} #{classNames}">
<div class="palm-row-wrapper">
<div class="chat-balloon" x-mojo-tap-highlight="momentary">
<div class="chat-balloon-wrapper">
diff --git a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
index 5444b11..d105d0b 100644
--- a/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
+++ b/usr/palm/applications/com.palm.app.messaging/stylesheets/messaging.css
@@ -608,6 +608,10 @@ img.avatar-overlay {
-webkit-border-image: url(../images/chatview/chat-balloon-right-error.png) 10 10 10 10 stretch stretch;
}

+.chat-entry.my-history-chat .chat-balloon {
+ -webkit-border-image: url(/media/internal/scrims/chat-balloon-history-left.png) 10 10 10 10 stretch stretch;
+}
+
.palm-row.chat-entry.historyRow .chat-balloon.selected {
border-width: 10px;
-webkit-border-image: url(../images/chatview/chat-balloon-left-selected.png) 10 10 10 10 stretch stretch;
24 changes: 24 additions & 0 deletions phone/phone-big-callerid-yellow-size-30.patch
@@ -0,0 +1,24 @@
diff --git a/usr/palm/applications/com.palm.app.phone/app/views/incomingcall/details-stamp.html b/usr/palm/applications/com.palm.app.phone/app/views/incomingcall/details-stamp.html
index 3a99fcd..ed18166 100644
--- a/usr/palm/applications/com.palm.app.phone/app/views/incomingcall/details-stamp.html
+++ b/usr/palm/applications/com.palm.app.phone/app/views/incomingcall/details-stamp.html
@@ -1,4 +1,9 @@
<div class="incoming-background">
+ <div class="incoming-name">
+ <div style="font-size:30pt;lineHeight=8pt;text-align:center;position:relative;left:-40px;width:350px;text-align: center;color:yellow">
+ #{displayName}
+ </div>
+ </div>
<div class="incoming-background-wrapper">
<div class="incoming-picture-container" id="contact_picture_frame">
<img id="picture" class="incoming-picture-square" src="images/contacts-unknown-icon-large.png" />
@@ -6,9 +11,6 @@
</div>
<div class="incoming-call-text stamp-size" x-mojo-tap-highlight="immediate">
<div class="incoming-container" id="contact_info">
- <div class="incoming-name">
- #{displayName}
- </div>
<div class="incoming-number">
#{displayNumber}
</div>
18 changes: 18 additions & 0 deletions phone/phone-call-block-answer-then-hangup.patch
@@ -0,0 +1,18 @@
diff --git a/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js b/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
index 09edc4a..7f53119 100644
--- a/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
+++ b/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
@@ -715,7 +715,12 @@ var TelephonyEventListener = Class.create({
contact.cnapName = cnapName;

QDLogger.log( "TelephonyEventListener#onIncomingLookupComplete", "namefromcontacts?:" , !!(contact.name));
- this.announcer.announceIncoming(callId, number, contact, !!(contact.name), this.isConnected(), update);
+ if (contact.name === 'Do Not Answer'){
+ TelephonyCommands.answer(callId);
+ TelephonyCommands.disconnect(callId);
+ } else {
+ this.announcer.announceIncoming(callId, number, contact, !!(contact.name), this.isConnected(), update);
+ }
},

// called if lookup returns late. checks for incoming call and updates that if it's up; otherwise
17 changes: 17 additions & 0 deletions phone/phone-call-block-anyone-not-in-contacts.patch
@@ -0,0 +1,17 @@
diff --git a/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js b/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
index 09edc4a..26e3f9d 100644
--- a/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
+++ b/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
@@ -715,7 +715,11 @@ var TelephonyEventListener = Class.create({
contact.cnapName = cnapName;

QDLogger.log( "TelephonyEventListener#onIncomingLookupComplete", "namefromcontacts?:" , !!(contact.name));
- this.announcer.announceIncoming(callId, number, contact, !!(contact.name), this.isConnected(), update);
+ if (!(contact.name)){
+ this.flagCallRejected(callId);
+ } else {
+ this.announcer.announceIncoming(callId, number, contact, !!(contact.name), this.isConnected(), update);
+ }
},

// called if lookup returns late. checks for incoming call and updates that if it's up; otherwise
17 changes: 17 additions & 0 deletions phone/phone-call-block-with-block-unknown-or-blocked.patch
@@ -0,0 +1,17 @@
diff --git a/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js b/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
index 09edc4a..45d68bc 100644
--- a/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
+++ b/usr/palm/applications/com.palm.app.phone/app/models/TelephonyEventListener.js
@@ -715,7 +715,11 @@ var TelephonyEventListener = Class.create({
contact.cnapName = cnapName;

QDLogger.log( "TelephonyEventListener#onIncomingLookupComplete", "namefromcontacts?:" , !!(contact.name));
- this.announcer.announceIncoming(callId, number, contact, !!(contact.name), this.isConnected(), update);
+ if ((contact.name === 'Do Not Answer') || (number === undefined) || (number == null) || (number == "") || (number == "unknown") || (number == "unknown caller") || (number == "blocked caller")){
+ this.flagCallRejected(callId);
+ } else {
+ this.announcer.announceIncoming(callId, number, contact, !!(contact.name), this.isConnected(), update);
+ }
},

// called if lookup returns late. checks for incoming call and updates that if it's up; otherwise

0 comments on commit 8621cda

Please sign in to comment.