Merge commit 'dm/experimental' into test branch

Conflicts:
	lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
	lib/python/Screens/SleepTimerEdit.py

diff --cc RecordTimer.py
Simple merge

diff --cc data/keymap.xml
Simple merge

diff --cc lib/dvb/dvb.cpp
index fbca6f3,6f9a67f..61924ad
mode 100755,100644..100755
--- 1/lib/dvb/dvb.cpp
--- 2/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp

diff --cc lib/dvb/frontend.cpp
index 013e23b,b5de46c..47e1ab5
mode 100755,100644..100755
--- 1/lib/dvb/frontend.cpp
--- 2/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp

diff --cc lib/python/Plugins/Extensions/DVDBurn/Process.py
index f1f5e73,a928ae2..816551c
mode 100755,100644..100755
--- 1/lib/python/Plugins/Extensions/DVDBurn/Process.py
--- 2/lib/python/Plugins/Extensions/DVDBurn/Process.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/Process.py

diff --cc lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 13599a0,6ff1c5a..75fba2d
mode 100755,100644..100644
--- 1/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
--- 2/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py

diff --cc lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
index 38ed1d2,b345428..5f2f82a
mode 100755,100644..100644
--- 1/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py

diff --cc lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
index 6eb09f3,ab74de4..25a06eb
mode 100755,100644..100644
--- 1/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/CrashlogAutoSubmit/plugin.py

diff --cc lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
index b0c52c8,22e5436..8f9757f
mode 100755,100644..100755
--- 1/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py

diff --cc lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py
Simple merge

diff --cc lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
index b968d79,b3a0a17..dce5179
mode 100755,100644..100644
--- 1/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
@@@ -921,17 -923,20 +923,20 @@@ class PluginManager(Screen, DreamInfoHa
                        self.close()
  
        def runExecuteFinished(self):
-               self.session.openWithCallback(self.ExecuteReboot, MessageBox, _("Install or remove finished.") +" "+_("Do you want to reboot your STB?"), MessageBox.TYPE_YESNO)
- 
-       def ExecuteReboot(self, result):
-               if result is None:
-                       return
-               if result is False:
-                       self.reloadPluginlist()
+               self.reloadPluginlist()
+               restartRequired = plugins.restartRequired
+               if restartRequired:
 -                      self.session.openWithCallback(self.ExecuteReboot, MessageBox, _("Install or remove finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
++                      self.session.openWithCallback(self.ExecuteReboot, MessageBox, _("Install or remove finished.") +" "+_("Do you want to reboot your STB?"), MessageBox.TYPE_YESNO)
+               else:
                        self.selectedFiles = []
                        self.detailsClosed(True)
+ 
+       def ExecuteReboot(self, result):
                if result:
                        quitMainloop(3)
+               else:
+                       self.selectedFiles = []
+                       self.detailsClosed(True)
  
        def reloadPluginlist(self):
                plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
@@@ -1287,15 -1292,17 +1292,17 @@@ class PluginDetails(Screen, DreamInfoHa
                        self.session.openWithCallback(self.runUpgradeFinished, Ipkg, cmdList = self.cmdList)
  
        def runUpgradeFinished(self):
-               self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Installation finished.") +" "+_("Do you want to reboot your STB?"), MessageBox.TYPE_YESNO)
- 
-       def UpgradeReboot(self, result):
-               if result is None:
-                       return
-               if result is False:
+               self.reloadPluginlist()
+               restartRequired = plugins.restartRequired
+               if restartRequired:
 -                      self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Installation finished.") +" "+_("Do you want to reboot your Dreambox?"), MessageBox.TYPE_YESNO)
++                      self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Installation finished.") +" "+_("Do you want to reboot your STB?"), MessageBox.TYPE_YESNO)
+               else:
                        self.close(True)
+       def UpgradeReboot(self, result):
                if result:
                        quitMainloop(3)
+               else:
+                       self.close(True)
  
        def runRemove(self, result):
                if result:
@@@ -1375,7 -1374,7 +1374,7 @@@ class UpdatePlugin(Screen)
                                self.updating = True
                                self.activityTimer.start(100, False)
                                self.package.setText(_("Package list update"))
--                              self.status.setText(_("Upgrading Dreambox... Please wait"))
++                              self.status.setText(_("Upgrading STB... Please wait"))
                                self.ipkg.startCmd(IpkgComponent.CMD_UPDATE)
                        else:
                                self.package.setText(_("Your network is not working. Please try again."))

diff --cc lib/python/Plugins/SystemPlugins/Videomode/plugin.py
index 085f2e6,7396534..e7805fc
mode 100755,100644..100644
--- 1/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
--- 2/lib/python/Plugins/SystemPlugins/Videomode/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/plugin.py

diff --cc lib/python/Screens/AudioSelection.py
Simple merge

diff --cc lib/python/Screens/ChannelSelection.py
index c07e349,912d678..912d678
mode 100755,100644..100755
--- 1/lib/python/Screens/ChannelSelection.py
--- 2/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py

diff --cc lib/python/Screens/InfoBarGenerics.py
index 0432930,1a7d145..d55e661
mode 100755,100644..100755
--- 1/lib/python/Screens/InfoBarGenerics.py
--- 2/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py

diff --cc lib/python/Screens/PluginBrowser.py
Simple merge

diff --cc lib/python/Screens/SleepTimerEdit.py
index e5c9260,61440d4..1305b62
mode 100755,100644..100755
--- 1/lib/python/Screens/SleepTimerEdit.py
--- 2/lib/python/Screens/SleepTimerEdit.py
+++ b/lib/python/Screens/SleepTimerEdit.py
@@@ -99,17 -99,13 +99,18 @@@ class SleepTimerEdit(Screen)
  
        def select(self):
                if self.status:
 -                      time = int(self["input"].getText())
 -                      config.SleepTimer.defaulttime.setValue(time)
 -                      config.SleepTimer.defaulttime.save()
 -                      config.SleepTimer.action.save()
 -                      config.SleepTimer.ask.save()
 -                      self.session.nav.SleepTimer.setSleepTime(time)
 -                      self.session.openWithCallback(self.close, MessageBox, _("The sleep timer has been activated."), MessageBox.TYPE_INFO)
 +#     ikseong
 +                      if self["input"].getText()=='':
 +                              self.session.nav.SleepTimer.clear()
 +                              self.session.openWithCallback(self.close, MessageBox, _("The sleep timer is invalid."), MessageBox.TYPE_INFO)
 +                      else:                           
 +                              time = int(self["input"].getText())
 +                              config.SleepTimer.defaulttime.setValue(time)
 +                              config.SleepTimer.defaulttime.save()
 +                              config.SleepTimer.action.save()
++                              config.SleepTimer.ask.save()
 +                              self.session.nav.SleepTimer.setSleepTime(time)
 +                              self.session.openWithCallback(self.close, MessageBox, _("The sleep timer has been activated."), MessageBox.TYPE_INFO)
                else:
                        self.session.nav.SleepTimer.clear()
                        self.session.openWithCallback(self.close, MessageBox, _("The sleep timer has been disabled."), MessageBox.TYPE_INFO)

diff --cc main/bsod.cpp
Simple merge