From 6bfe64c59b67d169276ca825b11ebe7e898e0938 Mon Sep 17 00:00:00 2001 From: cuu Date: Thu, 13 Dec 2018 14:01:28 +0800 Subject: [PATCH] ReadTheDirIntoPages add for all-in-one folder's icon --- Menu/GameShell/10_Settings/Blueutooth/bluetooth_page.go | 0 Menu/GameShell/10_Settings/Blueutooth/net_item.go | 0 Menu/GameShell/10_Settings/Blueutooth/plugin_init.go | 0 mainscreen.go | 5 ++++- 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Menu/GameShell/10_Settings/Blueutooth/bluetooth_page.go create mode 100644 Menu/GameShell/10_Settings/Blueutooth/net_item.go create mode 100644 Menu/GameShell/10_Settings/Blueutooth/plugin_init.go diff --git a/Menu/GameShell/10_Settings/Blueutooth/bluetooth_page.go b/Menu/GameShell/10_Settings/Blueutooth/bluetooth_page.go new file mode 100644 index 0000000..e69de29 diff --git a/Menu/GameShell/10_Settings/Blueutooth/net_item.go b/Menu/GameShell/10_Settings/Blueutooth/net_item.go new file mode 100644 index 0000000..e69de29 diff --git a/Menu/GameShell/10_Settings/Blueutooth/plugin_init.go b/Menu/GameShell/10_Settings/Blueutooth/plugin_init.go new file mode 100644 index 0000000..e69de29 diff --git a/mainscreen.go b/mainscreen.go index 61b14cc..f850ed8 100644 --- a/mainscreen.go +++ b/mainscreen.go @@ -88,7 +88,10 @@ func ReadTheDirIntoPages(self *UI.MainScreen, _dir string, pglevel int, cur_page iconitem := UI.NewIconItem() iconitem.FileName = f.Name() iconitem.AddLabel(i2,self.IconFont) - if UI.FileExists( UI.SkinMap(_dir+"/"+i2+".png")) { + if UI.FileExists(filepath.Join(_dir,f.Name(),i2+".png")) { //eg: 20_Prog/Prog.png , cut 20_ + iconitem.ImageName = filepath.Join(_dir,f.Name(),i2+".png") + + }else if UI.FileExists( UI.SkinMap(_dir+"/"+i2+".png")) { iconitem.ImageName = UI.SkinMap(_dir+"/"+i2+".png") }else { //fmt.Println( UI.SkinMap(_dir+"/"+i2+".png") )