Merge OpenViX

data/setup.xml

@@ -472,6 +472,7 @@
 	<setup key="pluginbrowsersetup" title="Plugin browser settings">
 		<item level="2" text="Show translation packages" description="If set to 'yes' it will show the 'PO' packages in browser.">config.pluginbrowser.po</item>
 		<item level="2" text="Show source packages" description="If set to 'yes' it will show the 'SRC' packages in browser.">config.pluginbrowser.src</item>
+		<item level="1" text="Allow unstable (experimental) feeds" description="When enabled the feeds and software updates may contain unstable experimental versions. Enable this at your own risk.">config.softwareupdate.updatebeta</item>
 	</setup>
 	<setup key="wizardoptions" title="Common options">
 		<item level="0" text="Picons: Show in channel list" description="Configure if service picons will be shown in the channel selection list.">config.usage.service_icon_enable</item>

lib/python/Components/Renderer/AnalogClockLCD.py

@@ -58,8 +58,8 @@ def calc(self, w, r, m, m1):
 	def hand(self, opt):
 		width = self.positionwidth
 		height = self.positionheight
-		r = (width / 2)
-		r1 = (height / 2)
+		r = (width // 2)
+		r1 = (height // 2)
 		l = self.linesize
 		if opt == 'sec':
 			l = self.linesize

lib/python/Screens/PluginBrowser.py

@@ -510,7 +510,7 @@ def startRun(self):
 				self["text"].setText(_("WARNING: feeds may be unstable.") + '\n' + _("Downloading plugin information. Please wait..."))
 				self.container.execute(self.ipkg + " update")
 			elif config.softwareupdate.updateisunstable.value == '1' and not config.softwareupdate.updatebeta.value:
-				self["text"].setText(_("Sorry feeds seem be in an unstable state, if you wish to use them please enable 'Allow unstable (experimental) updates' in \"Software update settings\"."))
+				self["text"].setText(_("UNSTABLE: The feeds currently contain unstable experimental items. If you wish to use these, enable 'Allow unstable (experimental) updates' in the Plugin Browser settings menu."))
 			else:
 				self.container.execute(self.ipkg + " update")
 		elif self.type == self.REMOVE:

lib/python/Screens/SoftwareUpdate.py

@@ -179,7 +179,7 @@ def checkNetworkState(self):
 				else:
 					self.startCheck()
 			else:
-				self.session.openWithCallback(self.close, MessageBox, _("Sorry the feeds seem to be in an unstable state, if you wish to use them please enable 'Allow unstable (experimental) updates' in \"Software update settings\"."), type=MessageBox.TYPE_INFO, timeout=10, close_on_any_key=True)
+				self.session.openWithCallback(self.statusMessageCallback, MessageBox, _("UNSTABLE: The feeds currently contain unstable experimental updates. You can continue at your own risk but doing so may render your %s %s unusable and in need of a complete reflash.\n\nAre you sure you want to continue?") % (getMachineBrand(), getMachineName()), type=MessageBox.TYPE_YESNO, default=False)
 
 	def statusMessageCallback(self, answer):
 		if answer:
@@ -273,7 +273,7 @@ def ipkgCallback(self, event, param):
 				elif config.softwareupdate.updateisunstable.value == '0':
 					self.total_packages = len(self.ipkg.getFetchedList())
 					message = _("Do you want to update your %s %s ?") % (getMachineBrand(), getMachineName()) + "\n(" + (ngettext("%s updated package available", "%s updated packages available", self.total_packages) % self.total_packages) + ")"
-				if self.total_packages > 150:
+				if self.total_packages is not None and self.total_packages > 150:
 					message += " " + _("Reflash recommended!")
 				if self.total_packages:
 					global ocram