clockworkpi/LauncherGoDev
1
0
Fork 0
mirror of https://github.com/clockworkpi/LauncherGoDev.git synced 2025-12-12 16:08:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put DBus into MainScreen

Browse Source
This commit is contained in:
cuu 2018-06-16 22:08:10 +08:00
parent 30c7c675ad
commit 1e862f61a1
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sysgo/DBUS/dbus.go
View File

@ -61,12 +61,15 @@ type DBus struct {
Wifi *DbusInterface Wifi *DbusInterface
} }
func NewDBus() *DBus {
d := &DBus{}
return d
}
func (self *DBus) Init() { func (self *DBus) Init() {
conn, err := dbus.SystemBus() conn, err := dbus.SystemBus()
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, "Failed to connect to session bus:", err) panic(fmt.Sprintf("Failed to connect to system bus:", err))
os.Exit(1)
} }
self.Conn = conn self.Conn = conn

8
sysgo/UI/main_screen.go
View File

@ -11,6 +11,8 @@ import (
"github.com/cuu/gogame/color" "github.com/cuu/gogame/color"
"github.com/cuu/gogame/time" "github.com/cuu/gogame/time"
"github.com/cuu/gogame/event" "github.com/cuu/gogame/event"
"../DBUS"
) )
var ( var (
@ -137,6 +139,7 @@ type MainScreen struct {
MsgBoxFont *ttf.Font MsgBoxFont *ttf.Font
IconFont *ttf.Font IconFont *ttf.Font
SkinManager *SkinManager SkinManager *SkinManager
DBusManager *DBUS.DBus
} }
@ -147,7 +150,7 @@ func NewMainScreen() *MainScreen {
m.Width = Width m.Width = Width
m.Height = Height - FootBar_BarHeight - TitleBar_BarHeight - 1 m.Height = Height - FootBar_BarHeight - TitleBar_BarHeight - 1
m.MyPageStack = NewPageStack() m.MyPageStack = NewPageStack()
m.MsgBoxFont = Fonts["veramono20"] m.MsgBoxFont = Fonts["veramono20"]
m.IconFont = Fonts["varela15"] m.IconFont = Fonts["varela15"]
} }
@ -162,7 +165,8 @@ func (self *MainScreen) Init() {
self.SkinManager = NewSkinManager() self.SkinManager = NewSkinManager()
self.SkinManager.Init() self.SkinManager.Init()
self.DBusManager = NewDBus()
self.DBusManager.Init()
} }
func (self *MainScreen) FartherPages() { // right after ReadTheDirIntoPages func (self *MainScreen) FartherPages() { // right after ReadTheDirIntoPages

3
sysgo/UI/title_bar.go
View File

@ -74,6 +74,7 @@ type TitleBar struct {
Title string Title string
InLowBackLight int InLowBackLight int
SkinManager *SkinManager //set by MainScreen SkinManager *SkinManager //set by MainScreen
DBusManager *DBusInterface
icon_base_path string /// SkinMap("gameshell/titlebar_icons/") icon_base_path string /// SkinMap("gameshell/titlebar_icons/")
} }
@ -221,7 +222,7 @@ func (self *TitleBar) Init(main_screen *MainScreen) {
self.CanvasHWND = surface.Surface(self.Width,self.Height) self.CanvasHWND = surface.Surface(self.Width,self.Height)
self.HWND = main_screen.HWND self.HWND = main_screen.HWND
self.SkinManager = main_screen.SkinManager self.SkinManager = main_screen.SkinManager
self.DBusManager = main_screen.DBusManager
icon_wifi_status := NewTitleBarIconItem() icon_wifi_status := NewTitleBarIconItem()