Use windowTitle parameter instead of setTitle after init of MessageBox

Author: jbleyel

lib/python/Plugins/Extensions/AtileHD/plugin.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
-#This plugin is free software, you are allowed to
-#modify it (if you keep the license),
-#but you are not allowed to distribute/publish
-#it without source code (this version and your modifications).
-#This means you also have to distribute
-#source code of your modifications.
+# This plugin is free software, you are allowed to
+# modify it (if you keep the license),
+# but you are not allowed to distribute/publish
+# it without source code (this version and your modifications).
+# This means you also have to distribute
+# source code of your modifications.
 from os import listdir, readlink, remove, rename, symlink, chdir, makedirs, mkdir
 from os.path import basename, exists, isdir, islink, realpath
 from shutil import rmtree
@@ -543,8 +543,7 @@ def AtileHDScreenCB(self):
 		self["config"].setCurrentIndex(0)
 
 	def restartGUI(self):
-		restartbox = self.session.openWithCallback(self.restartGUIcb, MessageBox, _("Restart necessary, restart GUI now?"), MessageBox.TYPE_YESNO)
-		restartbox.setTitle(_("Message"))
+		self.session.openWithCallback(self.restartGUIcb, MessageBox, _("Restart necessary, restart GUI now?"), MessageBox.TYPE_YESNO, windowTitle=_("Message"))
 
 	def about(self):
 		self.session.open(AtileHD_About)

lib/python/Plugins/SystemPlugins/SABnzbdSetup/plugin.py

@@ -59,8 +59,7 @@ def InstalldataAvail(self, str, retval, extra_args):
 		if isinstance(str, bytes):
 			str = str.decode(encoding='utf-8', errors='strict')
 		if not str:
-			restartbox = self.session.openWithCallback(self.InstallPackage, MessageBox, _('Your %s %s will be restarted after the installation of service.\n\nDo you want to install now ?') % getBoxDisplayName(), MessageBox.TYPE_YESNO)
-			restartbox.setTitle(_('Ready to install "%s"?') % self.service_name)
+			self.session.openWithCallback(self.InstallPackage, MessageBox, _('Your %s %s will be restarted after the installation of service.\n\nDo you want to install now ?') % getBoxDisplayName(), MessageBox.TYPE_YESNO, windowTitle=_('Ready to install "%s"?') % self.service_name)
 		else:
 			self.updateService()
 
@@ -72,8 +71,7 @@ def InstallPackage(self, val):
 
 	def doInstall(self, callback, pkgname):
 		self["actions"].setEnabled(False)
-		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO)
-		self.message.setTitle(_('Installing Service'))
+		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO, windowTitle=_("Installing Service"))
 		self.Console.ePopen('/usr/bin/opkg install ' + pkgname + ' sync', callback)
 
 	def installComplete(self, result=None, retval=None, extra_args=None):
@@ -88,8 +86,7 @@ def UninstalldataAvail(self, str, retval, extra_args):
 		if isinstance(str, bytes):
 			str = str.decode(encoding='utf-8', errors='strict')
 		if str:
-			restartbox = self.session.openWithCallback(self.RemovePackage, MessageBox, _("Your %s %s will be restarted after the removal of service\nDo you want to remove now?") % getBoxDisplayName(), MessageBox.TYPE_YESNO)
-			restartbox.setTitle(_("Ready to remove \"%s\"?") % self.service_name)
+			self.session.openWithCallback(self.RemovePackage, MessageBox, _("Your %s %s will be restarted after the removal of service\nDo you want to remove now?") % getBoxDisplayName(), MessageBox.TYPE_YESNO, windowTitle=_("Ready to remove \"%s\"?") % self.service_name)
 		else:
 			self.updateService()
 
@@ -99,8 +96,7 @@ def RemovePackage(self, val):
 
 	def doRemove(self, callback, pkgname):
 		self["actions"].setEnabled(False)
