diff --git a/sysgo/DBUS/dbus.go b/sysgo/DBUS/dbus.go index 0ad4f07..1857396 100644 --- a/sysgo/DBUS/dbus.go +++ b/sysgo/DBUS/dbus.go @@ -61,12 +61,15 @@ type DBus struct { Wifi *DbusInterface } +func NewDBus() *DBus { + d := &DBus{} + return d +} func (self *DBus) Init() { conn, err := dbus.SystemBus() if err != nil { - fmt.Fprintln(os.Stderr, "Failed to connect to session bus:", err) - os.Exit(1) + panic(fmt.Sprintf("Failed to connect to system bus:", err)) } self.Conn = conn diff --git a/sysgo/UI/main_screen.go b/sysgo/UI/main_screen.go index 506d3b3..ab33fd9 100644 --- a/sysgo/UI/main_screen.go +++ b/sysgo/UI/main_screen.go @@ -11,6 +11,8 @@ import ( "github.com/cuu/gogame/color" "github.com/cuu/gogame/time" "github.com/cuu/gogame/event" + + "../DBUS" ) var ( @@ -137,6 +139,7 @@ type MainScreen struct { MsgBoxFont *ttf.Font IconFont *ttf.Font SkinManager *SkinManager + DBusManager *DBUS.DBus } @@ -147,7 +150,7 @@ func NewMainScreen() *MainScreen { m.Width = Width m.Height = Height - FootBar_BarHeight - TitleBar_BarHeight - 1 m.MyPageStack = NewPageStack() - + m.MsgBoxFont = Fonts["veramono20"] m.IconFont = Fonts["varela15"] } @@ -162,7 +165,8 @@ func (self *MainScreen) Init() { self.SkinManager = NewSkinManager() self.SkinManager.Init() - + self.DBusManager = NewDBus() + self.DBusManager.Init() } func (self *MainScreen) FartherPages() { // right after ReadTheDirIntoPages diff --git a/sysgo/UI/title_bar.go b/sysgo/UI/title_bar.go index 4401611..ce319b7 100644 --- a/sysgo/UI/title_bar.go +++ b/sysgo/UI/title_bar.go @@ -74,6 +74,7 @@ type TitleBar struct { Title string InLowBackLight int SkinManager *SkinManager //set by MainScreen + DBusManager *DBusInterface 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.HWND = main_screen.HWND self.SkinManager = main_screen.SkinManager - + self.DBusManager = main_screen.DBusManager icon_wifi_status := NewTitleBarIconItem()