Skip to content

Commit

Permalink
2 Edits, 1 new
Browse files Browse the repository at this point in the history
  • Loading branch information
@dBsooner
dBsooner committed Nov 20, 2009
1 parent 3290faa commit 26017ee
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 51 deletions.
22 changes: 22 additions & 0 deletions browser/browser-change-number-of-bookmarks-on-startpage.LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Copyright (c) 2009 jmartino2011 <jmartino2011@gmail.com>

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
16 changes: 16 additions & 0 deletions browser/browser-change-number-of-bookmarks-on-startpage.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Name: Change-Number-of-Bookmarks
Version: 1.3.1-1
Author: jmartino2011
Description: Change the number of bookmarks that show on the start page of the browser, instead of just the first 12 bookmarks you have

--- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/startpage-assistant.js
+++ /usr/palm/applications/com.palm.app.browser/app/controllers/startpage-assistant.js
@@ -7,7 +7,7 @@
this._destinationUrl = params.lastUrl;
this._orientation = params.orientation || 'up';
this._bookmarks = [];
- this._maxShowCount = 12;
+ this._maxShowCount = 100;
this.store = new BookmarkStore({
database: Mojo.Controller.appController.assistant.getDatabase()
});
78 changes: 40 additions & 38 deletions messaging/messaging-sms-tone-per-contact.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Index: /usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/sound
===================================================================
--- .orig/usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
+++ /usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/soundsalertsconfig-assistant.js
@@ -94,9 +94,15 @@ var SoundsalertsconfigAssistant = Class.
@@ -96,9 +96,15 @@ var SoundsalertsconfigAssistant = Class.
$('system_ui_sounds').observe('mojo-property-change', this.toggleSystemUISounds.bindAsEventListener(this));

$('currentringtonerow').observe(Mojo.Event.tap, this.showAudioFilePicker.bindAsEventListener(this));
Expand All @@ -117,7 +117,7 @@ Index: /usr/palm/applications/com.palm.app.soundsandalerts/app/controllers/sound
this.getVibrateSettings();
this.getOtherSettings();

@@ -260,6 +266,84 @@ var SoundsalertsconfigAssistant = Class.
@@ -270,6 +276,84 @@ var SoundsalertsconfigAssistant = Class.
$('currentringtone').innerHTML = file.name;
},

