clockworkpi/launcher
1
0
Fork 0
mirror of https://github.com/clockworkpi/launcher.git synced 2025-12-15 03:08:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #123 from cuu/master

Browse Source 
add OnKbdReturnBackCb on wifi_list
This commit is contained in:
GNU 2018-12-09 23:15:59 +08:00 committed by GitHub
commit 65138e7586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Menu/GameShell/10_Settings/Wifi/__init__.py
View File

@ -13,7 +13,8 @@ except:
def Init(main_screen): def Init(main_screen):
pages.InitPasswordPage(main_screen) pages.InitPasswordPage(main_screen)
pages.InitScanPage(main_screen) pages.InitScanPage(main_screen)
myvars.PasswordPage._Caller = myvars.ScanPage
def API(main_screen): def API(main_screen):
if main_screen != None: if main_screen != None:

7
Menu/GameShell/10_Settings/Wifi/wifi_list.py
View File

@ -550,7 +550,7 @@ class WifiList(Page):
results = [] results = []
activeID = -1 activeID = -1
for x,enc_type in enumerate(self._EncMethods): for x,enc_type in enumerate(self._EncMethods):
if enc_type["type"] == self._Wireless.GetWirelessProperty(network_id,"encryption_method"): if enc_type["type"] == self._Wireless.GetWirelessProperty(network_id,"enctype"):
activeID = x activeID = x
break break
@ -608,10 +608,13 @@ class WifiList(Page):
self._Screen.Draw() self._Screen.Draw()
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
def OnReturnBackCb(self): def OnKbdReturnBackCb(self):
password_inputed = "".join(myvars.PasswordPage._Textarea._MyWords) password_inputed = "".join(myvars.PasswordPage._Textarea._MyWords)
if is_wifi_connected_now() == False: if is_wifi_connected_now() == False:
self.ConfigWireless(password_inputed) self.ConfigWireless(password_inputed)
def OnReturnBackCb(self):
pass
def KeyDown(self,event): def KeyDown(self,event):

6
sys.py/UI/keyboard.py
View File

@ -74,6 +74,7 @@ class Keyboard(Page):
_FootMsg = ["Nav.","ABC","Done","Backspace","Enter"] _FootMsg = ["Nav.","ABC","Done","Backspace","Enter"]
_RowIndex = 0 _RowIndex = 0
_Caller = None
def __init__(self): def __init__(self):
self._Secs = {} self._Secs = {}
@ -317,6 +318,11 @@ class Keyboard(Page):
print("".join(self._Textarea._MyWords)) print("".join(self._Textarea._MyWords))
self.ReturnToUpLevelPage() self.ReturnToUpLevelPage()
self._Screen.SwapAndShow() self._Screen.SwapAndShow()
if self._Caller != None:
on_kbd_return_back_cb = getattr(self._Caller,"OnKbdReturnBackCb",None)
if on_kbd_return_back_cb != None:
if callable( on_kbd_return_back_cb ):
self._Caller.OnKbdReturnBackCb()
#Uplevel page invokes OnReturnBackCb,eg: ConfigWireless #Uplevel page invokes OnReturnBackCb,eg: ConfigWireless
if event.key == CurKeys["A"]: if event.key == CurKeys["A"]: