diff --git a/platformcode/keymaptools.py b/platformcode/keymaptools.py index 66270a50..5997427c 100644 --- a/platformcode/keymaptools.py +++ b/platformcode/keymaptools.py @@ -7,7 +7,7 @@ import xbmcaddon import xbmcgui from channelselector import get_thumb -from platformcode import config +from platformcode import config, logger class KeyListener(xbmcgui.WindowXMLDialog): @@ -168,6 +168,9 @@ class Main(xbmcgui.WindowXMLDialog): def open_shortcut_menu(): - main = Main('ShortCutMenu.xml', config.get_runtime_path()) + XML = 'ShortCutMenu.xml' + if config.get_setting('icon_set') == 'dark': + XML = 'Dark' + XML + main = Main(XML, config.get_runtime_path()) main.doModal() del main diff --git a/platformcode/xbmc_config_menu.py b/platformcode/xbmc_config_menu.py index c31be558..b3e87a25 100644 --- a/platformcode/xbmc_config_menu.py +++ b/platformcode/xbmc_config_menu.py @@ -354,7 +354,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): return ok def add_control_label(self, c): - control = xbmcgui.ControlLabel(0, -100, self.controls_width, 30, "", alignment=4, font=self.font, + control = xbmcgui.ControlLabel(0, -100, self.controls_width, 40, "", alignment=4, font=self.font, textColor=c["color"]) self.addControl(control) @@ -366,20 +366,20 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): c["control"] = control def add_control_list(self, c): - control = xbmcgui.ControlButton(0, -100, self.controls_width, self.height_control, + control = xbmcgui.ControlButton(0, -100, self.controls_width + 20, self.height_control, c["label"], os.path.join(self.mediapath, 'Controls', 'MenuItemFO.png'), os.path.join(self.mediapath, 'Controls', 'MenuItemNF.png'), - 0, textColor=c["color"], + 10, textColor=c["color"], font=self.font) - label = xbmcgui.ControlLabel(0, -100, self.controls_width - 30, self.height_control, - "", font=self.font, textColor=c["color"], alignment=4 | 1) + label = xbmcgui.ControlLabel(0, -100, self.controls_width - 80, self.height_control, + "", font=self.font, textColor=c["color"], alignment= 1 | 4) - upBtn = xbmcgui.ControlButton(0, -100, 20, 15, "", + upBtn = xbmcgui.ControlButton(0, -100, 15, 7, "", focusTexture=os.path.join(self.mediapath, 'Controls', 'spinUp-Focus.png'), noFocusTexture=os.path.join(self.mediapath, 'Controls', 'spinUp-noFocus.png')) - downBtn = xbmcgui.ControlButton(0, -100 + 15, 20, 15, "", + downBtn = xbmcgui.ControlButton(0, -100 + 15, 15, 7, "", focusTexture=os.path.join(self.mediapath, 'Controls', 'spinDown-Focus.png'), noFocusTexture=os.path.join(self.mediapath, 'Controls', 'spinDown-noFocus.png')) @@ -431,14 +431,14 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): def add_control_bool(self, c): # Versiones antiguas no admite algunas texturas if xbmcgui.__version__ in ["1.2", "2.0"]: - control = xbmcgui.ControlRadioButton(0 - 10, -100, self.controls_width + 10, self.height_control, + control = xbmcgui.ControlRadioButton(0, -100, self.controls_width + 20, self.height_control, label=c["label"], font=self.font, textColor=c["color"], focusTexture=os.path.join(self.mediapath, 'Controls', 'MenuItemFO.png'), noFocusTexture=os.path.join(self.mediapath, 'Controls', 'MenuItemNF.png')) else: - control = xbmcgui.ControlRadioButton(0 - 10, -100, self.controls_width + 10, + control = xbmcgui.ControlRadioButton(0, -100, self.controls_width + 20, self.height_control, label=c["label"], font=self.font, textColor=c["color"], focusTexture=os.path.join(self.mediapath, 'Controls', @@ -491,11 +491,11 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): self.getControl(10005).getPosition()[1]) # Obtenemos las dimensiones del area de controles - self.controls_width = self.getControl(10007).getWidth() - 20 - self.controls_height = self.getControl(10007).getHeight() + self.controls_width = self.getControl(10007).getWidth() - 30 + self.controls_height = self.getControl(10007).getHeight() -100 self.controls_pos_x = self.getControl(10007).getPosition()[0] + self.getControl(10001).getPosition()[0] + 10 self.controls_pos_y = self.getControl(10007).getPosition()[1] + self.getControl(10001).getPosition()[1] - self.height_control = 35 + self.height_control = 40 self.font = "font12" # En versiones antiguas: creamos 5 controles, de lo conrtario al hacer click al segundo control, @@ -619,7 +619,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): if c["type"] != "list": if c["type"] == "bool": - c["control"].setPosition(self.controls_pos_x - 10, c["y"]) + c["control"].setPosition(self.controls_pos_x, c["y"]) else: c["control"].setPosition(self.controls_pos_x, c["y"]) @@ -629,8 +629,8 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): c["label"].setPosition(self.controls_pos_x + self.controls_width - 30, c["y"]) else: c["label"].setPosition(self.controls_pos_x, c["y"]) - c["upBtn"].setPosition(self.controls_pos_x + c["control"].getWidth() - 25, c["y"] + 3) - c["downBtn"].setPosition(self.controls_pos_x + c["control"].getWidth() - 25, c["y"] + 18) + c["upBtn"].setPosition(self.controls_pos_x + c["control"].getWidth() - 40, c["y"] + 15) + c["downBtn"].setPosition(self.controls_pos_x + c["control"].getWidth() - 25, c["y"] + 15) self.set_visible(c, True) @@ -962,7 +962,7 @@ class ControlEdit(xbmcgui.ControlButton): self.label = "" self.text = "" self.textControl = xbmcgui.ControlLabel(self.getX(), self.getY(), self.getWidth(), self.getHeight(), self.text, - font=kwargs["font"], textColor=kwargs["textColor"], alignment=4 | 1) + font=kwargs["font"], textColor=kwargs["textColor"], alignment= 4 | 1) self.window.addControl(self.textControl) def setLabel(self, val): diff --git a/resources/skins/Default/720p/ChannelSettings.xml b/resources/skins/Default/720p/ChannelSettings.xml index 4f3c8e4e..06c64a8d 100644 --- a/resources/skins/Default/720p/ChannelSettings.xml +++ b/resources/skins/Default/720p/ChannelSettings.xml @@ -1,6 +1,14 @@ - false + false + + + + + + + + 240 @@ -10,16 +18,11 @@ 800 500 - Windows/DialogBack.png - - - 40 - 800 - Windows/dialogheader.png + Shortcut/dialog-bg-solid.png - 10 - 10 + 15 + 50 34 725 font12_title @@ -29,18 +32,18 @@ - 735 - 15 - 50 - 30 + 745 + 25 + 20 + 20 Controls/DialogCloseButton-focus.png Controls/DialogCloseButton.png - 155 - 445 - 120 - 30 + 40 + 410 + 200 + 50 110 Controls/KeyboardKey.png Controls/KeyboardKeyNF.png @@ -49,10 +52,10 @@ - 325 - 445 - 120 - 30 + 300 + 410 + 200 + 50 110 Controls/KeyboardKey.png Controls/KeyboardKeyNF.png @@ -61,10 +64,10 @@ - 495 - 445 - 120 - 30 + 560 + 410 + 200 + 50 110 Controls/KeyboardKey.png Controls/KeyboardKeyNF.png @@ -73,20 +76,15 @@ - 45 + 80 20 745 387 - - 745 - 387 - Windows/BackControls.png - - 0 + 30 0 745 - 387 + 300 font16 0xFFFFFFFF center @@ -95,17 +93,18 @@ - 45 - 770 + 80 + 780 10 - 387 + 300 + 0xFFFFFFFF Controls/ScrollBack.png - 45 - 770 + 80 + 780 10 - 387 + 300 Controls/ScrollBar.png diff --git a/resources/skins/Default/720p/DarkShortCutMenu.xml b/resources/skins/Default/720p/DarkShortCutMenu.xml new file mode 100644 index 00000000..fb98c257 --- /dev/null +++ b/resources/skins/Default/720p/DarkShortCutMenu.xml @@ -0,0 +1,163 @@ + + + 0.52 + + 200 + 250 + + 32500 + + + + + + + + + + + -200 + -250 + 1280 + 720 + Shortcut/white.png + Shortcut/white.png + Action(close) + + + 0 + 0 + 880 + 220 + Shortcut/white.png + + + + + -21 + 0 + 1011 + 220 + Shortcut/dialogbutton-nofo.png + + + -130 + 0 + 880 + 220 + 32501 + 61 + horizontal + 200 + 61 + Conditional + Conditional + + + + 0 + 0 + 220 + 220 + Shortcut/button-nofo.png + + + 30 + 149 + 306 + 75 + Shortcut/black.png + + + 35 + 35 + 150 + 150 + $INFO[ListItem.Property(thumb)] + keep + center + + + 329 + 24 + 50 + 50 + keep + $INFO[ListItem.Overlay] + + + + + 0.10 + + 220 + 220 + Shortcut/button-nofo.png + Unfocus + Focus + + + 220 + 220 + Shortcut/button-fo.png + Unfocus + + + 5 + 24 + 50 + 50 + keep + $INFO[ListItem.Overlay] + + + 23 + 149 + 298 + 75 + Shortcut/black.png + + + 35 + 35 + 150 + 150 + $INFO[ListItem.Property(thumb)] + keep + center + + + 0 + 146 + 220 + 74 + font12 + + center + center + + + + + + -120 + 220 + 880 + 10 + Shortcut/white.png + Shortcut/white.png + Shortcut/white.png + - + - + false + horizontal + 32500 + 32500 + 32500 + 32500 + Conditional + + + + + diff --git a/resources/skins/Default/720p/ShortCutMenu.xml b/resources/skins/Default/720p/ShortCutMenu.xml index 6ccd86ca..6f8b50d0 100644 --- a/resources/skins/Default/720p/ShortCutMenu.xml +++ b/resources/skins/Default/720p/ShortCutMenu.xml @@ -2,96 +2,48 @@ 0.52 - 147 - 180 + 200 + 250 32500 - + - + - - 0 - 0 - 969 - 283 - Shortcut/dialog-bg-solid.png + + -200 + -250 + 1280 + 720 + Shortcut/white.png + Shortcut/white.png + Action(close) 0 0 - 969 - 70 - Shortcut/white70.png - - - - -1920 - -1080 - 5760 - 3240 - - - - - Action(close) - - - button overlay to avoid closing in dialog area - 0 - 0 - 969 - 283 - - - - - noop - - - 969 - 11 - 48 - 48 - 48 - 48 - - - - - - Conditional - Shortcut/close.png - Shortcut/close.png - Shortcut/close.png - Shortcut/logo.png - Action(close) - 32500 - 32500 + 880 + 220 + Shortcut/white.png -21 - 50 + 0 1011 - 253 - Shortcut/dialogbutton-nofo.png + 220 + Shortcut/dialogbutton-nofo.png - -139 - 55 - 980 + -130 + 0 + 880 220 32501 61 @@ -100,14 +52,14 @@ 61 Conditional Conditional - - 2 + + - 5 - 10 - 347 - 260 - Shortcut/button-nofo.png + 0 + 0 + 220 + 220 + Shortcut/button-nofo.png 30 @@ -117,10 +69,10 @@ Shortcut/black.png - 95 - 23 - 160 - 130 + 35 + 35 + 150 + 150 $INFO[ListItem.Property(thumb)] keep center @@ -133,39 +85,21 @@ keep $INFO[ListItem.Overlay] - - 25 - 146 - 300 - 74 - - text_shadow - font12 - center - center - - + 0.10 - - - - - - - 2 - 340 - 245 - Shortcut/button-nofo.png + 220 + 220 + Shortcut/button-nofo.png Unfocus Focus - 340 - 237 - Shortcut/button-fo.png + 220 + 220 + Shortcut/button-fo.png Unfocus @@ -184,18 +118,18 @@ Shortcut/black.png - 95 - 23 - 160 - 130 + 35 + 35 + 150 + 150 $INFO[ListItem.Property(thumb)] keep center - 25 + 0 146 - 300 + 220 74 font12 @@ -206,13 +140,13 @@ - -122 - 280 - 972 - 15 - Shortcut/white.png - Shortcut/white.png - Shortcut/white.png + -120 + 220 + 880 + 10 + Shortcut/white.png + Shortcut/white.png + Shortcut/white.png - - false diff --git a/resources/skins/Default/720p/side_menu.xml b/resources/skins/Default/720p/side_menu.xml index 8403b14f..97e646c6 100644 --- a/resources/skins/Default/720p/side_menu.xml +++ b/resources/skins/Default/720p/side_menu.xml @@ -7,8 +7,8 @@ 1 - - + + 0 0 diff --git a/resources/skins/Default/media/Controls/DialogCloseButton-focus.png b/resources/skins/Default/media/Controls/DialogCloseButton-focus.png index c4e57d66..0eb9e133 100644 Binary files a/resources/skins/Default/media/Controls/DialogCloseButton-focus.png and b/resources/skins/Default/media/Controls/DialogCloseButton-focus.png differ diff --git a/resources/skins/Default/media/Controls/DialogCloseButton.png b/resources/skins/Default/media/Controls/DialogCloseButton.png index fff67ae1..cd9e52f0 100644 Binary files a/resources/skins/Default/media/Controls/DialogCloseButton.png and b/resources/skins/Default/media/Controls/DialogCloseButton.png differ diff --git a/resources/skins/Default/media/Controls/ScrollBack.png b/resources/skins/Default/media/Controls/ScrollBack.png index af69f805..07f88c5c 100644 Binary files a/resources/skins/Default/media/Controls/ScrollBack.png and b/resources/skins/Default/media/Controls/ScrollBack.png differ diff --git a/resources/skins/Default/media/Controls/check_mark.png b/resources/skins/Default/media/Controls/check_mark.png index dce6caf7..76b618bd 100644 Binary files a/resources/skins/Default/media/Controls/check_mark.png and b/resources/skins/Default/media/Controls/check_mark.png differ diff --git a/resources/skins/Default/media/Controls/radiobutton-focus.png b/resources/skins/Default/media/Controls/radiobutton-focus.png index d471e1e3..286e09f8 100644 Binary files a/resources/skins/Default/media/Controls/radiobutton-focus.png and b/resources/skins/Default/media/Controls/radiobutton-focus.png differ diff --git a/resources/skins/Default/media/Controls/radiobutton-nofocus.png b/resources/skins/Default/media/Controls/radiobutton-nofocus.png index f64180f3..d8e60822 100644 Binary files a/resources/skins/Default/media/Controls/radiobutton-nofocus.png and b/resources/skins/Default/media/Controls/radiobutton-nofocus.png differ diff --git a/resources/skins/Default/media/Controls/spinDown-Focus.png b/resources/skins/Default/media/Controls/spinDown-Focus.png index 8f510325..31d02dae 100644 Binary files a/resources/skins/Default/media/Controls/spinDown-Focus.png and b/resources/skins/Default/media/Controls/spinDown-Focus.png differ diff --git a/resources/skins/Default/media/Controls/spinDown-noFocus.png b/resources/skins/Default/media/Controls/spinDown-noFocus.png index bfbb20f7..4987fbbc 100644 Binary files a/resources/skins/Default/media/Controls/spinDown-noFocus.png and b/resources/skins/Default/media/Controls/spinDown-noFocus.png differ diff --git a/resources/skins/Default/media/Controls/spinUp-Focus.png b/resources/skins/Default/media/Controls/spinUp-Focus.png index c6a8f523..0ce1fcc5 100644 Binary files a/resources/skins/Default/media/Controls/spinUp-Focus.png and b/resources/skins/Default/media/Controls/spinUp-Focus.png differ diff --git a/resources/skins/Default/media/Controls/spinUp-noFocus.png b/resources/skins/Default/media/Controls/spinUp-noFocus.png index 084ff22d..cbbc1b70 100644 Binary files a/resources/skins/Default/media/Controls/spinUp-noFocus.png and b/resources/skins/Default/media/Controls/spinUp-noFocus.png differ diff --git a/resources/skins/Default/media/Shortcut/button-fo.png b/resources/skins/Default/media/Shortcut/button-fo.png index a161d6ef..f6368603 100644 Binary files a/resources/skins/Default/media/Shortcut/button-fo.png and b/resources/skins/Default/media/Shortcut/button-fo.png differ