Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
www-data
committed
Feb 24, 2011
1 parent
89a0225
commit cdb48da
Showing
52 changed files
with
21,474 additions
and
0 deletions.
There are no files selected for viewing
85 changes: 85 additions & 0 deletions
85
app-launcher/app-launcher-advanced-options-in-launcher.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
diff --git a/usr/lib/luna/system/luna-applauncher/app/controllers/launcherhelper-assistant.js b/usr/lib/luna/system/luna-applauncher/app/controllers/launcherhelper-assistant.js | ||
index 3c78497..073046f 100644 | ||
--- a/usr/lib/luna/system/luna-applauncher/app/controllers/launcherhelper-assistant.js | ||
+++ b/usr/lib/luna/system/luna-applauncher/app/controllers/launcherhelper-assistant.js | ||
@@ -32,10 +32,33 @@ LauncherhelperAssistant.prototype.setup = function() { | ||
{ label: $L('Reorder Launcher Page'), command: 'reorderpage' }, | ||
{ label: $L('List Apps...'), command: 'listapps' }, | ||
{ label: $L('Default Applications'), command: 'defaultapps'}, | ||
+ { label:'Advanced Options', items: [ | ||
+ {label:"Toggle DevMode", command:'devmode'}, | ||
+ {label:"Rescan Applications", command:'rescanapps'}, | ||
+ {label:"Run Garbage Collector", command:'gc'} | ||
+ ]}, | ||
Mojo.Menu.helpItem | ||
] | ||
}; | ||
this.controller.setupWidget(Mojo.Menu.appMenu, {omitDefaultItems:true}, this.appMenuModel); | ||
+ this.inDevMode = false; | ||
+ this.controller.serviceRequest('palm://com.palm.connectionmanager', { | ||
+ method: 'getnovacommode', | ||
+ parameters: {}, | ||
+ onSuccess: function(response){ | ||
+ this.inDevMode = response.isEnabled; | ||
+ for(var i=0; i<this.appMenuModel.items.length; i++) { | ||
+ if(this.appMenuModel.items[i].label=="") { | ||
+ if(this.inDevMode) { | ||
+ this.appMenuModel.items[i].items[0].label = "Disable DevMode"; | ||
+ } else { | ||
+ this.appMenuModel.items[i].items[0].label = "Enable DevMode"; | ||
+ } | ||
+ } | ||
+ } | ||
+ this.controller.modelChanged(this.appMenuModel); | ||
+ }.bind(this) | ||
+ }); | ||
|
||
this.setupTextWidget(false); | ||
|
||
@@ -128,6 +151,46 @@ LauncherhelperAssistant.prototype.handleAppMenuClosed = function(event) { | ||
LauncherhelperAssistant.prototype.handleCommand = function(event){ | ||
if (event.type == Mojo.Event.command) { | ||
switch (event.command) { | ||
+ case 'devmode': | ||
+ this.controller.serviceRequest('palm://com.palm.connectionmanager', { | ||
+ method: 'getnovacommode', | ||
+ parameters: {}, | ||
+ onSuccess: function(response){ | ||
+ this.inDevMode = response.isEnabled; | ||
+ this.controller.serviceRequest('palm://com.palm.connectionmanager', { | ||
+ method: 'setnovacommode', | ||
+ parameters: { | ||
+ isEnabled:!this.inDevMode | ||
+ }, | ||
+ onSuccess: function(response) { | ||
+ this.inDevMode = !this.inDevMode; | ||
+ for(var i=0; i<this.appMenuModel.items.length; i++) { | ||
+ if(this.appMenuModel.items[i].label=="") { | ||
+ if(this.inDevMode) { | ||
+ this.appMenuModel.items[i].items[0].label = "Disable DevMode"; | ||
+ } else { | ||
+ this.appMenuModel.items[i].items[0].label = "Enable DevMode"; | ||
+ } | ||
+ } | ||
+ } | ||
+ this.controller.modelChanged(this.appMenuModel); | ||
+ }.bind(this) | ||
+ }); | ||
+ }.bind(this) | ||
+ }); | ||
+ break; | ||
+ case 'rescanapps': | ||
+ this.controller.serviceRequest('com.palm.applicationManager', { | ||
+ method: 'rescan', | ||
+ parameters: {} | ||
+ }); | ||
+ break; | ||
+ case 'gc': | ||
+ this.controller.serviceRequest('palm://com.palm.lunastats',{ | ||
+ method: 'gc', //javascript garbage collect | ||
+ parameters: {} | ||
+ }); | ||
+ break; | ||
case Mojo.Menu.helpCmd: | ||
SystemManagerService.otherLauncherMenu(); | ||
ApplicationService.launch(this.helpInfo.id, this.helpInfo.params); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
index 6ad7ebd..eac15f3 100644 | ||
--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
@@ -24,10 +24,17 @@ function PageControls (controller){ | ||
icon: MenuData.NavigationMenu.Forward.icon, | ||
command: MenuData.NavigationMenu.Forward.command | ||
}; | ||
+ | ||
+ this._bookmarksModel = { | ||
+ disabled: false, | ||
+ label: MenuData.NavigationMenu.Bookmarks.label, | ||
+ icon: MenuData.NavigationMenu.Bookmarks.icon, | ||
+ command: MenuData.NavigationMenu.Bookmarks.command | ||
+ }; | ||
|
||
this._model = { | ||
visible: true, | ||
- items: [this._backModel, {}, {}] | ||
+ items: [this._backModel, this._bookmarksModel, {}, {}] | ||
}; | ||
|
||
this._currentPageModel = {}; | ||
@@ -65,6 +72,7 @@ PageControls.prototype={ | ||
var items = _.toArray(); | ||
this._backModel.disabled = !back; | ||
items.push(this._backModel); | ||
+ items.push(this._bookmarksModel); | ||
|
||
if (forward) { | ||
this._forwardModel.disabled = !forward; | ||
diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
index 007600b..df35933 100644 | ||
--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
@@ -12,6 +12,12 @@ MenuData.NavigationMenu = { | ||
command: 'back' | ||
}, | ||
|
||
+ Bookmarks: { | ||
+ label: $L('Bookmarks'), | ||
+ icon: 'bookmarks', | ||
+ command: 'show-bookmarks-cmd' | ||
+ }, | ||
+ | ||
Forward: { | ||
label: $L('Go forward'), | ||
icon: 'forward', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
index 388cffc..0d0c992 100644 | ||
--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js | ||
@@ -2180,6 +2180,10 @@ PageAssistant.prototype.handleCommand = function(event) { | ||
case MenuData.NavigationMenu.Back.command: | ||
this._goBack(); | ||
break; | ||
+ | ||
+ case MenuData.NavigationMenu.Bookmarks.command: | ||
+ this._showStartPage(); | ||
+ break; | ||
|
||
case MenuData.NavigationMenu.Forward.command: | ||
this._goForward(); | ||
diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
index 6ad7ebd..eac15f3 100644 | ||
--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js | ||
@@ -24,10 +24,17 @@ function PageControls (controller){ | ||
icon: MenuData.NavigationMenu.Forward.icon, | ||
command: MenuData.NavigationMenu.Forward.command | ||
}; | ||
+ | ||
+ this._bookmarksModel = { | ||
+ disabled: false, | ||
+ label: MenuData.NavigationMenu.Bookmarks.label, | ||
+ icon: MenuData.NavigationMenu.Bookmarks.icon, | ||
+ command: MenuData.NavigationMenu.Bookmarks.command | ||
+ }; | ||
|
||
this._model = { | ||
visible: true, | ||
- items: [this._backModel, {}, {}] | ||
+ items: [this._backModel, this._bookmarksModel, {}, {}] | ||
}; | ||
|
||
this._currentPageModel = {}; | ||
@@ -65,6 +72,7 @@ PageControls.prototype={ | ||
var items = _.toArray(); | ||
this._backModel.disabled = !back; | ||
items.push(this._backModel); | ||
+ items.push(this._bookmarksModel); | ||
|
||
if (forward) { | ||
this._forwardModel.disabled = !forward; | ||
diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
index 007600b..14e9ffb 100644 | ||
--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-navigationmenu.js | ||
@@ -12,6 +12,12 @@ MenuData.NavigationMenu = { | ||
command: 'back' | ||
}, | ||
|
||
+ Bookmarks: { | ||
+ label: $L('Bookmarks'), | ||
+ icon: 'bookmarks', | ||
+ command: 'bookmarks-page' | ||
+ }, | ||
+ | ||
Forward: { | ||
label: $L('Go forward'), | ||
icon: 'forward', |
Oops, something went wrong.