From f60f38166761559d4976951593f30567cc433867 Mon Sep 17 00:00:00 2001 From: bumpaneer Date: Sun, 10 Apr 2016 21:44:53 -0400 Subject: [PATCH 1/2] update skin xml files to have unique service name --- ...skey.xml => service-LibreELEC-Settings-getPasskey.xml} | 0 ...ndow.xml => service-LibreELEC-Settings-mainWindow.xml} | 0 .../{wizard.xml => service-LibreELEC-Settings-wizard.xml} | 0 src/oe.py | 8 ++++---- src/resources/lib/modules/bluetooth.py | 2 +- src/resources/lib/modules/connman.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename skins/Default/720p/{getPasskey.xml => service-LibreELEC-Settings-getPasskey.xml} (100%) rename skins/Default/720p/{mainWindow.xml => service-LibreELEC-Settings-mainWindow.xml} (100%) rename skins/Default/720p/{wizard.xml => service-LibreELEC-Settings-wizard.xml} (100%) diff --git a/skins/Default/720p/getPasskey.xml b/skins/Default/720p/service-LibreELEC-Settings-getPasskey.xml similarity index 100% rename from skins/Default/720p/getPasskey.xml rename to skins/Default/720p/service-LibreELEC-Settings-getPasskey.xml diff --git a/skins/Default/720p/mainWindow.xml b/skins/Default/720p/service-LibreELEC-Settings-mainWindow.xml similarity index 100% rename from skins/Default/720p/mainWindow.xml rename to skins/Default/720p/service-LibreELEC-Settings-mainWindow.xml diff --git a/skins/Default/720p/wizard.xml b/skins/Default/720p/service-LibreELEC-Settings-wizard.xml similarity index 100% rename from skins/Default/720p/wizard.xml rename to skins/Default/720p/service-LibreELEC-Settings-wizard.xml diff --git a/src/oe.py b/src/oe.py index a9dbecaf9..2130f74c3 100644 --- a/src/oe.py +++ b/src/oe.py @@ -479,9 +479,9 @@ def stop_service(): def openWizard(): global winOeMain, __cwd__, __oe__ try: - winOeMain = oeWindows.wizard('wizard.xml', __cwd__, 'Default', oeMain=__oe__) + winOeMain = oeWindows.wizard('service-LibreELEC-Settings-wizard.xml', __cwd__, 'Default', oeMain=__oe__) winOeMain.doModal() - winOeMain = oeWindows.mainWindow('mainWindow.xml', __cwd__, 'Default', oeMain=__oe__) # None + winOeMain = oeWindows.mainWindow('service-LibreELEC-Settings-mainWindow.xml', __cwd__, 'Default', oeMain=__oe__) # None except Exception, e: xbmc.executebuiltin('Dialog.Close(busydialog)') dbg_log('oe::openWizard', 'ERROR: (' + repr(e) + ')') @@ -490,7 +490,7 @@ def openWizard(): def openConfigurationWindow(): global winOeMain, __cwd__, __oe__, dictModules try: - winOeMain = oeWindows.mainWindow('mainWindow.xml', __cwd__, 'Default', oeMain=__oe__) + winOeMain = oeWindows.mainWindow('service-LibreELEC-Settings-mainWindow.xml', __cwd__, 'Default', oeMain=__oe__) winOeMain.doModal() for strModule in dictModules: dictModules[strModule].exit() @@ -794,7 +794,7 @@ def get_os_release(): CONFIG_CACHE = os.environ.get('CONFIG_CACHE', '/storage/.cache') USER_CONFIG = os.environ.get('USER_CONFIG', '/storage/.config') TEMP = '%s/temp/' % XBMC_USER_HOME -winOeMain = oeWindows.mainWindow('mainWindow.xml', __cwd__, 'Default', oeMain=__oe__) +winOeMain = oeWindows.mainWindow('service-LibreELEC-Settings-mainWindow.xml', __cwd__, 'Default', oeMain=__oe__) if os.path.exists('/etc/machine-id'): SYSTEMID = load_file('/etc/machine-id') else: diff --git a/src/resources/lib/modules/bluetooth.py b/src/resources/lib/modules/bluetooth.py index c42d66c29..e55c6bcac 100644 --- a/src/resources/lib/modules/bluetooth.py +++ b/src/resources/lib/modules/bluetooth.py @@ -569,7 +569,7 @@ def open_context_menu(self, listItem): def open_pinkey_window(self, runtime=60, title=32343): try: self.oe.dbg_log('bluetooth::open_pinkey_window', 'enter_function', 0) - self.pinkey_window = oeWindows.pinkeyWindow('getPasskey.xml', self.oe.__cwd__, 'Default') + self.pinkey_window = oeWindows.pinkeyWindow('service-LibreELEC-Settings-getPasskey.xml', self.oe.__cwd__, 'Default') self.pinkey_window.show() self.pinkey_window.set_title(self.oe._(title)) self.pinkey_timer = pinkeyTimer(self, runtime) diff --git a/src/resources/lib/modules/connman.py b/src/resources/lib/modules/connman.py index eea934d10..c764cd39d 100644 --- a/src/resources/lib/modules/connman.py +++ b/src/resources/lib/modules/connman.py @@ -303,7 +303,7 @@ def __init__(self, servicePath, oeMain): 10: {'Timeservers.Configuration': 'Timeservers'}, } self.oe = oeMain - self.winOeCon = oeWindows.mainWindow('mainWindow.xml', self.oe.__cwd__, 'Default', oeMain=oeMain, isChild=True) + self.winOeCon = oeWindows.mainWindow('service-LibreELEC-Settings-mainWindow.xml', self.oe.__cwd__, 'Default', oeMain=oeMain, isChild=True) self.servicePath = servicePath self.oe.dictModules['connmanNetworkConfig'] = self self.service = dbus.Interface(self.oe.dbusSystemBus.get_object('net.connman', servicePath), 'net.connman.Service') From d0dfc2304e7dc71155bcc0eb6eae23d4166712d5 Mon Sep 17 00:00:00 2001 From: bumpaneer Date: Sun, 10 Apr 2016 21:45:31 -0400 Subject: [PATCH 2/2] remove hardcoded color value from python --- skins/Default/720p/service-LibreELEC-Settings-mainWindow.xml | 4 ++-- src/resources/lib/modules/bluetooth.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skins/Default/720p/service-LibreELEC-Settings-mainWindow.xml b/skins/Default/720p/service-LibreELEC-Settings-mainWindow.xml index f641b1e82..3a3ecd500 100644 --- a/skins/Default/720p/service-LibreELEC-Settings-mainWindow.xml +++ b/skins/Default/720p/service-LibreELEC-Settings-mainWindow.xml @@ -1021,7 +1021,7 @@ 20 font12 blue - + @@ -1214,7 +1214,7 @@ 20 font12 blue - + diff --git a/src/resources/lib/modules/bluetooth.py b/src/resources/lib/modules/bluetooth.py index e55c6bcac..907332a3f 100644 --- a/src/resources/lib/modules/bluetooth.py +++ b/src/resources/lib/modules/bluetooth.py @@ -484,9 +484,9 @@ def menu_connections(self, focusItem=None): value = self.dbusDevices[dbusDevice][name] if name == 'Connected': if value: - dictProperties['ConnectedState'] = self.oe._(32333) + '[COLOR white]' + self.oe._(32334) + '[/COLOR]' + dictProperties['ConnectedState'] = self.oe._(32334) else: - dictProperties['ConnectedState'] = self.oe._(32333) + '[COLOR white]' + self.oe._(32335) + '[/COLOR]' + dictProperties['ConnectedState'] = self.oe._(32335) if properties[prop]['type'] == 1: value = unicode(int(value)) if properties[prop]['type'] == 2: