Merge pull request #12 from bumpaneer/master

Update Skin XML Files
LibreELEC · Apr 11, 2016 · e93bf33 · e93bf33
2 parents 69d7952 + d0dfc23
commit e93bf33
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/skins/Default/720p/getPasskey.xml → ...service-LibreELEC-Settings-getPasskey.xml b/skins/Default/720p/getPasskey.xml → ...service-LibreELEC-Settings-getPasskey.xml
diff --git a/skins/Default/720p/mainWindow.xml → ...service-LibreELEC-Settings-mainWindow.xml b/skins/Default/720p/mainWindow.xml → ...service-LibreELEC-Settings-mainWindow.xml
@@ -1021,7 +1021,7 @@
                             <height>20</height>
                             <font>font12</font>
                             <textcolor>blue</textcolor>
-                            <label>$INFO[ListItem.Property(ConnectedState)]</label>
+                            <label>$ADDON[service.libreelec.settings 32333][COLOR=white]$INFO[ListItem.Property(ConnectedState)][/COLOR]</label>
                         </control>
                         <!-- Paired Symbol (bottom right) -->
                         <control type="image">
@@ -1214,7 +1214,7 @@
                             <height>20</height>
                             <font>font12</font>
                             <textcolor>blue</textcolor>
-                            <label>$INFO[ListItem.Property(ConnectedState)]</label>
+                            <label>$ADDON[service.libreelec.settings 32333][COLOR=white]$INFO[ListItem.Property(ConnectedState)][/COLOR]</label>
                         </control>
                         <!-- Paired Symbol (bottom right) -->
                         <control type="image">

diff --git a/skins/Default/720p/wizard.xml → ...20p/service-LibreELEC-Settings-wizard.xml b/skins/Default/720p/wizard.xml → ...20p/service-LibreELEC-Settings-wizard.xml
diff --git 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
@@ -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:
@@ -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
@@ -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')