Expand Down Expand Up @@ -206,7 +206,7 @@ Index: /usr/palm/applications/com.palm.app.contacts/app/controllers/edit-assista
===================================================================
--- .orig/usr/palm/applications/com.palm.app.contacts/app/controllers/edit-assistant.js
+++ /usr/palm/applications/com.palm.app.contacts/app/controllers/edit-assistant.js
@@ -63,6 +63,17 @@ EditAssistant = Class.create({
@@ -64,6 +64,17 @@ EditAssistant = Class.create({
template: "edit/ringtones"
}));

Expand All @@ -224,7 +224,7 @@ Index: /usr/palm/applications/com.palm.app.contacts/app/controllers/edit-assista

var that = this;

@@ -264,6 +275,11 @@ EditAssistant = Class.create({
@@ -278,6 +289,11 @@ EditAssistant = Class.create({
object: {ringtoneDisplay:ringtoneName},
template: "edit/ringtones"
}));
Expand All @@ -236,7 +236,7 @@ Index: /usr/palm/applications/com.palm.app.contacts/app/controllers/edit-assista

}
}
@@ -521,6 +537,7 @@ EditAssistant = Class.create({
@@ -543,6 +559,7 @@ EditAssistant = Class.create({
this.controller.listen("NameSyncPickerWrapper", Mojo.Event.tap, this.popupContactChooser.bind(this));
this.controller.get("edit-photo").observe(Mojo.Event.tap, this.attachFilePicker.bind(this));
this.controller.get("RingtoneBox").observe(Mojo.Event.tap, this.attachRingtonePicker.bind(this));
Expand Down Expand Up @@ -304,7 +304,7 @@ Index: /usr/palm/applications/com.palm.app.contacts/app/controllers/filepicker-b

attachFilePicker: function(event){
if(this.contact.readOnly){
@@ -150,6 +199,20 @@ var FilepickerBehaviors = {
@@ -153,6 +202,20 @@ var FilepickerBehaviors = {
template:"edit/ringtones"
}));
}
Expand Down Expand Up @@ -375,7 +375,7 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/listview-as
===================================================================
--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/listview-assistant.js
@@ -434,7 +434,8 @@ var ListviewAssistant = Class.create(App
@@ -436,7 +436,8 @@ var ListviewAssistant = Class.create(App
// if we are in the history view and the screen is on, do not display a banner + dashboard, just play a notification sound
if (this.isScreenOn) {
if (data.notificationType == this.Messaging.notificationTypes.newMessage && this.currentListView == this.Messaging.Views.HISTORY) {
Expand All @@ -389,7 +389,7 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-as
===================================================================
--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/chatview-assistant.js
@@ -346,7 +346,8 @@ var ChatviewAssistant = Class.create({
@@ -349,7 +349,8 @@ var ChatviewAssistant = Class.create({
if(this.isScreenOn && data.chatThreadId == this.chatThreadId) {
Mojo.Log.info("[CV] ****** chatview considerForNotification --- screen is on!");
if(data.notificationType == this.Messaging.notificationTypes.newMessage) {
Expand All @@ -403,7 +403,7 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/models/messaging-luna-s
===================================================================
--- .orig/usr/palm/applications/com.palm.app.messaging/app/models/messaging-luna-service.js
+++ /usr/palm/applications/com.palm.app.messaging/app/models/messaging-luna-service.js
@@ -993,5 +993,168 @@ var MessagingMojoService = {
@@ -1002,5 +1002,168 @@ var MessagingMojoService = {
method: 'setSMSCAddressAndEmailGateway',
parameters: {smscAddr:address, emailGateway: gateway}
});
Expand Down Expand Up @@ -577,7 +577,7 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/notificatio
===================================================================
--- .orig/usr/palm/applications/com.palm.app.messaging/app/controllers/notification-assistant.js
+++ /usr/palm/applications/com.palm.app.messaging/app/controllers/notification-assistant.js
@@ -27,6 +27,8 @@ function NotificationAssistant(controlle
@@ -27,6 +27,8 @@
};
}

Expand All @@ -586,7 +586,7 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/notificatio
NotificationAssistant.prototype.subscribeToNotifications = function(){
this.messageNotificationRequest = MessagingMojoService.registerForIncomingMessages({onSuccess: this.sendNotification.bind(this, this.Messaging.notificationTypes.newMessage)});
this.sendErrorNotificationRequest = MessagingMojoService.registerForSendFailures(this.sendNotification.bind(this, this.Messaging.notificationTypes.sendFailure));
@@ -35,6 +37,37 @@ NotificationAssistant.prototype.subscrib
@@ -35,6 +37,37 @@
this.airplaneModeNotificationRequest = MessagingMojoService.registerForAirplaneModeNotifications(this.sendAirplaneModeNotification.bind(this));
};

Expand Down Expand Up @@ -624,40 +624,45 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/notificatio
NotificationAssistant.prototype.sendNotification = function(notificationType, resp){
if (window.PalmSystem && !resp.returnValue) {
try {
@@ -140,7 +173,8 @@ NotificationAssistant.prototype.consider
@@ -153,7 +186,8 @@

// check if we should only play a sound (when you are already in a chat & a new message comes in)
if(notificationData.get('playSoundOnly') && this.Messaging.messagingPrefs.enableNotificationSound) {
if(notificationData.playSoundOnly && this.Messaging.messagingPrefs.enableNotificationSound) {
- this.controller.playSoundNotification('alerts','');
+ var smsid = notificationData.get('address');
+ MessagingMojoService.rLookup(smsid,contact,this.playmsgtone.bind(this),this.playmsgtone.bind(this));
+ var smsid = notificationData.address;
+ MessagingMojoService.rLookup(smsid,contact,this.playmsgtone.bind(this),this.playmsgtone.bind(this));
return; // don't display any visual notification
}

@@ -176,10 +210,11 @@ NotificationAssistant.prototype.sendClas
@@ -189,7 +223,8 @@

notificationData.set('alertTitle',alertTitle);
notificationData.alertTitle = alertTitle;
this.class0AlertData.list.push(notificationData);
- this.renderClass0PopupAlert(true);
+ var smsid = notificationData.get('address');
+ var smsid = notificationData.address;;
+ MessagingMojoService.getMessagetone(this.renderClass0PopupAlert.bind(this,true));
};

NotificationAssistant.prototype.renderClass0PopupAlert = function(playSound) {
@@ -192,7 +227,7 @@
this.renderClass0PopupAlert(true);
};

-NotificationAssistant.prototype.renderClass0PopupAlert = function(playSound) {
+NotificationAssistant.prototype.renderClass0PopupAlert = function(playSound,messageTone) {
var class0Stage = this.controller.getStageController(Class0AlertStageName);

if(class0Stage) {
@@ -188,6 +223,8 @@ NotificationAssistant.prototype.renderCl
@@ -201,6 +236,8 @@
var soundClass = 'none';
if(playSound) {
soundClass = 'alerts';
+ if(messageTone)
+ soundFile = messageTone;
+ if(messageTone)
+ soundFile = messageTone;
}

var pushClass0AlertScene = function(stageController) {
@@ -198,7 +235,8 @@ NotificationAssistant.prototype.renderCl
@@ -211,7 +248,8 @@
name: Class0AlertStageName,
lightweight: true,
height: 300,
Expand All @@ -667,37 +672,34 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/notificatio
}, pushClass0AlertScene, 'popupalert');
}

@@ -253,8 +291,6 @@ NotificationAssistant.prototype.sendNewM
var bannerParams = {
messageText: notificationText
};
- if (this.Messaging.messagingPrefs.enableNotificationSound)
- bannerParams.soundClass = "alerts";
var bannerLaunchParams = {
chatThreadId: chatThreadId,
clearBanner: true
@@ -262,10 +298,17 @@ NotificationAssistant.prototype.sendNewM
@@ -284,7 +322,14 @@

if (this.Messaging.DisplayState.isDisplayOn()) {
Mojo.Log.info("notificationAssistant - executing full banner notification");
- this.controller.showBanner(bannerParams, bannerLaunchParams, 'chat');
+ if (this.Messaging.messagingPrefs.enableNotificationSound) {
+ var smsid = notificationData.get('address');
+ var smsid = notificationData.address;
+ bannerParams.soundClass = "alerts";
+ MessagingMojoService.rLookup(smsid,contact,this.doB.bind(this,bannerParams,bannerLaunchParams,'chat'),this.doB.bind(this,bannerParams,bannerLaunchParams,'chat'));
+ } else {
+ Mojo.Log.error("Setting banner params");
+ this.controller.showBanner(bannerParams, bannerLaunchParams, 'chat');
+ }
+ }
} else if (this.Messaging.messagingPrefs.enableNotificationSound) {
Mojo.Log.info("notificationAssistant - playing sound notification only");
this.controller.playSoundNotification(bannerParams.soundClass, bannerParams.soundFile);
@@ -286,8 +331,8 @@
Mojo.Log.info("notificationAssistant - executing full banner notification");
this.controller.showBanner(bannerParams, bannerLaunchParams, 'chat');
} else if (this.Messaging.messagingPrefs.enableNotificationSound) {
- Mojo.Log.info("notificationAssistant - playing sound notification only");
- this.controller.playSoundNotification('alerts','');
+ var smsid = notificationData.get('address');
- this.controller.playSoundNotification(bannerParams.soundClass, bannerParams.soundFile);
+ var smsid = notificationData.address;
+ MessagingMojoService.rLookup(smsid,contact,this.playmsgtone.bind(this),this.playmsgtone.bind(this));
}

// Store the data so it can be used in the dashboard
@@ -324,13 +367,9 @@ NotificationAssistant.prototype.sendNewM
@@ -346,13 +391,9 @@
// delay creating the dashboard window for the case where the banner is clicked on
// to take you to the chat view. This will likely result in the dashboard data
// being cleared. If the dashboard data is empty, we do not need to create the dashboard.
Expand All @@ -710,7 +712,7 @@ Index: /usr/palm/applications/com.palm.app.messaging/app/controllers/notificatio
- createDashboard(); // if the screen is off, create the dashboard right away
+ if (!this.isNewMessageDashboardPending) {
+ this.isNewMessageDashboardPending = true;
+ createDashboard.delay(5);
+ createDashboard.delay(5);
}
}
};
23 changes: 10 additions & 13 deletions universal-search/universal-search-command-line.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,20 @@ Index: /usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assis
===================================================================
--- .orig/usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js
+++ /usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assistant.js
@@ -125,9 +125,21 @@
@@ -125,6 +125,7 @@
searchesDiv.update(Mojo.View.render({template: 'global-search/expanded-searches-div' }));
this.expandedSearchDrawer = { showExpanded: false };
this.controller.setupWidget('expanded_searches_drawer', {unstyled:true, property:'showExpanded'}, this.expandedSearchDrawer);
+
this.webDrawer = { showWeb: false };
this.controller.setupWidget('web_drawer', {unstyled:true, property:'showWeb'}, this.webDrawer);

@@ -160,9 +161,47 @@

this.controller.listen(this.controller.document, 'paste', this.onPaste.bindAsEventListener(this), true);

+ this.commandLine = new CommandLine();
+
+ var searchesDivUSCL = this.controller.get('searches-list-uscl');
+ searchesDivUSCL.update(Mojo.View.render({template: 'global-search/expanded-searches-div-uscl' }));
+ this.expandedSearchDrawerUSCL = { showExpanded: false };
Expand All @@ -15,21 +24,9 @@ Index: /usr/lib/luna/system/luna-applauncher/app/controllers/global-search-assis
+ scrollDisabled: true},
+ this.expandedSearchDrawerUSCL);
+
this.webDrawer = { showWeb: false };
this.controller.setupWidget('web_drawer', {unstyled:true, property:'showWeb'}, this.webDrawer);

+ this.commandLineDrawer = { showCommandLine: false };
+ this.controller.setupWidget('command_line_drawer', {unstyled: true, property: 'showCommandLine'}, this.commandLineDrawer);
+
this.searchEngineList = [{id:"google",title:"Google",imgFile:"images/search-google.png", showImage:"block", showName:"none"},
{id:"map",title:"Google Maps",imgFile:"images/search-maps.png", showImage:"block", showName:"none"},
{id:"wikipedia",title:"Wikipedia",imgFile:"images/search-wikipedia.png", showImage:"block", showName:"none"},
@@ -160,9 +172,36 @@

this.controller.listen(this.controller.document, 'paste', this.onPaste.bindAsEventListener(this), true);

+ this.commandLine = new CommandLine();
+
+ this.usclSearchesAttrs = {
+ listTemplate: "global-search/templates/uscl-searches-list",
+ itemTemplate: "global-search/templates/uscl-searches-item",
Expand Down

0 comments on commit 26017ee

Please sign in to comment.