-		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO)
-		self.message.setTitle(_('Removing Service'))
+		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO, windowTitle=_("Removing Service"))
 		self.Console.ePopen('/usr/bin/opkg remove ' + pkgname + ' --force-remove --autoremove sync', callback)
 
 	def removeComplete(self, result=None, retval=None, extra_args=None):

lib/python/Screens/CronTimer.py

@@ -67,8 +67,7 @@ def installCheck(self):
 
 	def checkNetworkState(self, result, retval, extra_args):
 		if not result:
-			self.feedscheck = self.session.open(MessageBox, _("Please wait whilst feeds state is checked."), MessageBox.TYPE_INFO, enable_input=False)
-			self.feedscheck.setTitle(_("Checking Feeds"))
+			self.feedscheck = self.session.open(MessageBox, _("Please wait whilst feeds state is checked."), MessageBox.TYPE_INFO, enable_input=False, windowTitle=_("Checking Feeds"))
 			self.CheckConsole = Console()
 			self.CheckConsole.ePopen([OPKGCMD, OPKGCMD, "update"], self.checkNetworkStateFinished)
 		else:
@@ -94,8 +93,7 @@ def installPackageFailed(self, val):
 		self.close()
 
 	def doInstall(self, callback, pkgname):
-		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO, enable_input=False)
-		self.message.setTitle(_("Installing Service"))
+		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO, enable_input=False, windowTitle=_("Installing Service"))
 		self.callOpkg(["install", pkgname], callback)
 
 	def installComplete(self, result=None, retval=None, extra_args=None):
@@ -122,8 +120,7 @@ def removePackage(self, val):
 			self.close()
 
 	def doRemove(self, callback, pkgname):
-		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO, enable_input=False)
-		self.message.setTitle(_("Removing Service"))
+		self.message = self.session.open(MessageBox, _("Please wait..."), MessageBox.TYPE_INFO, enable_input=False, windowTitle=_("Removing Service"))
 		self.callOpkg(["--force-remove", "--autoremove", "remove", pkgname], callback)
 
 	def removeComplete(self, result=None, retval=None, extra_args=None):

lib/python/Screens/LogManager.py

@@ -120,7 +120,7 @@ def JobTrash(self):
 		print("[LogManager] probing folders")
 
 		if (datetime.now().hour == 3) or (time() - config.crash.lastfulljobtrashtime.value > 3600 * 24):
-			#full JobTrash (in all potential log file dirs) between 03:00 and 04:00 AM / every 24h
+			# full JobTrash (in all potential log file dirs) between 03:00 and 04:00 AM / every 24h
 			config.crash.lastfulljobtrashtime.setValue(int(time()))
 			config.crash.lastfulljobtrashtime.save()
 			configfile.save()
@@ -129,7 +129,7 @@ def JobTrash(self):
 					matches.append(join(mount, 'logs'))
 			matches.append('/home/root/logs')
 		else:
-			#small JobTrash (in selected log file dir only) twice a day
+			# small JobTrash (in selected log file dir only) twice a day
 			matches.append(config.crash.debug_path.value)
 
 		print("[LogManager] found following log's: %s" % matches)
@@ -145,9 +145,9 @@ def JobTrash(self):
 						try:
 							fn = join(root, name)
 							st = stat(fn)
-							#print "Logname: %s" % fn
-							#print "Last created: %s" % ctime(st.st_ctime)
-							#print "Last modified: %s" % ctime(st.st_mtime)
+							# print "Logname: %s" % fn
+							# print "Last created: %s" % ctime(st.st_ctime)
+							# print "Last modified: %s" % ctime(st.st_mtime)
 							if st.st_mtime < ctimeLimit:
 								print("[LogManager] %s: Too old: %s" % (str(fn), ctime(st.st_mtime)))
 								eBackgroundFileEraser.getInstance().erase(fn)
@@ -292,12 +292,10 @@ def deletelog(self):
 		self.selectedFiles = self["list"].getSelectedList()
 		if self.selectedFiles:
 			message = _("Do you want to delete all selected files:\n(choose 'No' to only delete the currently selected file.)")
