diff --git a/Menu/GameShell/10_Settings/About/about.go b/Menu/GameShell/10_Settings/About/about.go index d9ae8a9..9b9a953 100644 --- a/Menu/GameShell/10_Settings/About/about.go +++ b/Menu/GameShell/10_Settings/About/about.go @@ -1,4 +1,4 @@ -package main +package About import ( "fmt" diff --git a/Menu/GameShell/10_Settings/Brightness/brightness_page.go b/Menu/GameShell/10_Settings/Brightness/brightness_page.go index defe101..2f03067 100644 --- a/Menu/GameShell/10_Settings/Brightness/brightness_page.go +++ b/Menu/GameShell/10_Settings/Brightness/brightness_page.go @@ -1,4 +1,4 @@ -package main +package Brightness import( "fmt" diff --git a/Menu/GameShell/10_Settings/Brightness/plugin_init.go b/Menu/GameShell/10_Settings/Brightness/plugin_init.go index 0727bd6..75cf105 100644 --- a/Menu/GameShell/10_Settings/Brightness/plugin_init.go +++ b/Menu/GameShell/10_Settings/Brightness/plugin_init.go @@ -1,4 +1,4 @@ -package main +package Brightness /* * sysgo.BackLight diff --git a/Menu/GameShell/10_Settings/Settings.go b/Menu/GameShell/10_Settings/Settings.go index 81eeea9..f131c78 100644 --- a/Menu/GameShell/10_Settings/Settings.go +++ b/Menu/GameShell/10_Settings/Settings.go @@ -12,8 +12,13 @@ import ( "github.com/cuu/LauncherGoDev/sysgo/UI" + //child packages + "github.com/cuu/LauncherGoDev/Menu/GameShell/10_Settings/About" + "github.com/cuu/LauncherGoDev/Menu/GameShell/10_Settings/Sound" + "github.com/cuu/LauncherGoDev/Menu/GameShell/10_Settings/Brightness" + "github.com/cuu/LauncherGoDev/Menu/GameShell/10_Settings/Wifi" "github.com/cuu/LauncherGoDev/Menu/GameShell/10_Settings/LauncherPy" - + "github.com/cuu/LauncherGoDev/Menu/GameShell/10_Settings/Update" ) @@ -91,14 +96,14 @@ func NewSettingsPage() *SettingsPage { func (self *SettingsPage) GenList() []*SettingPlugin { alist := []*SettingPlugin{ - &SettingPlugin{0,"wifi.so", "Wifi", "Wi-Fi",nil}, + &SettingPlugin{0,"", "Wifi", "Wi-Fi",&Wifi.APIOBJ}, - &SettingPlugin{0,"sound.so", "Sound", "Sound Volume" , nil}, - &SettingPlugin{0,"brightness.so", "Brightness", "BackLight Brightness", nil}, - &SettingPlugin{0,"update.so", "Update", "Update", nil}, - &SettingPlugin{0,"about.so", "About", "About", nil}, + &SettingPlugin{0,"", "Sound", "Sound Volume" , &Sound.APIOBJ}, + &SettingPlugin{0,"", "Brightness", "BackLight Brightness", &Brightness.APIOBJ}, + &SettingPlugin{0,"", "Update", "Update", &Update.APIOBJ}, + &SettingPlugin{0,"", "About", "About", &About.APIOBJ}, - &SettingPlugin{1,"", "LauncherPy","Switch to Launcher",&LauncherPy.APIOBJ}, + &SettingPlugin{1,"", "LauncherPy", "Switch to Launcher", &LauncherPy.APIOBJ}, } diff --git a/Menu/GameShell/10_Settings/Sound/plugin_init.go b/Menu/GameShell/10_Settings/Sound/plugin_init.go index eaf1b3a..9c26bf7 100644 --- a/Menu/GameShell/10_Settings/Sound/plugin_init.go +++ b/Menu/GameShell/10_Settings/Sound/plugin_init.go @@ -1,4 +1,4 @@ -package main +package Sound /* * need amixer diff --git a/Menu/GameShell/10_Settings/Sound/sound_page.go b/Menu/GameShell/10_Settings/Sound/sound_page.go index 26a73f1..1641d58 100644 --- a/Menu/GameShell/10_Settings/Sound/sound_page.go +++ b/Menu/GameShell/10_Settings/Sound/sound_page.go @@ -1,4 +1,4 @@ -package main +package Sound import( "fmt" diff --git a/Menu/GameShell/10_Settings/Sound/volume_linux.go b/Menu/GameShell/10_Settings/Sound/volume_linux.go index 1509dbc..fccc13f 100644 --- a/Menu/GameShell/10_Settings/Sound/volume_linux.go +++ b/Menu/GameShell/10_Settings/Sound/volume_linux.go @@ -2,7 +2,7 @@ /* * Copied from https://github.com/itchyny/volume-go, MIT License */ -package main +package Sound import ( "errors" diff --git a/Menu/GameShell/10_Settings/Sound/volume_unix.go b/Menu/GameShell/10_Settings/Sound/volume_unix.go index 7df6fe6..fbbe984 100644 --- a/Menu/GameShell/10_Settings/Sound/volume_unix.go +++ b/Menu/GameShell/10_Settings/Sound/volume_unix.go @@ -2,7 +2,7 @@ /* * Copied from https://github.com/itchyny/volume-go, MIT License */ -package main +package Sound import ( "errors" diff --git a/Menu/GameShell/10_Settings/Update/plugin_init.go b/Menu/GameShell/10_Settings/Update/plugin_init.go index bce4467..0f184ec 100644 --- a/Menu/GameShell/10_Settings/Update/plugin_init.go +++ b/Menu/GameShell/10_Settings/Update/plugin_init.go @@ -1,4 +1,4 @@ -package main +package Update import ( "github.com/cuu/LauncherGoDev/sysgo/UI" ) diff --git a/Menu/GameShell/10_Settings/Update/update_page.go b/Menu/GameShell/10_Settings/Update/update_page.go index 62f9152..8937ddf 100644 --- a/Menu/GameShell/10_Settings/Update/update_page.go +++ b/Menu/GameShell/10_Settings/Update/update_page.go @@ -1,4 +1,4 @@ -package main +package Update import ( "fmt" diff --git a/Menu/GameShell/10_Settings/Wifi/net_item.go b/Menu/GameShell/10_Settings/Wifi/net_item.go index 12adb41..b5f194c 100644 --- a/Menu/GameShell/10_Settings/Wifi/net_item.go +++ b/Menu/GameShell/10_Settings/Wifi/net_item.go @@ -1,4 +1,4 @@ -package main +package Wifi import ( "fmt" diff --git a/Menu/GameShell/10_Settings/Wifi/plugin_init.go b/Menu/GameShell/10_Settings/Wifi/plugin_init.go index 325fc73..418240b 100644 --- a/Menu/GameShell/10_Settings/Wifi/plugin_init.go +++ b/Menu/GameShell/10_Settings/Wifi/plugin_init.go @@ -1,4 +1,4 @@ -package main +package Wifi import ( gotime "time" diff --git a/Menu/GameShell/10_Settings/Wifi/wifi.go b/Menu/GameShell/10_Settings/Wifi/wifi.go index 2af9c66..dd74a3e 100644 --- a/Menu/GameShell/10_Settings/Wifi/wifi.go +++ b/Menu/GameShell/10_Settings/Wifi/wifi.go @@ -1,4 +1,4 @@ -package main +package Wifi //wifi_list.py import ( diff --git a/build.sh b/build.sh index f6779f3..0eb0d86 100755 --- a/build.sh +++ b/build.sh @@ -12,25 +12,3 @@ cd Menu/GameShell/10_Settings go build -o Settings.so -buildmode=plugin cd - -cd Menu/GameShell/10_Settings/About -go build -o about.so -buildmode=plugin -cd - - -cd Menu/GameShell/10_Settings/Wifi -go build -o wifi.so -buildmode=plugin -cd - - -cd Menu/GameShell/10_Settings/Sound -go build -ldflags="-s -w" -o sound.so -buildmode=plugin -cd - - -cd Menu/GameShell/10_Settings/Brightness -go build -ldflags="-s -w" -o brightness.so -buildmode=plugin -cd - - - -cd Menu/GameShell/10_Settings/Update -go build -o update.so -buildmode=plugin -cd - - - diff --git a/sysgo/UI/title_bar.go b/sysgo/UI/title_bar.go index d388532..c697896 100644 --- a/sysgo/UI/title_bar.go +++ b/sysgo/UI/title_bar.go @@ -415,7 +415,7 @@ func (self *TitleBar) Draw(title string) { if self.DBusManager.IsWifiConnectedNow() == true { ge := self.GetWifiStrength( self.DBusManager.WifiStrength() ) - fmt.Println("wifi ge: ",ge) + //fmt.Println("wifi ge: ",ge) if ge > 0 { self.Icons["wifistatus"].SetIconIndex(ge) self.Icons["wifistatus"].NewCoord(start_x+self.IconWidth+5, self.IconHeight/2+(self.BarHeight-self.IconHeight)/2 ) diff --git a/update.sh b/update.sh index a44ef3b..0003e2f 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,5 @@ #!/bin/bash -sleep 10 feh --bg-center /home/cpi/launchergo/sysgo/gameshell/wallpaper/updating.png cd /home/cpi/launchergo git pull