Author: adrian
Date: Sat Jan 19 07:20:39 2008
New Revision: 1509
URL: http://svn.slimdevices.com?rev=1509&root=Jive&view=rev
Log:
Bug: 6655
Description: display restarting message before restarting in applet installer
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/strings.txt
Modified:
trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua?rev=1509&root=Jive&r1=1508&r2=1509&view=diff
==============================================================================
---
trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
(original)
+++
trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/SetupAppletInstallerApplet.lua
Sat Jan 19 07:20:39 2008
@@ -187,7 +187,7 @@
self.task = Task("applet download", self, function()
self:_download(appletdir)
-
self:_finished()
+
self:_finished(label)
end)
self.task:addTask()
@@ -223,7 +223,7 @@
-- called when download complete
-function _finished(self)
+function _finished(self, label)
-- save new version numbers
for applet, appletdata in pairs(self.todownload) do
self:getSettings()[applet] = appletdata.ver
@@ -233,13 +233,19 @@
-- FIXME: ideally we do something here to reload all applets or restart
the app itself rather than rebooting
if lfs.attributes("/bin/busybox") ~= nil then
+ label:setValue(self:string("RESTART_JIVE"))
+ -- two second delay
+ local t = Framework:getTicks()
+ while (t + 2000) > Framework:getTicks() do
+ Task:yield(true)
+ end
log:warn("RESTARTING JIVE...")
os.execute("/bin/busybox reboot -f")
else
self.animatewindow:hide()
self.window:removeWidget(self.menu)
self.window:removeWidget(self.help)
- self.window:addWidget(Textarea("help", self:string("RESTART")))
+ self.window:addWidget(Textarea("help",
self:string("RESTART_APP")))
end
end
Modified: trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/strings.txt
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/strings.txt?rev=1509&root=Jive&r1=1508&r2=1509&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/strings.txt
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SetupAppletInstaller/strings.txt Sat
Jan 19 07:20:39 2008
@@ -31,17 +31,25 @@
NL Kies de applets die vanuit SqueezeCenter geïnstalleerd moeten
worden en selecteer dan Installeren
DOWNLOADING
- DE Applets herunterladen
- EN Downloading Applets
- ES Descargando subprogramas
- FR Téléchargement des applets
- IT Download delle applet
- NL Applets worden gedownload
+ DE \nApplets herunterladen
+ EN \nDownloading Applets
+ ES \nDescargando subprogramas
+ FR \nTéléchargement des applets
+ IT \nDownload delle applet
+ NL \nApplets worden gedownload
-RESTART
+RESTART_APP
DE Zum Nutzen neuer Applets Anwendung neu starten
EN Restart application to make use of new applets
ES Reiniciar aplicación para utilizar nuevos subprogramas
FR Redémarrez l'application pour utiliser les nouveaux applets.
IT Riavviare l'applicazione per usare le nuove applet
NL Start de toepassing opnieuw om nieuwe applets te kunnen
gebruiken
+
+RESTART_JIVE
+ DE \nNeustart
+ EN \nRestarting
+ ES \nReiniciando
+ FR \nRedémarrage
+ IT \nRiavvio
+ NL \nBezig met opnieuw starten
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
