Bump V18.7

installer.sh

@@ -3,13 +3,13 @@
 
 ######### Only These two lines to edit with new version ######
 # next veriosn do not missing to add "" to version number
-version=18.6
+version=18.7
 description="
 What is NEW:
-- Small fix snr_db
+- Change the way the quick button is selected
 
 ما هو الجديد:
--  snr_db إصلاح صغير
+-  تغيير طريقة اختيار الزر السريع
 "
 ##############################################################
 

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/ar.py

@@ -101,3 +101,4 @@
 title97="BO-HLALA تصميم"
 title98=" __________________ 礑 بايكونات 礑 ___________________"
 title99=" __________________ 礑  تصاميم 礑 ____________________"
+title100="أضغط أي زر ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/ch.py

@@ -91,13 +91,14 @@
 title87="下一个"
 title88="增大和減小字體大小"
 title89="此選項用於增大和減小字體大小\n(需要) 如果添加新字体，请重新启动 GUI"
-title90="Searching of City name"
-title91="Choose from list of citys name"
-title92="Select search of city name"
-title93="Move < or > to select what method you want to use to search of your city name"
-title94="Transparent Picons BY (azl + Albahraniy)"
-title95="Show Plugin #press OK to change"
-title96="This option to show Plugin in any where you like"
-title97="BO-HLALA Style"
+title90="搜索城市名称"
+title91="从城市名称列表中选择"
+title92="选择搜索城市名称"
+title93="按 < 或 > 选择搜索城市名称的方式"
+title94="透明图标 BY (azl + Albahraniy)"
+title95="显示插件 #按OK更改"
+title96="此选项用于在您喜欢的任何地方显示插件"
+title97="BO-HLALA 风格"
 title98=" ___________________ 礑 Picons 礑 ___________________"
 title99=" ___________________ 礑  Style 礑 ____________________"
+title100="按任意键 ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/el.py

@@ -101,3 +101,4 @@
 title97="BO-HLALA Style"
 title98=" ___________________ 礑 Picons 礑 ___________________"
 title99=" ___________________ 礑  Style 礑 ____________________"
+title100="Πατήστε οποιοδήποτε πλήκτρο ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/en.py

@@ -40,7 +40,7 @@
 title36="This option for Enable or Disable Plugin"
 title37="Enable/Disable Check for update"
 title38="This option for Enable or Disable Check for update"
-title39="Select key"
+title39="Select key #press OK to change"
 title40="This option for choose Hot key to show RaedQuickSignal"
 title41="Enable/Disable DB Value"
 title42="This option for Enable or Disable DB tuner Value"
@@ -101,3 +101,4 @@
 title97="BO-HLALA Style"
 title98=" ___________________ 礑 Picons 礑 ___________________"
 title99=" ___________________ 礑  Style 礑 ____________________"
+title100="Press any key ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/it.py

@@ -91,13 +91,14 @@
 title87="PROSSIMI"
 title88="Aumenta e riduci la dimensione del carattere"
 title89="Questa opzione per aumentare e diminuire la dimensione del carattere\n(Necessario riavvio della GUI se nuovi caratteri aggiunti)"
-title90="Searching of City name"
-title91="Choose from list of citys name"
-title92="Select search of city name"
-title93="Move < or > to select what method you want to use to search of your city name"
-title94="Transparent Picons BY (azl + Albahraniy)"
-title95="Show Plugin #press OK to change"
-title96="This option to show Plugin in any where you like"
-title97="BO-HLALA Style"
+title90="Ricerca nome città"
+title91="Scegli dall'elenco dei nomi delle città"
+title92="Seleziona la ricerca del nome della città"
+title93="Premi < o > per selezionare il metodo di ricerca"
+title94="Picons trasparenti BY (azl + Albahraniy)"
+title95="Mostra Plugin #premi OK per cambiare"
+title96="Questa opzione mostra il Plugin dove preferisci"
+title97="Stile BO-HLALA"
 title98=" ___________________ 礑 Picons 礑 ___________________"
 title99=" ___________________ 礑  Style 礑 ____________________"
+title100="Premi qualsiasi tasto ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/ru.py

@@ -101,3 +101,4 @@
 title97="BO-HLALA Style"
 title98=" ___________________ 礑 Picons 礑 ___________________"
 title99=" ___________________ 礑  Style 礑 ____________________"
+title100="Нажмите любую клавишу ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/sk.py

@@ -101,3 +101,4 @@
 title97="BO-HLALA štýl"
 title98=" _________________ 礑 Piktogramy 礑 __________________"
 title99=" ___________________ 礑  Štýly 礑 ____________________"
+title100="Stlačte ľubovoľný kláves ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/language/tr.py

@@ -89,15 +89,16 @@
 title85="Ağ"
 title86="ŞİMDİ"
 title87="SONRAKİ"
