new patches
[webos-internals:modifications.git] / notifications / notifications-advanced-reset-options---de.patch
1 diff --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
2 index 786f7ae..5a96fbd 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 @@ -2634,7 +2634,7 @@ showPowerOffAlert: function() {
6                     var f = function(stageController){
7                       stageController.pushScene('poweroffalert',this);
8                     }.bind(this);
9 -                   var params = {name: 'PowerOffAlert', height: 175,lightweight:true};                     
10 +                   var params = {name: 'PowerOffAlert', height: 345,lightweight:true};
11                     appController.createStageWithCallback(params,f,'popupalert');
12          }
13         //Close the Storage Alert and create a USB dashboard.
14 diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/poweroffalert-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/poweroffalert-assistant.js
15 index 05ea355..96a4e70 100644
16 --- a/usr/lib/luna/system/luna-systemui/app/controllers/poweroffalert-assistant.js
17 +++ b/usr/lib/luna/system/luna-systemui/app/controllers/poweroffalert-assistant.js
18 @@ -7,7 +7,10 @@ var PoweroffalertAssistant = Class.create({
19      
20      setup: function() {                
21                 var flightMode = this.flightMode.bindAsEventListener(this);
22 -               var powerOff = this.powerOff.bindAsEventListener(this);
23 +               var java = this.java.bindAsEventListener(this);
24 +               var luna = this.luna.bindAsEventListener(this);
25 +               var restart = this.restart.bindAsEventListener(this);
26 +               var shutdown = this.shutdown.bindAsEventListener(this);
27                 var cancel = this.cancel.bindAsEventListener(this);
28                 var launchAirplaneModeHelp = this.launchAirplaneModeHelp.bindAsEventListener(this);
29                 this.flightMode = this.barAssistant.getAirplaneMode();
30 @@ -16,8 +19,11 @@ var PoweroffalertAssistant = Class.create({
31                 else
32                         this.controller.get('flightmode').innerHTML = "<div class='info-icon' id='airplaneInfo' x-mojo-touch-feedback='immediate'></div>" + $L('Airplane Mode');
33                         
34 -               this.controller.get('poweroff').addEventListener(Mojo.Event.tap, powerOff);
35                 this.controller.get('flightmode').addEventListener(Mojo.Event.tap, flightMode);
36 +               this.controller.get('java').addEventListener(Mojo.Event.tap, java);
37 +               this.controller.get('luna').addEventListener(Mojo.Event.tap, luna);
38 +               this.controller.get('restart').addEventListener(Mojo.Event.tap, restart);
39 +               this.controller.get('shutdown').addEventListener(Mojo.Event.tap, shutdown);
40                 this.controller.get('cancel').addEventListener(Mojo.Event.tap, cancel);
41                 this.controller.get('airplaneInfo').addEventListener(Mojo.Event.tap, launchAirplaneModeHelp);
42                 
43 @@ -46,6 +52,32 @@ var PoweroffalertAssistant = Class.create({
44                 this.controller.window.close();
45         },
46         
47 +       java: function() {
48 +               this.controller.serviceRequest('palm://ca.canucksoftware.systoolsmgr', {
49 +                       method: "javaRestart",
50 +                       parameters: {}
51 +               });
52 +               this.controller.window.close();
53 +       },
54 +       
55 +       luna: function() {
56 +               this.controller.serviceRequest('palm://ca.canucksoftware.systoolsmgr', {
57 +                       method: "lunaRestart",
58 +                       parameters: {}
59 +               });
60 +               this.controller.window.close();
61 +       },
62 +       
63 +       restart: function() {
64 +               this.barAssistant.machineReboot("Restart selected by User in PowerOff Dialog");
65 +               this.controller.window.close();
66 +       },
67 +       
68 +       shutdown:function() {
69 +               this.barAssistant.machineOffNow("Shutdown request by User");
70 +               this.controller.window.close();
71 +       },
72 +       
73         flightMode:function(event) {
74                 
75                 var targetId = event.target.id;
76 diff --git a/usr/lib/luna/system/luna-systemui/resources/de_de/views/poweroffalert/poweroffalert-scene.html b/usr/lib/luna/system/luna-systemui/resources/de_de/views/poweroffalert/poweroffalert-scene.html
77 index 5303b58..17f6cdb 100644
78 --- a/usr/lib/luna/system/luna-systemui/resources/de_de/views/poweroffalert/poweroffalert-scene.html
79 +++ b/usr/lib/luna/system/luna-systemui/resources/de_de/views/poweroffalert/poweroffalert-scene.html
80 @@ -1,5 +1,8 @@
81  <div class="system-notification power-off">
82                 <div class="palm-notification-button affirmative" x-mojo-tap-highlight="immediate" id='flightmode'></div>
83 -               <div class="palm-notification-button negative" x-mojo-tap-highlight="immediate" id='poweroff'>Ausschalten</div>
84 +               <div class="palm-notification-button alternate" x-mojo-tap-highlight="immediate" id='java' x-mojo-loc=''>Java-Services Neustart</div>
85 +               <div class="palm-notification-button alternate" x-mojo-tap-highlight="immediate" id='luna' x-mojo-loc=''>Luna Neustart</div>
86 +               <div class="palm-notification-button alternate" x-mojo-tap-highlight="immediate" id='restart' x-mojo-loc=''>Gerät Neustart</div>
87 +               <div class="palm-notification-button negative" x-mojo-tap-highlight="immediate" id='shutdown' x-mojo-loc=''>Ausschalten</div>
88                 <div class="palm-notification-button" x-mojo-tap-highlight="immediate" id='cancel'>Abbrechen</div>
89  </div>