mirror of
https://github.com/clockworkpi/launcher.git
synced 2025-12-12 17:58:50 +01:00
bug fix
This commit is contained in:
parent
df344ed12b
commit
36ebf2f7fc
@ -108,6 +108,8 @@ class AirplanePage(Page):
|
||||
self._Scroller.Init()
|
||||
self._Scroller.SetCanvasHWND(self._HWND)
|
||||
|
||||
self.OnLoadCb()
|
||||
|
||||
def ScrollDown(self):
|
||||
dis = 10
|
||||
if abs(self._Scrolled) < (self._BGheight - self._Height)/2 + 0:
|
||||
|
||||
@ -617,10 +617,10 @@ class BluetoothPage(Page):
|
||||
self.GenNetworkList()
|
||||
|
||||
def OnLoadCb(self):
|
||||
self.RefreshDevices()
|
||||
if self._Screen._TitleBar._InAirPlaneMode == False:
|
||||
self.RefreshDevices()
|
||||
self.GenNetworkList()
|
||||
|
||||
self.GenNetworkList()
|
||||
|
||||
def ScrollUp(self):
|
||||
if len(self._WirelessList) == 0:
|
||||
return
|
||||
@ -648,6 +648,10 @@ class BluetoothPage(Page):
|
||||
def KeyDown(self,event):
|
||||
|
||||
if event.key == CurKeys["A"] or event.key == CurKeys["Menu"]:
|
||||
if self._Screen._TitleBar._InAirPlaneMode == True:
|
||||
self.AbortedAndReturnToUpLevel()
|
||||
return
|
||||
|
||||
if self._Adapter != None:
|
||||
try:
|
||||
self._Adapter.StopDiscovery()
|
||||
@ -679,8 +683,8 @@ class BluetoothPage(Page):
|
||||
self._Screen.SwapAndShow()
|
||||
|
||||
if event.key == CurKeys["X"]:
|
||||
|
||||
self.Rescan()
|
||||
if self._Screen._TitleBar._InAirPlaneMode == False:
|
||||
self.Rescan()
|
||||
|
||||
if event.key == CurKeys["Y"]:
|
||||
if len(self._WirelessList) == 0:
|
||||
@ -693,7 +697,8 @@ class BluetoothPage(Page):
|
||||
self._Screen.SwapAndShow()
|
||||
|
||||
if event.key == CurKeys["B"]:
|
||||
self.TryConnect()
|
||||
if self._Screen._TitleBar._InAirPlaneMode == False:
|
||||
self.TryConnect()
|
||||
|
||||
def Draw(self):
|
||||
self.ClearCanvas()
|
||||
@ -743,10 +748,10 @@ class APIOBJ(object):
|
||||
self._Page.Init()
|
||||
|
||||
bus.add_signal_receiver(self._Page.DbusPropertiesChanged,
|
||||
dbus_interface = "org.freedesktop.DBus.Properties",
|
||||
signal_name = "PropertiesChanged",
|
||||
arg0 = "org.bluez.Device1",
|
||||
path_keyword = "path")
|
||||
dbus_interface = "org.freedesktop.DBus.Properties",
|
||||
signal_name = "PropertiesChanged",
|
||||
arg0 = "org.bluez.Device1",
|
||||
path_keyword = "path")
|
||||
|
||||
def API(self,main_screen):
|
||||
if main_screen !=None:
|
||||
|
||||
@ -92,6 +92,8 @@ class NetItem(object):
|
||||
print(object["RSSI"])
|
||||
self._RSSI = int(object["RSSI"])
|
||||
|
||||
mac_addr = mac_addr[:34]
|
||||
|
||||
name_label.Init(mac_addr,self._FontObj)
|
||||
|
||||
self._Labels["mac_addr"] = name_label
|
||||
|
||||
@ -296,6 +296,7 @@ class WifiList(Page):
|
||||
_ListFontObj = fonts["notosanscjk15"]
|
||||
|
||||
_InfoPage = None
|
||||
_CurBssid = ""
|
||||
|
||||
def __init__(self):
|
||||
Page.__init__(self)
|
||||
@ -517,7 +518,14 @@ class WifiList(Page):
|
||||
return True
|
||||
|
||||
def ConfigWireless(self,password):
|
||||
|
||||
netid = self._PsIndex
|
||||
|
||||
for i,v in enumerate(self._WirelessList):
|
||||
if v._Bssid == self._CurBssid:
|
||||
netid = i
|
||||
break
|
||||
|
||||
print(netid," ", password)
|
||||
"""
|
||||
self._Wireless.SetWirelessProperty(netid,"dhcphostname","GameShell")
|
||||
@ -652,6 +660,8 @@ class WifiList(Page):
|
||||
if len(self._WirelessList) == 0:
|
||||
return
|
||||
|
||||
self._CurBssid = self._WirelessList[self._PsIndex]._Bssid
|
||||
|
||||
wicd_wirelss_encrypt_pwd = self.GetWirelessEncrypt(self._PsIndex)
|
||||
if self._WirelessList[self._PsIndex]._IsActive:
|
||||
self.ShowBox( self._Wireless.GetWirelessIP('') )
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user