-title88="Increase and Decrease font size"
-title89="This option for Increase and Decrease font size\n(NEED) do Restart GUI if add new fonts"
-title90="Searching of City name"
-title91="Choose from list of citys name"
-title92="Select search of city name"
-title93="Move < or > to select what method you want to use to search of your city name"
-title94="Transparent Picons BY (azl + Albahraniy)"
-title95="Show Plugin #press OK to change"
-title96="This option to show Plugin in any where you like"
-title97="BO-HLALA Style"
+title88="Yazı tipi boyutunu artır ve azalt"
+title89="Bu seçenek yazı tipi boyutunu artırmak ve azaltmak içindir\n(GEREKLİ) yeni yazı tipi eklenirse GUI'yi yeniden başlatın"
+title90="Şehir adı arama"
+title91="Şehir adları listesinden seçin"
+title92="Şehir adı aramasını seçin"
+title93="Arama yöntemini seçmek için < veya > tuşuna basın"
+title94="Şeffaf Picons BY (azl + Albahraniy)"
+title95="Eklentiyi Göster #değiştirmek için OK'a basın"
+title96="Bu seçenek Eklentiyi istediğiniz yerde gösterir"
+title97="BO-HLALA Stili"
 title98=" ___________________ 礑 Picons 礑 ___________________"
 title99=" ___________________ 礑  Style 礑 ____________________"
+title100="Herhangi bir tuşa basın ..."

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/plugin.py

@@ -10,7 +10,7 @@
 from Components.ConfigList import ConfigListScreen
 from Components.ActionMap import ActionMap
 from GlobalActions import globalActionMap
-from enigma import eTimer, getDesktop, gFont, addFont
+from enigma import eTimer, getDesktop, gFont, addFont, eActionMap, eRCInput
 from Plugins.Plugin import PluginDescriptor
 from Screens.Screen import Screen
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_LANGUAGE
@@ -863,7 +863,7 @@ def __init__(self, session):
                 {
                         "red": self.cancel,
                         "cancel": self.cancel,
-                        "green": self.save,
+                        "green": self.keySave,
                         "yellow": self.keyYellow,
                         "blue": self.keyBlue,
                         "ok": self.keyOk
@@ -1029,8 +1029,17 @@ def ShowsearchBarracuda(self, name):
                         self.session.open(SearchLocationMSN, name)
                 return
 
+        def keyCaptured(self, keyname=None):
+                if keyname:
+                        config.plugins.RaedQuickSignal.keyname.value = keyname
+                        config.plugins.RaedQuickSignal.keyname.save()
+                        self.keySave()
+                        self.createConfigList()
+
         def keyOk(self):
                 cur = self["config"].getCurrent()
+                if cur == self.set_keyname:
+                	self.session.openWithCallback(self.keyCaptured, KeyCaptureScreen)
                 if cur == self.set_city:
                         config.plugins.RaedQuickSignal.Searchmethod.save()
                         self.session.openWithCallback(self.ShowsearchBarracuda, VirtualKeyBoard, title=_('%s') % title16)
@@ -1067,21 +1076,25 @@ def citiesback(self,select):
                   config.plugins.RaedQuickSignal.city.setValue(weather_city)
                   self.createConfigList()
 
-        def save(self):
+        def keySave(self):
                 #if self["config"].isChanged():
                 system("rm -f /tmp/RaedQSweathermsn.xml")
                 if self.configChanged:
                         for x in self["config"].list:
                                 if len(x)>1:
                                         x[1].save()
                         configfile.save()
-                        # we can not use resolveFilename(SCOPE_PLUGINS) here the keymap.xml will be not writable 
-                        if exists('/usr/lib64/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/keymap.xml'):
-                            keyfile = open("/usr/lib64/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/keymap.xml", "w")
-                        else:
-                            keyfile = open("/usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/keymap.xml", "w")
-                        keyfile.write('<keymap>\n\t<map context="GlobalActions">\n\t\t<key id="%s" mapto="showRaedQuickSignal" flags="m" />\n\t</map>\n</keymap>' % config.plugins.RaedQuickSignal.keyname.value)
-                        keyfile.close()
+                        try:
+                                # we can not use resolveFilename(SCOPE_PLUGINS) here the keymap.xml will be not writable 
+                                if exists("/usr/lib64/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/keymap.xml"):
+                                        keymap_path = "/usr/lib64/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/keymap.xml"
+                                else:
+                                        keymap_path = "/usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/keymap.xml"
+                                keyfile = open(keymap_path, "w")
+                                keyfile.write('<keymap>\n\t<map context="GlobalActions">\n\t\t<key id="%s" mapto="showRaedQuickSignal" flags="m" />\n\t</map>\n</keymap>' % config.plugins.RaedQuickSignal.keyname.value)
+                                keyfile.close()
+                        except Exception as error:
+                                logdata("keySave keymap error:", error)
                         if not self.currkeyname_value == config.plugins.RaedQuickSignal.keyname.value \
                         or not self.fontsStyle_value == config.plugins.RaedQuickSignal.fontsStyle.value \
                         or not self.fontssize_value == config.plugins.RaedQuickSignal.fontsSize.value \
@@ -1107,6 +1120,73 @@ def restart(self,answer=None):
                 self.close(True)
 
 
+class KeyCaptureScreen(Screen):
+	skin = """<screen position="center,center" size="500,100" title="" flags="wfNoBorder">
+	<widget name="label" position="10,10" size="480,80" font="Regular;35" halign="center" valign="center"/>
+	</screen>"""
+	def __init__(self, session):
+		Screen.__init__(self, session)
+		self["label"] = Label(title100)
+		self.key_caught = False
+		self["actions"] = ActionMap(["SetupActions", "WizardActions", "MenuActions"], 
+			{
+				"cancel": self.close,
+				"ok": self.dummy,
+				"up": self.dummy,
+				"down": self.dummy,
+				"left": self.dummy,
+				"right": self.dummy
+			}, -100)
+		self.onFirstExecBegin.append(self.startHook)
+		self.onClose.append(self.stopHook)
+
+	def dummy(self):
+		return 1
+
+	def startHook(self):
+		try:
+			self.hook_slot = eActionMap.getInstance().bindAction('', -2147483648, self.keyPressed)
+		except:
+			pass
+
+	def stopHook(self):
+		try:
+			if hasattr(self, 'hook_slot'):
+				self.hook_slot = None
+				eActionMap.getInstance().unbindAction('', self.keyPressed)
+		except:
+			pass
+
+	def keyPressed(self, key, flag):
+		if flag == 1:
+			keyname = self.resolveKeyName(key)
+			if keyname:
+				if keyname in ("KEY_EXIT", "KEY_ESC"):
+					self.close(None)
+					return 1
+				if not self.key_caught:
+					self.key_caught = True
+					self.close(keyname)
+					return 1
+		return 1
+
+	def resolveKeyName(self, key):
+		try:
+			from keyids import KEYIDS
+			for name, k_id in KEYIDS.items():
+				if k_id == key:
+					return name
+		except:
+			pass
+		try:
+			rc = eRCInput.getInstance()
+			if hasattr(rc, 'getLabel'): return rc.getLabel(key)
+			if hasattr(rc, 'getKeyName'): return rc.getKeyName(key)
+		except:
+			pass
+		return None
+
+
 class SelectionScreen(Screen, ConfigListScreen):
 
         def __init__(self, session):
@@ -1159,7 +1239,7 @@ def __init__(self, session):
                         "ok": self.select_option,
                         "cancel": self.close,
                         "back": self.close,
-                        "green": self.save
+                        "green": self.keySave
                 }, -2)  # Higher priority to ensure OK is captured (DreamOS images need it)
 
                 self.onLayoutFinish.append(self.layoutFinished)
@@ -1195,7 +1275,7 @@ def select_option(self):
                         self.selection_states[key] = not self.selection_states[key]
                         self.updateList()
 
-        def save(self):
+        def keySave(self):
                 # Save all selected options as comma-separated string
                 selected_options = [key for key, state in self.selection_states.items() if state]
                 new_value = ','.join(selected_options)

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/configs.py

@@ -83,26 +83,7 @@ def trace_error():
 	])
 
 ############# keymap
-config.plugins.RaedQuickSignal.keyname = ConfigSelection(default = "KEY_TEXT", choices = [
-	("KEY_TEXT", _("TEXT")),
-	("KEY_TV", _("TV")),
-	("KEY_RADIO", _("RADIO")),
-	("KEY_OK", _("OK")),
-	("KEY_HELP", _("HELP")),
-	("KEY_INFO", _("INFO")),
-	("KEY_RED", _("RED")),
-	("KEY_GREEN", _("GREEN")),
-	("KEY_BLUE", _("BLUE")),
-	("KEY_VIDEO", _("PVR")),
-	("KEY_HOMEPAGE", _("HOMEPAGE")),
-	("KEY_0", _("0")),
-	("KEY_1", _("1")),
-	("KEY_2", _("2")),
-	("KEY_3", _("3")),
-	("KEY_F1", _("f1")),
-	("KEY_F2", _("f2")),
-	("KEY_F3", _("f3"))
-	])
+config.plugins.RaedQuickSignal.keyname = ConfigText(default="KEY_TEXT")
 
 ############# style of skin
 config.plugins.RaedQuickSignal.style = ConfigSelection(default = "AGC1", choices = [

usr/lib/enigma2/python/Plugins/Extensions/RaedQuickSignal/tools/version

@@ -1,4 +1,4 @@
 # RAED(fairbird)
 # Support (www.tunisia-sat.com)
 
-version=18.6
+version=18.7