-			ybox = self.session.openWithCallback(self.doDelete1, MessageBox, message, MessageBox.TYPE_YESNO)
-			ybox.setTitle(_("Delete Confirmation"))
+			self.session.openWithCallback(self.doDelete1, MessageBox, message, MessageBox.TYPE_YESNO, windowTitle=_("Delete Confirmation"))
 		elif self.sel:
 			message = _("Are you sure you want to delete this log:\n") + str(self.sel[0])
-			ybox = self.session.openWithCallback(self.doDelete3, MessageBox, message, MessageBox.TYPE_YESNO)
-			ybox.setTitle(_("Delete Confirmation"))
+			self.session.openWithCallback(self.doDelete3, MessageBox, message, MessageBox.TYPE_YESNO, windowTitle=_("Delete Confirmation"))
 		else:
 			self.session.open(MessageBox, _("You have selected no logs to delete."), MessageBox.TYPE_INFO, timeout=10)
 
@@ -308,12 +306,10 @@ def doDelete1(self, answer):
 		if self.sel is not None:
 			if answer is True:
 				message = _("Are you sure you want to delete all selected logs:\n") + self.selectedFiles
-				ybox = self.session.openWithCallback(self.doDelete2, MessageBox, message, MessageBox.TYPE_YESNO)
-				ybox.setTitle(_("Delete Confirmation"))
+				self.session.openWithCallback(self.doDelete2, MessageBox, message, MessageBox.TYPE_YESNO, windowTitle=_("Delete Confirmation"))
 			else:
 				message = _("Are you sure you want to delete this log:\n") + str(self.sel[0])
-				ybox = self.session.openWithCallback(self.doDelete3, MessageBox, message, MessageBox.TYPE_YESNO)
-				ybox.setTitle(_("Delete Confirmation"))
+				self.session.openWithCallback(self.doDelete3, MessageBox, message, MessageBox.TYPE_YESNO, windowTitle=_("Delete Confirmation"))
 
 	def doDelete2(self, answer):
 		if answer is True:

lib/python/Screens/ScriptRunner.py

@@ -56,8 +56,7 @@ def runscript(self):
 		self.sel = self['list'].getCurrent()
 		if self.sel:
 			message = _("Are you ready to run the script?")
-			ybox = self.session.openWithCallback(self.Run, MessageBox, message, MessageBox.TYPE_YESNO)
-			ybox.setTitle(_("Run Confirmation"))
+			self.session.openWithCallback(self.Run, MessageBox, message, MessageBox.TYPE_YESNO, windowTitle=_("Run Confirmation"))
 		else:
 			self.session.open(MessageBox, _("You have no script to run."), MessageBox.TYPE_INFO, timeout=10)
 

lib/python/Screens/SwapManager.py

@@ -250,8 +250,7 @@ def actDeact(self):
 				if self.swapPlace:
 					self.Console.ePopen(f"swapon {self.swapPlace}", self.updateSwap)
 				else:
-					mybox = self.session.open(MessageBox, _("Swap File not found. You have to create the file before to activate."), MessageBox.TYPE_INFO)
-					mybox.setTitle(_("Info"))
+					self.session.open(MessageBox, _("Swap File not found. You have to create the file before to activate."), MessageBox.TYPE_INFO, windowTitle=_("Info"))
 			else:
 				self.Console.ePopen("swapon " + self.swapPlace, self.updateSwap)
 
@@ -311,6 +310,5 @@ def autoSsWap(self):
 			config.usage.swapautostart.save()
 			configfile.save()
 		else:
-			mybox = self.session.open(MessageBox, _("You have to create a Swap File before to activate the autostart."), MessageBox.TYPE_INFO)
-			mybox.setTitle(_("Info"))
+			self.session.open(MessageBox, _("You have to create a Swap File before to activate the autostart."), MessageBox.TYPE_INFO, windowTitle=_("Info"))
 		self.updateSwap()