From 594e78d2f40a262d2f735357de3907e2a12b0e50 Mon Sep 17 00:00:00 2001 From: cuu Date: Tue, 27 Nov 2018 18:31:17 +0800 Subject: [PATCH] action.json and plugin.json --- Menu/GameShell/10_Settings/{plugin.config => plugin.json} | 0 .../20_Retro Games/MAME/{action.config => action.json} | 0 .../20_Retro Games/MGBA/{action.config => action.json} | 0 .../20_Retro Games/NESTOPIA/{action.config => action.json} | 0 Menu/GameShell/HelloWorld/{plugin.config => plugin.json} | 0 sysgo/UI/keyboard.go | 1 + sysgo/UI/main_screen.go | 6 ++---- 7 files changed, 3 insertions(+), 4 deletions(-) rename Menu/GameShell/10_Settings/{plugin.config => plugin.json} (100%) rename Menu/GameShell/20_Retro Games/MAME/{action.config => action.json} (100%) rename Menu/GameShell/20_Retro Games/MGBA/{action.config => action.json} (100%) rename Menu/GameShell/20_Retro Games/NESTOPIA/{action.config => action.json} (100%) rename Menu/GameShell/HelloWorld/{plugin.config => plugin.json} (100%) diff --git a/Menu/GameShell/10_Settings/plugin.config b/Menu/GameShell/10_Settings/plugin.json similarity index 100% rename from Menu/GameShell/10_Settings/plugin.config rename to Menu/GameShell/10_Settings/plugin.json diff --git a/Menu/GameShell/20_Retro Games/MAME/action.config b/Menu/GameShell/20_Retro Games/MAME/action.json similarity index 100% rename from Menu/GameShell/20_Retro Games/MAME/action.config rename to Menu/GameShell/20_Retro Games/MAME/action.json diff --git a/Menu/GameShell/20_Retro Games/MGBA/action.config b/Menu/GameShell/20_Retro Games/MGBA/action.json similarity index 100% rename from Menu/GameShell/20_Retro Games/MGBA/action.config rename to Menu/GameShell/20_Retro Games/MGBA/action.json diff --git a/Menu/GameShell/20_Retro Games/NESTOPIA/action.config b/Menu/GameShell/20_Retro Games/NESTOPIA/action.json similarity index 100% rename from Menu/GameShell/20_Retro Games/NESTOPIA/action.config rename to Menu/GameShell/20_Retro Games/NESTOPIA/action.json diff --git a/Menu/GameShell/HelloWorld/plugin.config b/Menu/GameShell/HelloWorld/plugin.json similarity index 100% rename from Menu/GameShell/HelloWorld/plugin.config rename to Menu/GameShell/HelloWorld/plugin.json diff --git a/sysgo/UI/keyboard.go b/sysgo/UI/keyboard.go index 15d45cb..6cda0ac 100644 --- a/sysgo/UI/keyboard.go +++ b/sysgo/UI/keyboard.go @@ -459,6 +459,7 @@ func (self *Keyboard) KeyDown( ev *event.Event) { self.ReturnToUpLevelPage() self.Screen.Draw() self.Screen.SwapAndShow() + } if ev.Data["Key"] == CurKeys["Y"] { // done diff --git a/sysgo/UI/main_screen.go b/sysgo/UI/main_screen.go index cfba860..8006e2f 100644 --- a/sysgo/UI/main_screen.go +++ b/sysgo/UI/main_screen.go @@ -24,8 +24,8 @@ import ( ) var ( - emulator_flag = "action.config" - plugin_flag = "plugin.config" + emulator_flag = "action.json" + plugin_flag = "plugin.json" ) type ActionConfig struct { @@ -197,9 +197,7 @@ func (self *MainScreen) Init() { self.SkinManager = NewSkinManager() self.SkinManager.Init() - //self.DBusManager = DBUS.NewDBus() self.DBusManager = DBUS.DBusHandler - //self.DBusManager.Init() } func (self *MainScreen) FartherPages() { // right after ReadTheDirIntoPages