clockworkpi/LauncherGoDev
1
0
Fork 0
mirror of https://github.com/clockworkpi/LauncherGoDev.git synced 2026-03-19 02:12:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "fix"

Browse Source 
This reverts commit ed2454ea64.
This commit is contained in:
cuu
2023-01-24 14:47:42 +08:00
parent 4eefd21a8b
commit 6a360f5101
29 changed files with 104 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Menu/GameShell/10_Settings/About/about.go
View File

@@ -414,7 +414,8 @@ func (self *AboutPlugin) Init(main_screen *UI.MainScreen) {
func (self *AboutPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushPage(self.Page)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Airplane/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *AirplanePlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.AirplanePage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Bluetooth/plugin_init.go
View File

@@ -121,7 +121,8 @@ func (self *BluetoothPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.BluetoothPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Brightness/plugin_init.go
View File

@@ -33,7 +33,8 @@ func (self *BrightnessPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.BrightnessPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/ButtonsLayout/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *ButtonsLayoutPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.ButtonsLayoutPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/GateWay/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *GatewayPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.Page1st)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Languages/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *LanguagesPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.LanguagesPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Lima/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *LimaPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.GPUDriverPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/PowerOFF/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *PowerOFFPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.PowerOFFPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/PowerOptions/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *PowerOptionsPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.PowerOptionsPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Settings.go
View File

@@ -307,7 +307,8 @@ func (self *SettingsPlugin) Init(main_screen *UI.MainScreen) {
func (self *SettingsPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushPage(self.Page)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Sound/plugin_init.go
View File

@@ -34,7 +34,8 @@ func (self *SoundPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.SoundPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Storage/plugin_init.go
View File

@@ -29,7 +29,8 @@ func (self *StoragePlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.StoragePage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/TimeZone/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *TimeZonePlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.TimeZonePage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/10_Settings/Update/plugin_init.go
View File

@@ -20,7 +20,8 @@ func (self *UpdatePlugin) Init(main_screen *UI.MainScreen) {
func (self *UpdatePlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushPage(self.Page)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

6
Menu/GameShell/10_Settings/Wifi/plugin_init.go
View File

@@ -49,8 +49,10 @@ func (self *WifiPlugin) Init(main_screen *UI.MainScreen) {
func (self *WifiPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushPage(self.ScanPage)
main_screen.Refresh()
main_screen.PushCurPage()
main_screen.SetCurPage(self.ScanPage)
main_screen.Draw()
main_screen.SwapAndShow()
}
}

21
Menu/GameShell/10_Settings/Wifi/wifi.go
View File

@@ -372,6 +372,7 @@ type WifiList struct {
Connecting bool
Scanning bool
ShowingMessageBox bool
MsgBox *WifiListMessageBox
ConnectTry int
@@ -401,7 +402,14 @@ func NewWifiList() *WifiList {
func (self *WifiList) ShowBox(msg string) {
self.MsgBox.Text = msg
self.Screen.ShowMsg(msg,1)
self.ShowingMessageBox = true
self.Screen.ShowMsg(msg,0)
}
func (self *WifiList) HideBox() {
self.Draw()
self.ShowingMessageBox = false
self.Screen.SwapAndShow()
}
func (self *WifiList) GenNetworkList() {
@@ -444,7 +452,7 @@ func (self *WifiList) GenNetworkList() {
li_idx++
}
}
self.WifiScanFinished()
self.PsIndex = 0
@@ -487,7 +495,9 @@ func (self *WifiList) WifiScanFinished() {
self.ResetPageSelector()
self.Scanning = false
self.HideBox()
self.BlockingUI = false
fmt.Println("dbus says scan finished")
}
@@ -498,7 +508,8 @@ func (self *WifiList) WifiScanStarted() {
}
self.Scanning = true
self.ShowBox("Wifi scanning")
self.ShowBox("Wifi scanning...")
self.BlockingUI = true
fmt.Println("dbus says start scan")
}
@@ -591,7 +602,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)
@@ -663,6 +674,7 @@ func (self *WifiList) ScrollDown() {
}
func (self *WifiList) AbortedAndReturnToUpLevel() {
self.HideBox()
self.Screen.FootBar.ResetNavText()
self.ReturnToUpLevelPage()
@@ -727,7 +739,6 @@ 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"] {

3
Menu/GameShell/21_Warehouse/plugin_init.go
View File

@@ -32,7 +32,8 @@ func (self *WareHousePlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.MainPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/97_MusicPlayer/plugin_init.go
View File

@@ -35,7 +35,8 @@ func (self *MusicPlayerPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.MusicPlayerPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/98_TinyCloud/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *TinyCloudPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.MainPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}

3
Menu/GameShell/99_PowerOFF/plugin_init.go
View File

@@ -30,7 +30,8 @@ func (self *PowerOFFPlugin) Run(main_screen *UI.MainScreen) {
if main_screen != nil {
main_screen.PushCurPage()
main_screen.SetCurPage(self.PowerOFFPage)
main_screen.Refresh()
main_screen.Draw()
main_screen.SwapAndShow()
}
}