From 73bcdb6d445488aeee23402c7f4648b5ea8f754d Mon Sep 17 00:00:00 2001 From: cuu Date: Sun, 2 Dec 2018 14:12:13 +0800 Subject: [PATCH] continue translate --- .../10_Settings/Airplane/__init__.py | 10 +-- .../10_Settings/Bluetooth/__init__.py | 20 +++--- .../10_Settings/Languages/__init__.py | 10 +-- .../10_Settings/Notification/__init__.py | 8 +-- .../10_Settings/PowerOFF/__init__.py | 5 +- .../10_Settings/PowerOptions/__init__.py | 28 ++++----- Menu/GameShell/10_Settings/Update/__init__.py | 18 +++--- Menu/GameShell/10_Settings/Wifi/wifi_list.py | 17 +++--- Menu/GameShell/10_Settings/list_item.py | 7 +-- Menu/GameShell/10_Settings/list_page.py | 2 +- Menu/GameShell/98_TinyCloud/__init__.py | 4 +- sys.py/UI/Emulator/__init__.py | 6 +- sys.py/UI/Emulator/fav_list_page.py | 8 +-- sys.py/UI/Emulator/rom_list_page.py | 8 +-- sys.py/UI/Emulator/rom_so_confirm_page.py | 2 +- sys.py/UI/confirm_page.py | 2 +- sys.py/UI/delete_confirm_page.py | 2 +- sys.py/UI/download_process_page.py | 4 +- sys.py/UI/foot_bar.py | 3 +- sys.py/UI/icon_item.py | 2 +- sys.py/UI/lang_manager.py | 14 +++-- sys.py/UI/main_screen.py | 2 +- sys.py/UI/page.py | 2 +- sys.py/UI/title_bar.py | 2 +- sys.py/langs/00_English.ini | 43 +++++++++++-- sys.py/langs/03_简体中文.ini | 61 +++++++++++++++++-- sys.py/run.py | 13 +++- 27 files changed, 198 insertions(+), 105 deletions(-) diff --git a/Menu/GameShell/10_Settings/Airplane/__init__.py b/Menu/GameShell/10_Settings/Airplane/__init__.py index 0725613..7d320ca 100644 --- a/Menu/GameShell/10_Settings/Airplane/__init__.py +++ b/Menu/GameShell/10_Settings/Airplane/__init__.py @@ -78,7 +78,7 @@ class InfoPageListItem(object): class AirplanePage(Page): - _FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Rescue"),"",MyLangManager.Tr("Back"),MyLangManager.Tr("Toggle")] + _FootMsg = ["Nav","Rescue","","Back","Toggle"] _MyList = [] _ListFontObj = MyLangManager.TrFont("varela13") @@ -207,19 +207,19 @@ class AirplanePage(Page): out = commands.getstatusoutput('sudo rfkill list | grep yes | cut -d " " -f3') print out if "yes" in out[1]: - self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOn")) + self._Screen._MsgBox.SetText("TurningOn") self._Screen._MsgBox.Draw() commands.getstatusoutput("sudo rfkill unblock all") self._Screen._TitleBar._InAirPlaneMode = False else: - self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOff")) + self._Screen._MsgBox.SetText("TurningOff") self._Screen._MsgBox.Draw() commands.getstatusoutput("sudo rfkill block all") self._Screen._TitleBar._InAirPlaneMode = True def UnBlockAll(self): - self._Screen._MsgBox.SetText(MyLangManager.Tr("TurningOn")) + self._Screen._MsgBox.SetText("TurningOn") self._Screen._MsgBox.Draw() commands.getstatusoutput("sudo rfkill unblock all") self._Screen._TitleBar._InAirPlaneMode = False @@ -314,7 +314,7 @@ class APIOBJ(object): def Init(self,main_screen): self._Page = AirplanePage() self._Page._Screen = main_screen - self._Page._Name =MyLangManager.Tr("AirplaneMode") + self._Page._Name ="Airplane Mode" self._Page.Init() def API(self,main_screen): diff --git a/Menu/GameShell/10_Settings/Bluetooth/__init__.py b/Menu/GameShell/10_Settings/Bluetooth/__init__.py index c61890c..8d40891 100644 --- a/Menu/GameShell/10_Settings/Bluetooth/__init__.py +++ b/Menu/GameShell/10_Settings/Bluetooth/__init__.py @@ -94,7 +94,7 @@ class BleInfoPageSelector(PageSelector): (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) class BleInfoPage(Page): - _FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Disconnect"),MyLangManager.Tr("Forget"),MyLangManager.Tr("Back"),""] + _FootMsg = ["Nav","Disconnect","Forget","Back",""] _MyList = [] _ListFontObj = MyLangManager.TrFont("varela15") _ListSmFontObj = fonts["varela12"] # small font @@ -127,7 +127,7 @@ class BleInfoPage(Page): self._ConfirmPage1 = BleForgetConfirmPage() self._ConfirmPage1._Screen = self._Screen - self._ConfirmPage1._Name = MyLangManager.Tr("ConfirmForget") + self._ConfirmPage1._Name = "ConfirmForget" self._ConfirmPage1._Parent = self self._ConfirmPage1.Init() @@ -205,7 +205,7 @@ class BleInfoPage(Page): proxy_obj = bus.get_object("org.bluez", self._Path) dev = dbus.Interface(proxy_obj, "org.bluez.Device1") - self._Screen._MsgBox.SetText(MyLangManager.Tr("Forgeting")) + self._Screen._MsgBox.SetText("Forgeting") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -230,8 +230,8 @@ class BleInfoPage(Page): proxy_obj = bus.get_object("org.bluez", self._Path) dev = dbus.Interface(proxy_obj, "org.bluez.Device1") - self._Screen._FootBar.UpdateNavText(MyLangManager.Tr("Disconnecting")) - self._Screen._MsgBox.SetText(MyLangManager.Tr("Disconnecting")) + self._Screen._FootBar.UpdateNavText("Disconnecting") + self._Screen._MsgBox.SetText("Disconnecting") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -261,7 +261,7 @@ class BleInfoPage(Page): if self._AList != None: if "Connected" in self._AList: if self._AList["Connected"] == 1: - self._FootMsg[1] = MyLangManager.Tr("Disconnect") + self._FootMsg[1] = "Disconnect" else: self._FootMsg[1] = "" @@ -385,7 +385,7 @@ class BluetoothPage(Page): _BlockCb = None _LastStatusMsg = "" - _FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Scan"),MyLangManager.Tr("Info"),MyLangManager.Tr("Back"),MyLangManager.Tr("TryConnect")] + _FootMsg = ["Nav","Scan","Info","Back","TryConnect"] _Scroller = None _ListFontObj = fonts["notosanscjk15"] @@ -444,7 +444,7 @@ class BluetoothPage(Page): self._InfoPage = BleInfoPage() self._InfoPage._Screen = self._Screen - self._InfoPage._Name = MyLangManager.Tr("BluetoothInfo") + self._InfoPage._Name = "BluetoothInfo" self._InfoPage.Init() def print_normal(self,address, properties): @@ -530,7 +530,7 @@ class BluetoothPage(Page): proxy_obj = bus.get_object("org.bluez", cur_li._Path) dev = dbus.Interface(proxy_obj, "org.bluez.Device1") - self._Screen._FootBar.UpdateNavText(MyLangManager.Tr("Connecting")) + self._Screen._FootBar.UpdateNavText("Connecting") self.ShowBox(MyLangManager.Tr("Connecting")) try: @@ -579,7 +579,7 @@ class BluetoothPage(Page): self._Scanning = True self.ShowBox(MyLangManager.Tr("BluetoothScanning")) - self._Screen._FootBar.UpdateNavText(MyLangManager.Tr("Scanning")) + self._Screen._FootBar.UpdateNavText("Scanning") proxy_obj = self._Dbus.get_object("org.bluez", "/org/bluez/" + self._ADAPTER_DEV) adapter_props = dbus.Interface(proxy_obj,"org.freedesktop.DBus.Properties") diff --git a/Menu/GameShell/10_Settings/Languages/__init__.py b/Menu/GameShell/10_Settings/Languages/__init__.py index 68b0436..6a5d64e 100644 --- a/Menu/GameShell/10_Settings/Languages/__init__.py +++ b/Menu/GameShell/10_Settings/Languages/__init__.py @@ -8,7 +8,7 @@ import glob from libs.roundrects import aa_round_rect ## local UI import -from UI.constants import Width,Height,ICON_TYPES,POWEROPT +from UI.constants import Width,Height,ICON_TYPES,RESTARTUI from UI.page import Page,PageSelector from UI.label import Label from UI.fonts import fonts @@ -75,7 +75,7 @@ class PageListItem(InfoPageListItem): pygame.draw.line(self._Parent._CanvasHWND,MySkinManager.GiveColor('Line'),(self._PosX,self._PosY+self._Height-1),(self._PosX+self._Width,self._PosY+self._Height-1),1) class LanguagesPage(Page): - _FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),MyLangManager.Tr("Select")] + _FootMsg = ["Nav","","","Back","Select"] _MyList = [] _ListFont = fonts["notosanscjk15"] @@ -105,7 +105,7 @@ class LanguagesPage(Page): files_path = [os.path.basename(x) for x in sorted(glob.glob('langs/*.ini'))] for i,u in enumerate( files_path ): - print(i,u) + #print(i,u) li = PageListItem() li._Parent = self li._PosX = start_x @@ -194,13 +194,13 @@ class LanguagesPage(Page): with open(".lang","w") as f: f.write(cur_li._Value) - self._Screen._MsgBox.SetText(MyLangManager.Tr("Applying")) + self._Screen._MsgBox.SetText("Applying") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() MyLangManager.UpdateLang() - ##pygame.event.post( pygame.event.Event(RUNEVT, message="exit 0")) ##Restart Launcher + pygame.event.post( pygame.event.Event(RESTARTUI, message="")) ##Restart Launcher pygame.time.delay(1000) diff --git a/Menu/GameShell/10_Settings/Notification/__init__.py b/Menu/GameShell/10_Settings/Notification/__init__.py index 005d2ea..8638f70 100644 --- a/Menu/GameShell/10_Settings/Notification/__init__.py +++ b/Menu/GameShell/10_Settings/Notification/__init__.py @@ -22,16 +22,16 @@ from UI.scroller import ListScroller from UI.icon_pool import MyIconPool from UI.icon_item import IconItem from UI.multi_icon_item import MultiIconItem - +from UI.lang_manager import MyLangManager from UI.multilabel import MultiLabel from UI.info_page_list_item import InfoPageListItem from UI.info_page_selector import InfoPageSelector class NotificationPage(Page): - _FootMsg = ["Nav.","","","Back","Toggle"] + _FootMsg = ["Nav","","","Back","Toggle"] _MyList = [] - _ListFontObj = fonts["varela13"] + _ListFontObj = MyLangManager.TrFont("varela13") _AList = {} @@ -197,7 +197,7 @@ class NotificationPage(Page): if event.key == CurKeys["B"]: self.ToggleEnable() - self._Screen._MsgBox.SetText("Applying...") + self._Screen._MsgBox.SetText("Applying") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() pygame.time.delay(1000) diff --git a/Menu/GameShell/10_Settings/PowerOFF/__init__.py b/Menu/GameShell/10_Settings/PowerOFF/__init__.py index cd32448..a41d6d2 100644 --- a/Menu/GameShell/10_Settings/PowerOFF/__init__.py +++ b/Menu/GameShell/10_Settings/PowerOFF/__init__.py @@ -6,14 +6,13 @@ import pygame from UI.constants import RUNSYS from UI.keys_def import CurKeys from UI.confirm_page import ConfirmPage - +from UI.lang_manager import MyLangManager import config class PowerOffConfirmPage(ConfirmPage): - _ConfirmText = "Confirm Power OFF?" + _ConfirmText = MyLangManager.Tr("Confirm Power OFF?") - def CheckBattery(self): try: f = open(config.Battery) diff --git a/Menu/GameShell/10_Settings/PowerOptions/__init__.py b/Menu/GameShell/10_Settings/PowerOptions/__init__.py index abbc65a..49004bf 100644 --- a/Menu/GameShell/10_Settings/PowerOptions/__init__.py +++ b/Menu/GameShell/10_Settings/PowerOptions/__init__.py @@ -85,7 +85,7 @@ class PageListItem(object): l = Label() l._PosX = 10 l.SetCanvasHWND(self._Parent._CanvasHWND) - + text = MyLangManager.Tr(text) l.Init(text,self._Fonts["normal"]) self._Labels["Text"] = l @@ -108,7 +108,7 @@ class PageListItem(object): class InfoPage(Page): - _FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),""] + _FootMsg = ["Nav","","","Back",""] _MyList = [] _ListFontObj = MyLangManager.TrFont("varela15") _AList = {} @@ -124,19 +124,19 @@ class InfoPage(Page): m = int(secs/60) s = secs % 60 if m > 1: - min_str = "%d "+MyLangManager.Tr("minutes")+" " % m + min_str = ("%d "+MyLangManager.Tr("minutes")+" ") % m else: - min_str = "%d "+MyLangManager.Tr("minute")+" " % m + min_str = ("%d "+MyLangManager.Tr("minute")+" ") % m if s == 1: - sec_str = "%d "+MyLangManager.Tr("second") % s + sec_str = ("%d "+MyLangManager.Tr("second")) % s elif s > 1: - sec_str = "%d "+MyLangManager.Tr("seconds") % s + sec_str = ("%d "+MyLangManager.Tr("seconds")) % s elif secs > 0: if secs > 1: - sec_str = "%d "+MyLangManager.Tr("seconds") % secs + sec_str = ("%d "+MyLangManager.Tr("seconds")) % secs else: - sec_str = "%d "+MyLangManager.Tr("second") % secs + sec_str = ("%d "+MyLangManager.Tr("second")) % secs elif secs == 0: sec_str = MyLangManager.Tr("Never") @@ -190,17 +190,17 @@ class InfoPage(Page): start_y = 0 for i,v in enumerate( self._AList): - print(v) + #print(v) li = PageListItem() li._Parent = self li._PosX = start_x li._PosY = start_y + i*PageListItem._Height li._Width = Width li._Fonts["normal"] = self._ListFontObj - li._Fonts["small"] = fonts["varela12"] + li._Fonts["small"] = MyLangManager.TrFont("varela12") if self._AList[v]["label"] != "": - li.Init( self._AList[v]["label"] ) + li.Init( self._AList[v]["label"] ) else: li.Init( self._AList[v]["key"] ) @@ -290,7 +290,7 @@ class InfoPage(Page): i.Draw() class PowerOptionsPage(Page): - _FootMsg = [MyLangManager.Tr("Nav"),"",MyLangManager.Tr("Detail"),MyLangManager.Tr("Back"),MyLangManager.Tr("Select")] + _FootMsg = ["Nav","","Detail","Back","Select"] _MyList = [] _ListFont = fonts["notosanscjk15"] @@ -450,7 +450,7 @@ class PowerOptionsPage(Page): else: os.system("sudo iw wlan0 set power_save on > /dev/null") - self._Screen._MsgBox.SetText(MyLangManager.Tr("Applying")) + self._Screen._MsgBox.SetText("Applying") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -562,7 +562,7 @@ class APIOBJ(object): def Init(self,main_screen): self._Page = PowerOptionsPage() self._Page._Screen = main_screen - self._Page._Name =MyLangManager.Tr("PowerOptions") + self._Page._Name ="Power Options" self._Page.Init() def API(self,main_screen): diff --git a/Menu/GameShell/10_Settings/Update/__init__.py b/Menu/GameShell/10_Settings/Update/__init__.py index 003e981..92d753f 100644 --- a/Menu/GameShell/10_Settings/Update/__init__.py +++ b/Menu/GameShell/10_Settings/Update/__init__.py @@ -63,7 +63,7 @@ class UpdateDownloadPage(DownloadProcessPage): print(filename) os.system("rm -rf %s" % CmdClean(filename)) - self._Screen._MsgBox.SetText(MyLangManager.Tr("DownloadFailed")) + self._Screen._MsgBox.SetText("DownloadFailed") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() return False @@ -81,7 +81,7 @@ class UpdateDownloadPage(DownloadProcessPage): self._URL = url self._DST_DIR = dst_dir else: - self._Screen._MsgBox.SetText(MyLangManager.Tr("Invaid")) + self._Screen._MsgBox.SetText("Invaid") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() return @@ -123,7 +123,7 @@ class UpdateConfirmPage(ConfirmPage): if self._DownloadPage == None: self._DownloadPage = UpdateDownloadPage() self._DownloadPage._Screen = self._Screen - self._DownloadPage._Name = MyLangManager.Tr("Downloading") + self._DownloadPage._Name = "Downloading" self._DownloadPage.Init() self._DownloadPage._MD5 = self._MD5 @@ -153,7 +153,7 @@ class UpdateConfirmPage(ConfirmPage): class UpdatePage(Page): _Icons = {} - _FootMsg = ["Nav.","Check Update","","Back",""] + _FootMsg = ["Nav","Check Update","","Back",""] _ListFontObj = fonts["varela15"] _ConfirmPage = None @@ -209,7 +209,7 @@ class UpdatePage(Page): self.GenList() def CheckUpdate(self): - self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckingUpdate")) + self._Screen._MsgBox.SetText("CheckingUpdate") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -256,7 +256,7 @@ class UpdatePage(Page): self._Screen.SwapAndShow() else: self._Screen.Draw() - self._Screen._MsgBox.SetText(MyLangManager.Tr("LauncherIsUpToDate")) + self._Screen._MsgBox.SetText("LauncherIsUpToDate") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() pygame.time.delay(765) @@ -287,12 +287,12 @@ class UpdatePage(Page): self._Screen.SwapAndShow() else: self._Screen.Draw() - self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckingUpdateFailed")) + self._Screen._MsgBox.SetText("CheckingUpdateFailed") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() else: self._Screen.Draw() - self._Screen._MsgBox.SetText(MyLangManager.Tr("CheckWifiConnection")) + self._Screen._MsgBox.SetText("CheckWifiConnection") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -313,7 +313,7 @@ class APIOBJ(object): self._UpdatePage = UpdatePage() self._UpdatePage._Screen = main_screen - self._UpdatePage._Name =MyLangManager.Tr("Update") + self._UpdatePage._Name = "Update" self._UpdatePage.Init() def API(self,main_screen): diff --git a/Menu/GameShell/10_Settings/Wifi/wifi_list.py b/Menu/GameShell/10_Settings/Wifi/wifi_list.py index af1df85..f256f4e 100644 --- a/Menu/GameShell/10_Settings/Wifi/wifi_list.py +++ b/Menu/GameShell/10_Settings/Wifi/wifi_list.py @@ -16,6 +16,7 @@ from UI.keys_def import CurKeys from UI.scroller import ListScroller from UI.confirm_page import ConfirmPage from UI.skin_manager import MySkinManager +from UI.lang_manager import MyLangManager from UI.info_page_list_item import InfoPageListItem from UI.info_page_selector import InfoPageSelector @@ -26,7 +27,7 @@ import myvars class WifiDisconnectConfirmPage(ConfirmPage): - _ConfirmText = "Confirm Disconnect?" + _ConfirmText = MyLangManager.Tr("ConfirmDisconnectQ") def KeyDown(self,event): if event.key == CurKeys["Menu"] or event.key == CurKeys["A"]: @@ -35,7 +36,7 @@ class WifiDisconnectConfirmPage(ConfirmPage): self._Screen.SwapAndShow() if event.key == CurKeys["B"]: - self.SnapMsg("Disconnecting...") + self.SnapMsg(MyLangManager.Tr("Disconnecting")) self._Screen.Draw() self._Screen.SwapAndShow() @@ -57,9 +58,9 @@ class WifiDisconnectConfirmPage(ConfirmPage): self.Reset() class WifiInfoPage(Page): - _FootMsg = ["Nav.","Disconnect","","Back",""] + _FootMsg = ["Nav","Disconnect","","Back",""] _MyList = [] - _ListFontObj = fonts["varela15"] + _ListFontObj = MyLangManager.TrFont("varela15") _Wireless = None _Daemon = None @@ -287,7 +288,7 @@ class WifiList(Page): _BlockCb = None _LastStatusMsg = "" - _FootMsg = ["Nav.","Scan","Info","Back","Enter"] + _FootMsg = ["Nav","Scan","Info","Back","Enter"] _EncMethods = None _Scroller = None _ListFontObj = fonts["notosanscjk15"] @@ -370,7 +371,7 @@ class WifiList(Page): return self._Scanning = True - self.ShowBox("Wifi scanning...") + self.ShowBox(MyLangManager.Tr("Wifi scanning")) self._BlockingUI = True print("dbus says start scan...") @@ -537,7 +538,7 @@ class WifiList(Page): self._Wireless.SetWirelessProperty(netid,"apsk",password) self._Wireless.SetWirelessProperty(netid,"automatic",1) - self.ShowBox("Connecting...") + self.ShowBox(MyLangManager.Tr("Connecting")) self._WirelessList[netid].Connect() print("after Connect") @@ -620,7 +621,7 @@ class WifiList(Page): wireless_connecting = self._Wireless.CheckIfWirelessConnecting() if wireless_connecting: self.ShutDownConnecting() - self.ShowBox("ShutDownConnecting...") + self.ShowBox(MyLangManager.Tr("ShutDownConnecting")) self._BlockingUI=True self._BlockCb = self.AbortedAndReturnToUpLevel else: diff --git a/Menu/GameShell/10_Settings/list_item.py b/Menu/GameShell/10_Settings/list_item.py index 4050d96..d0dcb23 100644 --- a/Menu/GameShell/10_Settings/list_item.py +++ b/Menu/GameShell/10_Settings/list_item.py @@ -8,7 +8,7 @@ import pygame from UI.page import Page from UI.label import Label from UI.fonts import fonts - +from UI.lang_manager import MyLangManager # a item for List # - - - - - - - - - - - -- # | Icon Text..... > | @@ -34,9 +34,6 @@ class ListItem(object): self._Icons = {} self._Fonts = {} - - - def Init(self,text): #self._Fonts["normal"] = fonts["veramono12"] @@ -44,7 +41,7 @@ class ListItem(object): l = Label() l._PosX = 16 l.SetCanvasHWND(self._Parent._CanvasHWND) - + text = MyLangManager.Tr(text) l.Init(text,self._Fonts["normal"]) self._Labels["Text"] = l diff --git a/Menu/GameShell/10_Settings/list_page.py b/Menu/GameShell/10_Settings/list_page.py index 31d6023..75f629a 100644 --- a/Menu/GameShell/10_Settings/list_page.py +++ b/Menu/GameShell/10_Settings/list_page.py @@ -26,7 +26,7 @@ class ListPage(Page): _Icons = {} _Selector=None - _FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),MyLangManager.Tr("Enter")] + _FootMsg = ["Nav","","","Back","Enter"] _MyList = [] _ListFontObj = MyLangManager.TrFont("varela15") diff --git a/Menu/GameShell/98_TinyCloud/__init__.py b/Menu/GameShell/98_TinyCloud/__init__.py index 83d3250..f772c06 100644 --- a/Menu/GameShell/98_TinyCloud/__init__.py +++ b/Menu/GameShell/98_TinyCloud/__init__.py @@ -16,7 +16,7 @@ from UI.lang_manager import MyLangManager from libs.DBUS import is_wifi_connected_now,get_wifi_ip class TinyCloudPage(Page): - _FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),""] + _FootMsg = ["Nav","","","Back",""] _MyList = [] _ListFontObj = fonts["varela13"] @@ -166,7 +166,7 @@ class TinyCloudPage(Page): def KeyDown(self,event): if event.key == CurKeys["A"] or event.key == CurKeys["Menu"]: - if self._FootMsg[3] == MyLangManager.Tr("Back"): + if self._FootMsg[3] == "Back": self.ReturnToUpLevelPage() self._Screen.Draw() self._Screen.SwapAndShow() diff --git a/sys.py/UI/Emulator/__init__.py b/sys.py/UI/Emulator/__init__.py index b427bd8..fc938a6 100644 --- a/sys.py/UI/Emulator/__init__.py +++ b/sys.py/UI/Emulator/__init__.py @@ -76,18 +76,18 @@ class MyEmulator(object): def InitDeleteConfirmPage(self,main_screen): self.DeleteConfirmPage = DeleteConfirmPage() self.DeleteConfirmPage._Screen = main_screen - self.DeleteConfirmPage._Name = MyLangManager.Tr("DeleteConfirm") + self.DeleteConfirmPage._Name = "DeleteConfirm" self.DeleteConfirmPage.Init() self.FavDeleteConfirmPage = FavDeleteConfirmPage() self.FavDeleteConfirmPage._Screen = main_screen - self.FavDeleteConfirmPage._Name = MyLangManager.Tr("DeleteConfirm") + self.FavDeleteConfirmPage._Name = "DeleteConfirm" self.FavDeleteConfirmPage.Init() def InitFavListPage(self,main_screen): self.FavListPage = FavListPage() self.FavListPage._Screen = main_screen - self.FavListPage._Name = MyLangManager.Tr("FavouriteGames") + self.FavListPage._Name = "FavouriteGames" self.FavListPage._Emulator = self._Emulator self.FavListPage._Parent = self diff --git a/sys.py/UI/Emulator/fav_list_page.py b/sys.py/UI/Emulator/fav_list_page.py index 45f1f1e..261d734 100644 --- a/sys.py/UI/Emulator/fav_list_page.py +++ b/sys.py/UI/Emulator/fav_list_page.py @@ -92,7 +92,7 @@ class FavListPage(Page): _Icons = {} _Selector=None - _FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Scan"),MyLangManager.Tr("Remove"),"",MyLangManager.Tr("Run")] + _FootMsg = ["Nav","Scan","Remove","","Run"] _MyList = [] _ListFont = fonts["notosanscjk15"] _MyStack = None @@ -245,7 +245,7 @@ class FavListPage(Page): rom_so_confirm_page = RomSoConfirmPage() rom_so_confirm_page._Screen = self._Screen - rom_so_confirm_page._Name = MyLangManager.Tr("Download Confirm") + rom_so_confirm_page._Name = "Download Confirm" rom_so_confirm_page._Parent = self rom_so_confirm_page.Init() @@ -309,7 +309,7 @@ class FavListPage(Page): return if cur_li._MyType == ICON_TYPES["FILE"]: - self._Screen._MsgBox.SetText(MyLangManager.Tr("Launching")) + self._Screen._MsgBox.SetText("Launching") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() if self._Emulator["FILETYPE"] == "dir": @@ -419,7 +419,7 @@ class FavListPage(Page): #delete directly without confirm dialog stats = os.stat(cur_li._Path) os.chown(cur_li._Path, stats.st_uid,stats.st_uid) ## normally uid and gid should be the same - self._Screen._MsgBox.SetText(MyLangManager.Tr("Deleting")) + self._Screen._MsgBox.SetText("Deleting") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() pygame.time.delay(600) diff --git a/sys.py/UI/Emulator/rom_list_page.py b/sys.py/UI/Emulator/rom_list_page.py index 4447ecf..b691854 100644 --- a/sys.py/UI/Emulator/rom_list_page.py +++ b/sys.py/UI/Emulator/rom_list_page.py @@ -99,7 +99,7 @@ class RomListPage(Page): _Icons = {} _Selector=None - _FootMsg = [MyLangManager.Tr("Nav"),MyLangManager.Tr("Scan"),MyLangManager.Tr("Del"),MyLangManager.Tr("AddFav"),MyLangManager.Tr("Run")] + _FootMsg = ["Nav","Scan","Del","AddFav","Run"] _MyList = [] _ListFont = fonts["notosanscjk15"] _MyStack = None @@ -279,7 +279,7 @@ class RomListPage(Page): rom_so_confirm_page = RomSoConfirmPage() rom_so_confirm_page._Screen = self._Screen - rom_so_confirm_page._Name = MyLangManager.Tr("Download Confirm") + rom_so_confirm_page._Name = "Download Confirm" rom_so_confirm_page._Parent = self rom_so_confirm_page.Init() @@ -348,7 +348,7 @@ class RomListPage(Page): self._PsIndex = 0 if cur_li._MyType == ICON_TYPES["FILE"]: - self._Screen._MsgBox.SetText(MyLangManager.Tr("Launching")) + self._Screen._MsgBox.SetText("Launching") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() @@ -448,7 +448,7 @@ class RomListPage(Page): except: pass - self._Screen._MsgBox.SetText(MyLangManager.Tr("AddFavList")) + self._Screen._MsgBox.SetText("AddFavList") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() diff --git a/sys.py/UI/Emulator/rom_so_confirm_page.py b/sys.py/UI/Emulator/rom_so_confirm_page.py index 4d23087..c055979 100644 --- a/sys.py/UI/Emulator/rom_so_confirm_page.py +++ b/sys.py/UI/Emulator/rom_so_confirm_page.py @@ -99,7 +99,7 @@ class RomSoConfirmPage(ConfirmPage): if self._MyDownloadPage == None: self._MyDownloadPage = DownloadProcessPage() self._MyDownloadPage._Screen = self._Screen - self._MyDownloadPage._Name = MyLangManager.Tr("Downloading") + self._MyDownloadPage._Name = "Downloading" self._MyDownloadPage.Init() self._Screen.PushPage(self._MyDownloadPage) diff --git a/sys.py/UI/confirm_page.py b/sys.py/UI/confirm_page.py index 04e3cdd..4efac84 100644 --- a/sys.py/UI/confirm_page.py +++ b/sys.py/UI/confirm_page.py @@ -54,7 +54,7 @@ class ConfirmPage(Page): _Icons = {} _Selector=None - _FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Cancel"),MyLangManager.Tr("Yes")] + _FootMsg = ["Nav","","","Cancel","Yes"] _MyList = [] _ListFont = MyLangManager.TrFont("veramono20") _MyStack = None diff --git a/sys.py/UI/delete_confirm_page.py b/sys.py/UI/delete_confirm_page.py index 12c27c3..7bca5bd 100644 --- a/sys.py/UI/delete_confirm_page.py +++ b/sys.py/UI/delete_confirm_page.py @@ -49,7 +49,7 @@ class DeleteConfirmPage(ConfirmPage): shutil.move(self._FileName, self._TrashDir) except shutil.Error as e: if "already exists" in str(e): - self._Screen._MsgBox.SetText(MyLangManager.Tr("AlreadyExisted")) + self._Screen._MsgBox.SetText("AlreadyExisted") else: self._Screen._MsgBox.SetText("Error") diff --git a/sys.py/UI/download_process_page.py b/sys.py/UI/download_process_page.py index dfc397e..7af42dc 100644 --- a/sys.py/UI/download_process_page.py +++ b/sys.py/UI/download_process_page.py @@ -131,7 +131,7 @@ class DownloadProcessPage(Page): except: pass - self._Screen._MsgBox.SetText(MyLangManager.Tr("DownloadFailed")) + self._Screen._MsgBox.SetText("DownloadFailed") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() return False @@ -164,7 +164,7 @@ class DownloadProcessPage(Page): self._URL = url self._DST_DIR = dst_dir else: - self._Screen._MsgBox.SetText(MyLangManager.Tr("Invaid")) + self._Screen._MsgBox.SetText("Invaid") self._Screen._MsgBox.Draw() self._Screen.SwapAndShow() print("url or dst dir error") diff --git a/sys.py/UI/foot_bar.py b/sys.py/UI/foot_bar.py index 6e717c0..f744fc1 100644 --- a/sys.py/UI/foot_bar.py +++ b/sys.py/UI/foot_bar.py @@ -108,6 +108,7 @@ class FootBar: def UpdateNavText(self,texts): self._State = "tips" + texts = MyLangManager.Tr(texts) my_text = self._LabelFont.render(texts,True,self._SkinManager.GiveColor("Text")) """ _w = 0 @@ -152,7 +153,7 @@ class FootBar: for idx,x in enumerate(barr): try: - self._Icons[x]._Label.SetText(texts[idx]) + self._Icons[x]._Label.SetText(MyLangManager.Tr(texts[idx])) except IndexError: print("Index "+x+" doesn't exist!") diff --git a/sys.py/UI/icon_item.py b/sys.py/UI/icon_item.py index 39e9110..63b17ca 100644 --- a/sys.py/UI/icon_item.py +++ b/sys.py/UI/icon_item.py @@ -66,7 +66,7 @@ class IconItem: self._LinkPage._Screen = self._Parent._Screen self._LinkPage._CanvasHWND = self._Parent._Screen._CanvasHWND - self._LinkPage._FootMsg = [MyLangManager.Tr("Nav"),"","",MyLangManager.Tr("Back"),MyLangManager.Tr("Enter")] ## Default Page Foot info + self._LinkPage._FootMsg = ["Nav","","","Back","Enter"] ## Default Page Foot info if self._LinkPage._Align == ALIGN["HLeft"]: self._LinkPage.AdjustHLeftAlign() diff --git a/sys.py/UI/lang_manager.py b/sys.py/UI/lang_manager.py index 7904b1d..dbf2d33 100644 --- a/sys.py/UI/lang_manager.py +++ b/sys.py/UI/lang_manager.py @@ -16,7 +16,7 @@ class LangManager(object): _Langs = {} _Config = None - _ConfigFileName = "00_English.ini" + _ConfigFileName = "00_English.ini" ## double % to escape def __init__(self): self.Init() @@ -31,24 +31,25 @@ class LangManager(object): def SetLangs(self): self._Config = CaseConfigParser() - print("SetLangs") + #print("SetLangs") fname = ".lang" try: with open(fname, "r") as f: self._ConfigFileName = f.read() self._ConfigFileName = self._ConfigFileName.strip("\r\n ") - print(self._ConfigFileName) + #print(self._ConfigFileName) except: print("read lang failed") None if self._ConfigFileName == "" or FileExists("langs/"+self._ConfigFileName) == False: - print("miss file") + #print("miss file") self._ConfigFileName = "00_English.ini" else: - print("has file",self._ConfigFileName) + pass + #print("has file",self._ConfigFileName) try: @@ -67,8 +68,9 @@ class LangManager(object): continue def Tr(self,english_key_str): - print("english_key_str", english_key_str) + #print("english_key_str", english_key_str) if english_key_str in self._Langs: + #print( self._Langs[english_key_str] ) return self._Langs[english_key_str].decode("utf8") else: return english_key_str diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py index 38af73b..ca8e576 100644 --- a/sys.py/UI/main_screen.py +++ b/sys.py/UI/main_screen.py @@ -48,7 +48,7 @@ class MessageBox(Label): self._HWND = self._Parent._CanvasHWND def SetText(self,text): - self._Text = text + self._Text = MyLangManager.Tr(text) def PreDraw(self): self._Width = 0 diff --git a/sys.py/UI/page.py b/sys.py/UI/page.py index b78e6a7..985d4a4 100644 --- a/sys.py/UI/page.py +++ b/sys.py/UI/page.py @@ -100,7 +100,7 @@ class Page(object): _Name = "" _Screen = None ## Should be the Screen Class _PageIconMargin = 20 - _FootMsg = [MyLangManager.Tr("Nav"),"","","",MyLangManager.Tr("Enter")] ## Default Page Foot info + _FootMsg = ["Nav","","","","Enter"] ## Default Page Foot info _SelectedIconTopOffset=20 _EasingDur = 30 diff --git a/sys.py/UI/title_bar.py b/sys.py/UI/title_bar.py index 5e31c97..324c265 100644 --- a/sys.py/UI/title_bar.py +++ b/sys.py/UI/title_bar.py @@ -297,7 +297,7 @@ class TitleBar: def Draw(self,title): self.ClearCanvas() - + title = MyLangManager.Tr(title) self._Title = title cur_time = datetime.now().strftime("%H:%M") diff --git a/sys.py/langs/00_English.ini b/sys.py/langs/00_English.ini index 2b8340f..28984c8 100644 --- a/sys.py/langs/00_English.ini +++ b/sys.py/langs/00_English.ini @@ -16,6 +16,7 @@ Enter=Enter Remove=Remove Run=Run AddToPlayList=Add to Playlist +Add to Playlist=Add to Playlist DownloadConfirm=Download Confirm MyFavGames=my favourites games Deleting=Deleting... @@ -29,16 +30,18 @@ Cancel=Cancel Yes=Yes ConfirmQ=Confirm? Disconnecting=Disconnecting... -ConfirmUpdateToFQ=Confirm Update to %s ? -UpdateToFQ=Update to %s ? +ConfirmUpdateToFQ=Confirm Update to %%s ? +UpdateToFQ=Update to %%s ? SetupGameEngineAutoQ=Do you want to setup this game engine automatically? Downloading=Downloading... -BATOver5Pct=Battery must over 5% +BATOver5Pct=Battery must over 5%% DeleteConfirm=Delete Confirm FavouriteGames=Favourite Games ConfirmForgetQ=Confirm Forget? ConfirmForget=Confirm Forget Disconnect=Disconnect +ConfirmDisconnectQ=Confirm Disconnect ? +Confirm Disconnect=Confirm Disconnect Forget=Forget Forgeting=Forgeting... Info=Info @@ -62,11 +65,39 @@ CheckingUpdateFailed=Cheking update failed Update=Update Toggle=Toggle Rescue=Rescue -AirplaneMode=Airplane Mode +Airplane Mode=Airplane Mode minutes=minutes seconds=seconds second=second minute=minute Never=Never -PowerOptions=Power Options - +Power Options=Power Options +Languages=Languages +Notify=Notify +Setting List=Setting List +Wi-Fi=Wi-Fi +Bluetooth=Bluetooth +Sound Volume=Sound Volume +Sound Volume=Sound volume +Brightness=Brightness +BackLight Brightness=BackLight Brightness +Storage=Storage +Timezone=Timezone +Timezone Selection=Timezone Selection +Notification=Notification +About=About +Power off=Power off +Buttons Layout=Buttons Layout +UpdateRetroArch=UpdateRetroArch +Wifi scanning=Wifi scanning... +Power option detail=Power option detail +Screen dimming=Screen dimming +Screen OFF=Screen OFF +Power OFF=Power OFF +Power saving=Power saving +Balanced=Balanced +Server=Server +Performance=Performance +Confirm Power OFF?=Confirm Power OFF? +Reboot=Reboot +Shutdown=Shutdown diff --git a/sys.py/langs/03_简体中文.ini b/sys.py/langs/03_简体中文.ini index c1894e4..33b2e76 100644 --- a/sys.py/langs/03_简体中文.ini +++ b/sys.py/langs/03_简体中文.ini @@ -1,6 +1,6 @@ [Langs] Settings=设置 -Retro Games=复古游戏 +Retro Games=经典游戏 Music Player=音乐播放器 TinyCloud=彩云 PowerOFF=关机 @@ -15,6 +15,7 @@ Enter=进入 Remove=删除 Run=运行 AddToPlayList=添加到播放列表 +Add to Playlist=添加到播放列表 DownloadConfirm=下载确认 MyFavGames=加星游戏列表 Deleting=删除中... @@ -27,16 +28,18 @@ Cancel=取消 Yes=是 ConfirmQ=确认? Disconnecting=断开连接... -ConfirmUpdateToFQ=确认升级至 %s ? -UpdateToFQ=更新至 %s ? +ConfirmUpdateToFQ=确认升级至 %%s ? +UpdateToFQ=更新至 %%s ? SetupGameEngineAutoQ=你希望自动安装游戏引擎部件吗? Downloading=下载中... -BATOver5Pct=电量必须多余5% +BATOver5Pct=电量必须多余5%% DeleteConfirm=删除确认 FavouriteGames=偏好游戏 ConfirmForgetQ=确认忽略? ConfirmForget=确认忽略 Disconnect=断开 +ConfirmDisconnectQ=确认断开? +Confirm Disconnect=确认断开 Forget=忽略 Forgeting=忽略中... Info=属性 @@ -49,3 +52,53 @@ ShutDownConnecting=断开连接... Select=选择 Detail=详细 Applying=设置中... +DownloadFailed=下载失败 +LauncherIsUpToDate=Launcher已是最新 +CheckWifiConnection=请检查 Wi-Fi 连接 +TurningOn=打开 +TurningOff=关闭 +Invalid=非法 +CheckingUpdate=检查更新... +CheckingUpdateFailed=检查更新失败 +Update=更新 +Toggle=切换 +Rescue=拯救 +Airplane Mode=飞行模式 +minutes=分 +seconds=秒 +second=秒 +minute=分 +Never=永不 +Power Options=电源选项 +Languages=语言 +Notify=提醒 +Setting List=设置列表 +Wi-Fi=Wi-Fi +Bluetooth=蓝牙 +Sound Volume=音量 +Sound volume=音量 +Brightness=亮度 +BackLight Brightness=背光亮度 +Storage=存储空间 +Timezone=时区 +Timezone Selection=时区选择 +Notification=提醒控件 +About=关于GameShell +Power off=关机 +Buttons Layout=按纽布局 +UpdateRetroArch=更新RetroArch +Wifi scanning=WiFi扫描中 +Power option detail=电源选项 +Screen dimming=屏幕变暗 +Screen OFF=关闭屏幕 +Power OFF=关机 +Power saving=节能 +Balanced=平衡 +Server=服务器 +Performance=性能 +Confirm Power OFF?=确认关机? +Reboot=重启 +Shutdown=关闭 +Play List=播放列表 +Music Library=乐库 +Play/Pause=播放/暂停 diff --git a/sys.py/run.py b/sys.py/run.py index dfce104..707bae9 100644 --- a/sys.py/run.py +++ b/sys.py/run.py @@ -282,7 +282,7 @@ def RecordKeyDns(thekey,main_screen): Keys.append(thekey) keys = ''.join(map(str,Keys)) - print(keys) + #print(keys) if keys == "273273274274276276275275106107":##uuddllrrab crt_screen.Draw() crt_screen.SwapAndShow() @@ -345,7 +345,16 @@ def event_process(event,main_screen): os.chdir( GetExePath()) os.exelp("python","python"," "+myscriptname) return - + if event.type == RESTARTUI: + pygame.quit() + gobject_main_loop.quit() + os.chdir(GetExePath()) + exec_app_cmd = " sync & cd "+GetExePath()+"; exec python "+myscriptname + print(exec_app_cmd) + os.execlp("/bin/sh","/bin/sh","-c", exec_app_cmd) + os.chdir( GetExePath()) + os.exelp("python","python"," "+myscriptname) + return if event.type == POWEROPT: everytime_keydown = time.time()