Browse Source

now try to replace .so with go code

cuu 5 years ago
parent
commit
1826b16bee

+ 1 - 1
Menu/GameShell/10_Settings/About/about.go

@@ -1,4 +1,4 @@
-package main
+package About
 
 import (
 	"fmt"

+ 1 - 1
Menu/GameShell/10_Settings/Brightness/brightness_page.go

@@ -1,4 +1,4 @@
-package main
+package Brightness
 
 import(
   "fmt"

+ 1 - 1
Menu/GameShell/10_Settings/Brightness/plugin_init.go

@@ -1,4 +1,4 @@
-package main
+package Brightness
 
 /*
  * sysgo.BackLight  

+ 12 - 7
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},
     
   }
   

+ 1 - 1
Menu/GameShell/10_Settings/Sound/plugin_init.go

@@ -1,4 +1,4 @@
-package main
+package Sound
 
 /*
  * need amixer

+ 1 - 1
Menu/GameShell/10_Settings/Sound/sound_page.go

@@ -1,4 +1,4 @@
-package main
+package Sound
 
 import(
   "fmt"

+ 1 - 1
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"

+ 1 - 1
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"

+ 1 - 1
Menu/GameShell/10_Settings/Update/plugin_init.go

@@ -1,4 +1,4 @@
-package main
+package Update
 import (
   "github.com/cuu/LauncherGoDev/sysgo/UI"
 )

+ 1 - 1
Menu/GameShell/10_Settings/Update/update_page.go

@@ -1,4 +1,4 @@
-package main
+package Update
 
 import (
   "fmt"

+ 1 - 1
Menu/GameShell/10_Settings/Wifi/net_item.go

@@ -1,4 +1,4 @@
-package main
+package Wifi
 
 import (
   "fmt"

+ 1 - 1
Menu/GameShell/10_Settings/Wifi/plugin_init.go

@@ -1,4 +1,4 @@
-package main 
+package Wifi
 
 import (
   gotime "time"

+ 1 - 1
Menu/GameShell/10_Settings/Wifi/wifi.go

@@ -1,4 +1,4 @@
-package main
+package Wifi
 //wifi_list.py
 
 import (

+ 0 - 22
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 -
-
-

+ 1 - 1
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 )

+ 0 - 1
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