mirror of
https://github.com/clockworkpi/LauncherGoDev.git
synced 2026-03-19 10:22:41 +01:00
fix
This commit is contained in:
@@ -49,10 +49,8 @@ func (self *WifiPlugin) Init(main_screen *UI.MainScreen) {
|
||||
|
||||
func (self *WifiPlugin) Run(main_screen *UI.MainScreen) {
|
||||
if main_screen != nil {
|
||||
main_screen.PushCurPage()
|
||||
main_screen.SetCurPage(self.ScanPage)
|
||||
main_screen.Draw()
|
||||
main_screen.SwapAndShow()
|
||||
main_screen.PushPage(self.ScanPage)
|
||||
main_screen.Refresh()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -372,7 +372,6 @@ type WifiList struct {
|
||||
Connecting bool
|
||||
Scanning bool
|
||||
|
||||
ShowingMessageBox bool
|
||||
MsgBox *WifiListMessageBox
|
||||
ConnectTry int
|
||||
|
||||
@@ -402,14 +401,7 @@ func NewWifiList() *WifiList {
|
||||
|
||||
func (self *WifiList) ShowBox(msg string) {
|
||||
self.MsgBox.Text = msg
|
||||
self.ShowingMessageBox = true
|
||||
self.Screen.ShowMsg(msg,0)
|
||||
}
|
||||
|
||||
func (self *WifiList) HideBox() {
|
||||
self.Draw()
|
||||
self.ShowingMessageBox = false
|
||||
self.Screen.SwapAndShow()
|
||||
self.Screen.ShowMsg(msg,1)
|
||||
}
|
||||
|
||||
func (self *WifiList) GenNetworkList() {
|
||||
@@ -452,7 +444,7 @@ func (self *WifiList) GenNetworkList() {
|
||||
li_idx++
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
self.WifiScanFinished()
|
||||
|
||||
self.PsIndex = 0
|
||||
@@ -495,9 +487,7 @@ func (self *WifiList) WifiScanFinished() {
|
||||
self.ResetPageSelector()
|
||||
|
||||
self.Scanning = false
|
||||
self.HideBox()
|
||||
|
||||
self.BlockingUI = false
|
||||
fmt.Println("dbus says scan finished")
|
||||
|
||||
}
|
||||
@@ -508,8 +498,7 @@ func (self *WifiList) WifiScanStarted() {
|
||||
}
|
||||
|
||||
self.Scanning = true
|
||||
self.ShowBox("Wifi scanning...")
|
||||
self.BlockingUI = true
|
||||
self.ShowBox("Wifi scanning")
|
||||
fmt.Println("dbus says start scan")
|
||||
}
|
||||
|
||||
@@ -602,7 +591,7 @@ func (self *WifiList) ConfigWireless(password string) {
|
||||
ssid := self.MyList[self.PsIndex].Essid
|
||||
fmt.Println(ssid)
|
||||
fmt.Println(password)
|
||||
self.ShowBox("Connecting...")
|
||||
self.ShowBox("Connecting")
|
||||
|
||||
self.Connecting = true
|
||||
cli := fmt.Sprintf("sudo nmcli dev wifi connect %s password \"%s\"", ssid, password)
|
||||
@@ -674,7 +663,6 @@ func (self *WifiList) ScrollDown() {
|
||||
}
|
||||
|
||||
func (self *WifiList) AbortedAndReturnToUpLevel() {
|
||||
self.HideBox()
|
||||
self.Screen.FootBar.ResetNavText()
|
||||
self.ReturnToUpLevelPage()
|
||||
|
||||
@@ -739,6 +727,7 @@ func (self *WifiList) KeyDown(ev *event.Event) {
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["X"] {
|
||||
self.Rescan(false)
|
||||
self.Screen.Refresh()
|
||||
}
|
||||
|
||||
if ev.Data["Key"] == UI.CurKeys["Y"] {
|
||||
|
||||
Reference in New Issue
Block a user