From e4fef8297e5de01efe838e6c536f7412abce08cc Mon Sep 17 00:00:00 2001 From: dazedcrazy Date: Wed, 16 May 2018 18:33:43 +0100 Subject: [PATCH 1/2] contextmenu changes --- resources/lib/context_entry.py | 2 +- .../script-emby-connect-login-manual.xml | 145 --------- .../1080i/script-emby-connect-login.xml | 179 ----------- .../script-emby-connect-server-manual.xml | 154 ---------- .../1080i/script-emby-connect-server.xml | 280 ------------------ .../1080i/script-emby-connect-users.xml | 198 ------------- ...by-context.xml => script-plex-context.xml} | 14 +- resources/skins/default/media/logo-white.png | Bin 2078 -> 0 bytes .../{emby-bg-fade.png => plex-bg-fade.png} | Bin .../media/{emby-icon.png => plex-icon.png} | Bin resources/skins/default/media/plex-logo.png | Bin 0 -> 6172 bytes ...{emby-separator.png => plex-separator.png} | Bin .../skins/default/media/qrcode_disclaimer.png | Bin 7694 -> 0 bytes 13 files changed, 8 insertions(+), 964 deletions(-) delete mode 100644 resources/skins/default/1080i/script-emby-connect-login-manual.xml delete mode 100644 resources/skins/default/1080i/script-emby-connect-login.xml delete mode 100644 resources/skins/default/1080i/script-emby-connect-server-manual.xml delete mode 100644 resources/skins/default/1080i/script-emby-connect-server.xml delete mode 100644 resources/skins/default/1080i/script-emby-connect-users.xml rename resources/skins/default/1080i/{script-emby-context.xml => script-plex-context.xml} (92%) delete mode 100644 resources/skins/default/media/logo-white.png rename resources/skins/default/media/{emby-bg-fade.png => plex-bg-fade.png} (100%) rename resources/skins/default/media/{emby-icon.png => plex-icon.png} (100%) create mode 100644 resources/skins/default/media/plex-logo.png rename resources/skins/default/media/{emby-separator.png => plex-separator.png} (100%) delete mode 100644 resources/skins/default/media/qrcode_disclaimer.png diff --git a/resources/lib/context_entry.py b/resources/lib/context_entry.py index fa5fd414..b38b27ae 100644 --- a/resources/lib/context_entry.py +++ b/resources/lib/context_entry.py @@ -115,7 +115,7 @@ class ContextMenu(object): # Addon settings options.append(OPTIONS['Addon']) context_menu = context.ContextMenu( - "script-emby-context.xml", + "script-plex-context.xml", Addon('plugin.video.plexkodiconnect').getAddonInfo('path'), "default", "1080i") diff --git a/resources/skins/default/1080i/script-emby-connect-login-manual.xml b/resources/skins/default/1080i/script-emby-connect-login-manual.xml deleted file mode 100644 index 57e4a88a..00000000 --- a/resources/skins/default/1080i/script-emby-connect-login-manual.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - 200 - 0 - dialogeffect - - - Background fade - 100% - 100% - emby-bg-fade.png - - - - 600 - 35% - 20% - - Background box - white.png - 600 - 480 - - - - 485 - False - - Error box - white.png - 100% - 50 - - - - Error message - white - font10 - center - center - 50 - - - - - Emby logo - logo-white.png - keep - 120 - 49 - 30 - 25 - - - - 500 - 50 - - Please sign in - - white - font12 - top - center - 100% - 100 - - - - 150 - - Username - - ffa6a6a6 - font10 - top - - - - separator - 102% - 0.5 - 66 - -10 - emby-separator.png - - - - - Password - 225 - - Password label - - ffa6a6a6 - font10 - top - - - - separator - 102% - 0.5 - 66 - -10 - emby-separator.png - - - - - Buttons - 335 - - Sign in - box.png - box.png - - font10 - ffa6a6a6 - white - center - 100% - 50 - 201 - - - - Cancel - box.png - box.png - - font10 - ffa6a6a6 - white - center - 100% - 50 - 55 - 200 - - - - - - \ No newline at end of file diff --git a/resources/skins/default/1080i/script-emby-connect-login.xml b/resources/skins/default/1080i/script-emby-connect-login.xml deleted file mode 100644 index cb69387c..00000000 --- a/resources/skins/default/1080i/script-emby-connect-login.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - 200 - 0 - dialogeffect - - - Background fade - 100% - 100% - emby-bg-fade.png - - - - 600 - 35% - 15% - - Background box - white.png - 600 - 700 - - - - 705 - False - - Error box - white.png - 100% - 50 - - - - Error message - white - font10 - center - center - 50 - - - - - Emby logo - logo-white.png - 160 - 49 - 30 - 25 - - - - 500 - 50 - - Sign in emby connect - - white - font12 - top - 115 - - - - 190 - - Username email - - ffa6a6a6 - font10 - top - - - - separator - 102% - 0.5 - 66 - -10 - emby-separator.png - - - - - Password - 275 - - Password label - - ffa6a6a6 - font10 - top - - - - separator - 102% - 0.5 - 66 - -10 - emby-separator.png - - - - - Buttons - 385 - - Sign in - box.png - box.png - - font10 - ffa6a6a6 - white - center - 100% - 50 - 201 - - - - Cancel - box.png - box.png - - font10 - ffa6a6a6 - white - center - 100% - 50 - 55 - 200 - - - - - Disclaimer - 510 - - Disclaimer label - - font10 - ff464646 - true - top - 340 - 100% - - - - - Scan me - - font12 - ff0b8628 - top - 200 - 120 - 230 - - - - qrcode - qrcode_disclaimer.png - 140 - 140 - 10 - 360 - - - - - - - \ No newline at end of file diff --git a/resources/skins/default/1080i/script-emby-connect-server-manual.xml b/resources/skins/default/1080i/script-emby-connect-server-manual.xml deleted file mode 100644 index 27e50037..00000000 --- a/resources/skins/default/1080i/script-emby-connect-server-manual.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - 200 - 0 - dialogeffect - - - Background fade - 100% - 100% - emby-bg-fade.png - - - - 600 - 35% - 20% - - Background box - white.png - 600 - 525 - - - - 530 - False - - Error box - white.png - 100% - 50 - - - - Error message - white - font10 - center - center - 50 - - - - - Emby logo - logo-white.png - keep - 120 - 49 - 30 - 25 - - - - 500 - 50 - - Connect to server - - white - font12 - top - center - 100% - 100 - - - - 150 - - Host - - ffa6a6a6 - font10 - top - - - - separator - 102% - 0.5 - 66 - -10 - emby-separator.png - - - - Host example - - ff464646 - font10 - top - 70 - - - - - Port - 275 - - Port label - - ffa6a6a6 - font10 - top - - - - separator - 102% - 0.5 - 66 - -10 - emby-separator.png - - - - - Buttons - 380 - - Connect - box.png - box.png - - font10 - ffa6a6a6 - white - center - 100% - 50 - 201 - - - - Cancel - box.png - box.png - - font10 - ffa6a6a6 - white - center - 100% - 50 - 55 - 200 - - - - - - \ No newline at end of file diff --git a/resources/skins/default/1080i/script-emby-connect-server.xml b/resources/skins/default/1080i/script-emby-connect-server.xml deleted file mode 100644 index bc751e8c..00000000 --- a/resources/skins/default/1080i/script-emby-connect-server.xml +++ /dev/null @@ -1,280 +0,0 @@ - - - 205 - 0 - dialogeffect - - - Background fade - 100% - 100% - emby-bg-fade.png - - - - 450 - 38% - 15% - - Background box - white.png - 450 - 710 - - - - Emby logo - logo-white.png - keep - 120 - 49 - 30 - 25 - - - - User info - 70 - 350 - 50 - - User image - userflyoutdefault.png - keep - center - 100% - 70 - 40 - - - - Busy animation - center - 23 - 100% - 105 - False - fading_circle.png - keep - conditional - - - - Welcome user - white - font12 - center - top - 120 - 100% - 50 - - - - separator - 102% - 0.5 - 165 - -10 - emby-separator.png - - - - Select server - ffa6a6a6 - - font10 - center - top - 170 - 100% - 50 - - - - - 290 - 100% - 184 - - Connect servers - 0 - 100% - 100% - 10 - 55 - 155 - 205 - 206 - 205 - 206 - 155 - 60 - 250 - - - 45 - 45 - - Network - keep - network.png - StringCompare(ListItem.Property(server_type),network) - - - Wifi - keep - wifi.png - StringCompare(ListItem.Property(server_type),wifi) - - - - - 300 - 40 - 55 - font10 - center - ff838383 - ListItem.Label - - - - - 45 - 45 - - Network - keep - network.png - StringCompare(ListItem.Property(server_type),network) - - - Wifi - keep - wifi.png - StringCompare(ListItem.Property(server_type),wifi) - - - - - 300 - 40 - 55 - font10 - center - white - ListItem.Label - Control.HasFocus(155) - - - 300 - 40 - 55 - font10 - center - ff838383 - ListItem.Label - !Control.HasFocus(155) - - - - - - 395 - 10 - 5 - 100% - 155 - 60 - 60 - box.png - box.png - box.png - false - - - - 100% - 220 - - 45 - 150 - - True - Sign in Connect - box.png - box.png - - font10 - ffa6a6a6 - white - center - 350 - 50 - 50 - 155 - 206 - - - - Manually add server - box.png - box.png - - font10 - ffa6a6a6 - white - center - 55 - 350 - 50 - 50 - 205 - 155 - 201 - - - - Cancel - box.png - box.png - - font10 - ffa6a6a6 - white - center - 110 - 350 - 50 - 50 - 206 - - - - - 100% - False - - Message box - white.png - 100% - 50 - 20 - - - - Message - white - font10 - center - center - 50 - 20 - - - - - - - \ No newline at end of file diff --git a/resources/skins/default/1080i/script-emby-connect-users.xml b/resources/skins/default/1080i/script-emby-connect-users.xml deleted file mode 100644 index 0acd2b32..00000000 --- a/resources/skins/default/1080i/script-emby-connect-users.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - 155 - 0 - dialogeffect - - - Background fade - 100% - 100% - emby-bg-fade.png - - - - 715 - 32% - 20% - - Background box - white.png - 100% - 525 - - - - Emby logo - logo-white.png - keep - 120 - 49 - 30 - 25 - - - - Please sign in - - white - font12 - top - center - 80 - 100% - - - - 100 - 620 - 245 - 50 - - Select User - 0 - 100% - 40 - 155 - 155 - 200 - 60 - horizontal - 250 - - - 150 - - User image - ff888888 - ListItem.Icon - keep - 100% - 150 - - - - Background label - white.png - 100% - 50 - 150 - - - - 100% - center - 50 - 150 - font10 - white - ListItem.Label - - - - - - 150 - - User image - ListItem.Icon - keep - 100% - 150 - Control.HasFocus(155) - - - User image - ff888888 - ListItem.Icon - keep - 100% - 150 - !Control.HasFocus(155) - - - - Background label - white.png - 100% - 50 - 150 - Control.HasFocus(155) - - - Background label - white.png - 100% - 50 - 150 - !Control.HasFocus(155) - - - - 100% - center - 50 - 150 - font10 - white - ListItem.Label - - - - - - - 100% - 615 - 5 - 155 - 60 - 60 - box.png - box.png - box.png - false - horizontal - - - - 615 - 325 - 100% - - - Manual Login button - box.png - box.png - - center - 100% - 50 - 35 - font10 - ffa6a6a6 - white - 201 - 155 - - - - Cancel - box.png - box.png - - font10 - ffa6a6a6 - white - center - 100% - 50 - 90 - 200 - - - - - - - \ No newline at end of file diff --git a/resources/skins/default/1080i/script-emby-context.xml b/resources/skins/default/1080i/script-plex-context.xml similarity index 92% rename from resources/skins/default/1080i/script-emby-context.xml rename to resources/skins/default/1080i/script-plex-context.xml index df4f0588..380f2a9a 100644 --- a/resources/skins/default/1080i/script-emby-context.xml +++ b/resources/skins/default/1080i/script-plex-context.xml @@ -8,7 +8,7 @@ Background fade 100% 100% - emby-bg-fade.png + plex-bg-fade.png @@ -22,12 +22,12 @@ - Emby logo - emby-icon.png + Plex logo + plex-logo.png keep - 30 + 34 20 - 370 + -285 @@ -36,7 +36,7 @@ keep 34 20 - 285 + 370 @@ -45,7 +45,7 @@ 0.5 70 -5 - emby-separator.png + plex-separator.png diff --git a/resources/skins/default/media/logo-white.png b/resources/skins/default/media/logo-white.png deleted file mode 100644 index c4cf11a339ec332b2b29d290ede3236af7d0bb9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2078 zcmbW2dpHx`AIB$^%g->kNUMJx@>1_xt_*^E=NupYxp8dB4y3Jm-(|iFYK}0i{)? z0RR9HheeaN=C-Y2At}BUCq`cF1OUV+j(9R=Yq{}18mY=*Yv)J&yW}7F7W}pUYX71C zi|ZfZ-|zaB{2!JdY5X+)%;6{bi(qqe)4IfrTz%|(y$7`LAiffPn5}D9W=Z5?%{WHS zXBzw(FIYT2@_t1a-0Xk1mvOV>s!OfY$8U>$!XEZ$LBUAg{oyRnIye5(*x08x{lZ?> zK=Oy>9Z_3v?fM6aa2#Nt;jwmO81(s-inM4^rVJK)Z12W9abpru30RcK*gMUMS`>_S z`<;|n7#wJ+L5RZH4NYsY$X^ly@DsNTU>Piq&kvAv+yrl*7m zeef_n6u+(q7NlGZ93EWaNZz5h*YDk>FWg36*9B8qGA<{esKz4j9YeRAv1kSnvq%f4 zj0lc1zng%&Tk`cxjnp#sbl(0$NAK+zjjXStQ2-#*a=6?sS%awZoVMan&a*;9-imnb}{)I{;xR0Z|J=xgAk|qlBf#bd$&<*F(~uv zK(JB8{kX9_;dGalSQ&9Xx*3ss+L<0Y&XxUYIuRLB>E);KQtN8Q?ykl{-qH5Llo&Bl zR??|Nbd*%94b1(!!rV8d?KKMp0X37}Lc#3pY}!Wl&8GB6%S^;0V^9)ZY{UMfO7WKf zGr)ctT#Ueba^w6#^)v%ae#aYPX-G}IP)kLd@u>^1V~LXj`OmWB^e$W7cI@4~TTj%% zN_R#z$3{#XvF9<`cUIPt834cY)nB=~fe1dIq-i{PS#jDrL~Q_V-1&qal;ni^=6S%{ zY*5}vnngW`hWHe-jBw=%?t>16?kefN4^|vuC!QuEI!PYN>4hs6mYq-$K+zS`oc;Mu zdQ+bKWCXP|IpLx)#y7S*FFgsJYK@a`k%kZ^#_wWYczQw1m4ko~vyF_eaOiL6!&u<0 ziK!@EO7}gk?GK!ZTFr-bO7(@&lC_PtAm)8j+CM* z*rBYJeCEOX%}s7Id^)l8h@3wYthkVjMy+{14Q6sVlCi74RWqV-q;HO_D_vo=@B`xl zn{Ich+f*kp#)?}7ERL!A{IMQr*NkAaz0oMGRs&Av{w}ld3c)?1^U~SE?o8ddm5SQTtV%GZh zp>?l83DIBVyUfoeSdCUEilx>)jDOnZ{O2xJ^(X=Du}}Re(6rbAMXRfqtxS9PfUIV&8K%>r9;c<1)0@9TqiD&$qY-q~Ct zSFm96h7orbTpnW4fB?6I*(P6k(Ko-Z4}%V%AWe~FeL6X2s2CY@g2{m?dmP`Aw|y9< zEn#?>=j1nAB=g2? z@a%On=?XpEQX4ea1pMs7z+ni7XzYWpql%e!)O_@QxUi4mV@lHnpS+>UpsylHqTZu2ewVbA@0(>F}61&#J?Kd~scW~%O@WcapzVV}qk z3F|x~MMZf{4TNc`oCq)7`YQLxZIAov+GVcYAhK#)ZXb;d7d>dz&7Il*sRz1A)f|Z| zjzwT-t<4_6ctVSNZQsU`N(H_KIt)o13H+>{oBXR5Y}4*-WDpi59^ Gqy7tcn@nr~ diff --git a/resources/skins/default/media/emby-bg-fade.png b/resources/skins/default/media/plex-bg-fade.png similarity index 100% rename from resources/skins/default/media/emby-bg-fade.png rename to resources/skins/default/media/plex-bg-fade.png diff --git a/resources/skins/default/media/emby-icon.png b/resources/skins/default/media/plex-icon.png similarity index 100% rename from resources/skins/default/media/emby-icon.png rename to resources/skins/default/media/plex-icon.png diff --git a/resources/skins/default/media/plex-logo.png b/resources/skins/default/media/plex-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7c824d35e28c52319ada468b2e8b811a6aa270fd GIT binary patch literal 6172 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 H=Y#(SsW
WTx{?;UVWH7J$Sg#3F1R~b`IN&9L9creZ`?) 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 Date: Thu, 17 May 2018 04:01:40 +0100 Subject: [PATCH 2/2] contextmenu changes --- resources/lib/{dialogs => }/context.py | 0 resources/lib/context_entry.py | 24 +-- resources/lib/dialogs/__init__.py | 6 - resources/lib/dialogs/loginconnect.py | 136 ---------------- resources/lib/dialogs/loginmanual.py | 145 ------------------ resources/lib/dialogs/serverconnect.py | 145 ------------------ resources/lib/dialogs/servermanual.py | 145 ------------------ resources/lib/dialogs/usersconnect.py | 104 ------------- .../default/1080i/script-plex-context.xml | 4 +- .../media/{plex-bg-fade.png => bg-fade.png} | Bin .../{plex-separator.png => separator.png} | Bin 11 files changed, 5 insertions(+), 704 deletions(-) rename resources/lib/{dialogs => }/context.py (100%) delete mode 100644 resources/lib/dialogs/__init__.py delete mode 100644 resources/lib/dialogs/loginconnect.py delete mode 100644 resources/lib/dialogs/loginmanual.py delete mode 100644 resources/lib/dialogs/serverconnect.py delete mode 100644 resources/lib/dialogs/servermanual.py delete mode 100644 resources/lib/dialogs/usersconnect.py rename resources/skins/default/media/{plex-bg-fade.png => bg-fade.png} (100%) rename resources/skins/default/media/{plex-separator.png => separator.png} (100%) diff --git a/resources/lib/dialogs/context.py b/resources/lib/context.py similarity index 100% rename from resources/lib/dialogs/context.py rename to resources/lib/context.py diff --git a/resources/lib/context_entry.py b/resources/lib/context_entry.py index b38b27ae..994913fc 100644 --- a/resources/lib/context_entry.py +++ b/resources/lib/context_entry.py @@ -6,10 +6,10 @@ from xbmcaddon import Addon import xbmc import xbmcplugin import xbmcgui +import context import plexdb_functions as plexdb from utils import window, settings, dialog, language as lang -from dialogs import context import PlexFunctions as PF from PlexAPI import API import playqueue as PQ @@ -96,18 +96,7 @@ class ContextMenu(object): options.append(OPTIONS['PMS_Play']) if self.kodi_type in v.KODI_VIDEOTYPES: options.append(OPTIONS['Transcode']) - # userdata = self.api.userdata() - # if userdata['Favorite']: - # # Remove from emby favourites - # options.append(OPTIONS['RemoveFav']) - # else: - # # Add to emby favourites - # options.append(OPTIONS['AddFav']) - # if self.kodi_type == "song": - # # Set custom song rating - # options.append(OPTIONS['RateSong']) - # Refresh item - # options.append(OPTIONS['Refresh']) + # Delete item, only if the Plex Home main user is logged in if (window('plex_restricteduser') != 'true' and window('plex_allows_mediaDeletion') == 'true'): @@ -137,14 +126,7 @@ class ContextMenu(object): self._PMS_play() elif selected == OPTIONS['Extras']: self._extras() - # elif selected == OPTIONS['Refresh']: - # self.emby.refreshItem(self.item_id) - # elif selected == OPTIONS['AddFav']: - # self.emby.updateUserRating(self.item_id, favourite=True) - # elif selected == OPTIONS['RemoveFav']: - # self.emby.updateUserRating(self.item_id, favourite=False) - # elif selected == OPTIONS['RateSong']: - # self._rate_song() + elif selected == OPTIONS['Addon']: xbmc.executebuiltin( 'Addon.OpenSettings(plugin.video.plexkodiconnect)') diff --git a/resources/lib/dialogs/__init__.py b/resources/lib/dialogs/__init__.py deleted file mode 100644 index 92c6f42a..00000000 --- a/resources/lib/dialogs/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# Dummy file to make this directory a package. -# from serverconnect import ServerConnect -# from usersconnect import UsersConnect -# from loginconnect import LoginConnect -# from loginmanual import LoginManual -# from servermanual import ServerManual diff --git a/resources/lib/dialogs/loginconnect.py b/resources/lib/dialogs/loginconnect.py deleted file mode 100644 index db7c39cc..00000000 --- a/resources/lib/dialogs/loginconnect.py +++ /dev/null @@ -1,136 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################################## - -import logging -import os - -import xbmcgui -import xbmcaddon - -from utils import language as lang - -################################################################################################## - -log = logging.getLogger("EMBY."+__name__) -addon = xbmcaddon.Addon('plugin.video.emby') - -ACTION_PARENT_DIR = 9 -ACTION_PREVIOUS_MENU = 10 -ACTION_BACK = 92 -SIGN_IN = 200 -CANCEL = 201 -ERROR_TOGGLE = 202 -ERROR_MSG = 203 -ERROR = { - 'Invalid': 1, - 'Empty': 2 -} - -################################################################################################## - - -class LoginConnect(xbmcgui.WindowXMLDialog): - - _user = None - error = None - - - def __init__(self, *args, **kwargs): - - xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) - - def set_connect_manager(self, connect_manager): - self.connect_manager = connect_manager - - def is_logged_in(self): - return True if self._user else False - - def get_user(self): - return self._user - - - def onInit(self): - - self.user_field = self._add_editcontrol(725, 385, 40, 500) - self.setFocus(self.user_field) - self.password_field = self._add_editcontrol(725, 470, 40, 500, password=1) - self.signin_button = self.getControl(SIGN_IN) - self.remind_button = self.getControl(CANCEL) - self.error_toggle = self.getControl(ERROR_TOGGLE) - self.error_msg = self.getControl(ERROR_MSG) - - self.user_field.controlUp(self.remind_button) - self.user_field.controlDown(self.password_field) - self.password_field.controlUp(self.user_field) - self.password_field.controlDown(self.signin_button) - self.signin_button.controlUp(self.password_field) - self.remind_button.controlDown(self.user_field) - - def onClick(self, control): - - if control == SIGN_IN: - # Sign in to emby connect - self._disable_error() - - user = self.user_field.getText() - password = self.password_field.getText() - - if not user or not password: - # Display error - self._error(ERROR['Empty'], lang(30608)) - log.error("Username or password cannot be null") - - elif self._login(user, password): - self.close() - - elif control == CANCEL: - # Remind me later - self.close() - - def onAction(self, action): - - if (self.error == ERROR['Empty'] - and self.user_field.getText() and self.password_field.getText()): - self._disable_error() - - if action in (ACTION_BACK, ACTION_PARENT_DIR, ACTION_PREVIOUS_MENU): - self.close() - - def _add_editcontrol(self, x, y, height, width, password=0): - - media = os.path.join(addon.getAddonInfo('path'), 'resources', 'skins', 'default', 'media') - control = xbmcgui.ControlEdit(0, 0, 0, 0, - label="User", - font="font10", - textColor="ff525252", - focusTexture=os.path.join(media, "button-focus.png"), - noFocusTexture=os.path.join(media, "button-focus.png"), - isPassword=password) - control.setPosition(x, y) - control.setHeight(height) - control.setWidth(width) - - self.addControl(control) - return control - - def _login(self, username, password): - - result = self.connect_manager.loginToConnect(username, password) - if result is False: - self._error(ERROR['Invalid'], lang(33009)) - return False - else: - self._user = result - return True - - def _error(self, state, message): - - self.error = state - self.error_msg.setLabel(message) - self.error_toggle.setVisibleCondition('True') - - def _disable_error(self): - - self.error = None - self.error_toggle.setVisibleCondition('False') diff --git a/resources/lib/dialogs/loginmanual.py b/resources/lib/dialogs/loginmanual.py deleted file mode 100644 index 7db1adcf..00000000 --- a/resources/lib/dialogs/loginmanual.py +++ /dev/null @@ -1,145 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################################## - -import logging -import os - -import xbmcgui -import xbmcaddon - -import read_embyserver as embyserver -from utils import language as lang - -################################################################################################## - -log = logging.getLogger("EMBY."+__name__) -addon = xbmcaddon.Addon('plugin.video.emby') - -ACTION_PARENT_DIR = 9 -ACTION_PREVIOUS_MENU = 10 -ACTION_BACK = 92 -SIGN_IN = 200 -CANCEL = 201 -ERROR_TOGGLE = 202 -ERROR_MSG = 203 -ERROR = { - 'Invalid': 1, - 'Empty': 2 -} - -################################################################################################## - - -class LoginManual(xbmcgui.WindowXMLDialog): - - _user = None - error = None - username = None - - - def __init__(self, *args, **kwargs): - - self.emby = embyserver.Read_EmbyServer() - xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) - - def is_logged_in(self): - return True if self._user else False - - def set_server(self, server): - self.server = server - - def set_user(self, user): - self.username = user or {} - - def get_user(self): - return self._user - - def onInit(self): - - self.signin_button = self.getControl(SIGN_IN) - self.cancel_button = self.getControl(CANCEL) - self.error_toggle = self.getControl(ERROR_TOGGLE) - self.error_msg = self.getControl(ERROR_MSG) - self.user_field = self._add_editcontrol(725, 400, 40, 500) - self.password_field = self._add_editcontrol(725, 475, 40, 500, password=1) - - if self.username: - self.user_field.setText(self.username) - self.setFocus(self.password_field) - else: - self.setFocus(self.user_field) - - self.user_field.controlUp(self.cancel_button) - self.user_field.controlDown(self.password_field) - self.password_field.controlUp(self.user_field) - self.password_field.controlDown(self.signin_button) - self.signin_button.controlUp(self.password_field) - self.cancel_button.controlDown(self.user_field) - - def onClick(self, control): - - if control == SIGN_IN: - # Sign in to emby connect - self._disable_error() - - user = self.user_field.getText() - password = self.password_field.getText() - - if not user: - # Display error - self._error(ERROR['Empty'], lang(30613)) - log.error("Username cannot be null") - - elif self._login(user, password): - self.close() - - elif control == CANCEL: - # Remind me later - self.close() - - def onAction(self, action): - - if self.error == ERROR['Empty'] and self.user_field.getText(): - self._disable_error() - - if action in (ACTION_BACK, ACTION_PARENT_DIR, ACTION_PREVIOUS_MENU): - self.close() - - def _add_editcontrol(self, x, y, height, width, password=0): - - media = os.path.join(addon.getAddonInfo('path'), 'resources', 'skins', 'default', 'media') - control = xbmcgui.ControlEdit(0, 0, 0, 0, - label="User", - font="font10", - textColor="ff525252", - focusTexture=os.path.join(media, "button-focus.png"), - noFocusTexture=os.path.join(media, "button-focus.png"), - isPassword=password) - control.setPosition(x, y) - control.setHeight(height) - control.setWidth(width) - - self.addControl(control) - return control - - def _login(self, username, password): - - result = self.emby.loginUser(self.server, username, password) - if not result: - self._error(ERROR['Invalid'], lang(33009)) - return False - else: - self._user = result - return True - - def _error(self, state, message): - - self.error = state - self.error_msg.setLabel(message) - self.error_toggle.setVisibleCondition('True') - - def _disable_error(self): - - self.error = None - self.error_toggle.setVisibleCondition('False') diff --git a/resources/lib/dialogs/serverconnect.py b/resources/lib/dialogs/serverconnect.py deleted file mode 100644 index 541ca6f9..00000000 --- a/resources/lib/dialogs/serverconnect.py +++ /dev/null @@ -1,145 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################################## - -import logging - -import xbmc -import xbmcgui - -import connect.connectionmanager as connectionmanager -from utils import language as lang - -################################################################################################## - -log = logging.getLogger("EMBY."+__name__) - -CONN_STATE = connectionmanager.ConnectionState -ACTION_PARENT_DIR = 9 -ACTION_PREVIOUS_MENU = 10 -ACTION_BACK = 92 -ACTION_SELECT_ITEM = 7 -ACTION_MOUSE_LEFT_CLICK = 100 -USER_IMAGE = 150 -USER_NAME = 151 -LIST = 155 -CANCEL = 201 -MESSAGE_BOX = 202 -MESSAGE = 203 -BUSY = 204 -EMBY_CONNECT = 205 -MANUAL_SERVER = 206 - -################################################################################################## - - -class ServerConnect(xbmcgui.WindowXMLDialog): - - username = "" - user_image = None - servers = [] - - _selected_server = None - _connect_login = False - _manual_server = False - - - def __init__(self, *args, **kwargs): - - xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) - - def set_args(self, **kwargs): - # connect_manager, username, user_image, servers, emby_connect - for key, value in kwargs.iteritems(): - setattr(self, key, value) - - def is_server_selected(self): - return True if self._selected_server else False - - def get_server(self): - return self._selected_server - - def is_connect_login(self): - return self._connect_login - - def is_manual_server(self): - return self._manual_server - - - def onInit(self): - - self.message = self.getControl(MESSAGE) - self.message_box = self.getControl(MESSAGE_BOX) - self.busy = self.getControl(BUSY) - self.list_ = self.getControl(LIST) - - for server in self.servers: - server_type = "wifi" if server.get('ExchangeToken') else "network" - self.list_.addItem(self._add_listitem(server['Name'], server['Id'], server_type)) - - self.getControl(USER_NAME).setLabel("%s %s" % (lang(33000), self.username.decode('utf-8'))) - - if self.user_image is not None: - self.getControl(USER_IMAGE).setImage(self.user_image) - - if not self.emby_connect: # Change connect user - self.getControl(EMBY_CONNECT).setLabel("[UPPERCASE][B]"+lang(30618)+"[/B][/UPPERCASE]") - - if self.servers: - self.setFocus(self.list_) - - @classmethod - def _add_listitem(cls, label, server_id, server_type): - - item = xbmcgui.ListItem(label) - item.setProperty('id', server_id) - item.setProperty('server_type', server_type) - - return item - - def onAction(self, action): - - if action in (ACTION_BACK, ACTION_PREVIOUS_MENU, ACTION_PARENT_DIR): - self.close() - - if action in (ACTION_SELECT_ITEM, ACTION_MOUSE_LEFT_CLICK): - - if self.getFocusId() == LIST: - server = self.list_.getSelectedItem() - selected_id = server.getProperty('id') - log.info('Server Id selected: %s', selected_id) - - if self._connect_server(selected_id): - self.message_box.setVisibleCondition('False') - self.close() - - def onClick(self, control): - - if control == EMBY_CONNECT: - self.connect_manager.clearData() - self._connect_login = True - self.close() - - elif control == MANUAL_SERVER: - self._manual_server = True - self.close() - - elif control == CANCEL: - self.close() - - def _connect_server(self, server_id): - - server = self.connect_manager.getServerInfo(server_id) - self.message.setLabel("%s %s..." % (lang(30610), server['Name'])) - self.message_box.setVisibleCondition('True') - self.busy.setVisibleCondition('True') - result = self.connect_manager.connectToServer(server) - - if result['State'] == CONN_STATE['Unavailable']: - self.busy.setVisibleCondition('False') - self.message.setLabel(lang(30609)) - return False - else: - xbmc.sleep(1000) - self._selected_server = result['Servers'][0] - return True diff --git a/resources/lib/dialogs/servermanual.py b/resources/lib/dialogs/servermanual.py deleted file mode 100644 index d54199eb..00000000 --- a/resources/lib/dialogs/servermanual.py +++ /dev/null @@ -1,145 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################################## - -import logging -import os - -import xbmcgui -import xbmcaddon - -import connect.connectionmanager as connectionmanager -from utils import language as lang - -################################################################################################## - -log = logging.getLogger("EMBY."+__name__) -addon = xbmcaddon.Addon('plugin.video.emby') - -CONN_STATE = connectionmanager.ConnectionState -ACTION_PARENT_DIR = 9 -ACTION_PREVIOUS_MENU = 10 -ACTION_BACK = 92 -CONNECT = 200 -CANCEL = 201 -ERROR_TOGGLE = 202 -ERROR_MSG = 203 -ERROR = { - 'Invalid': 1, - 'Empty': 2 -} - -################################################################################################## - - -class ServerManual(xbmcgui.WindowXMLDialog): - - _server = None - error = None - - - def __init__(self, *args, **kwargs): - - xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) - - def set_connect_manager(self, connect_manager): - self.connect_manager = connect_manager - - def is_connected(self): - return True if self._server else False - - def get_server(self): - return self._server - - def onInit(self): - - self.connect_button = self.getControl(CONNECT) - self.cancel_button = self.getControl(CANCEL) - self.error_toggle = self.getControl(ERROR_TOGGLE) - self.error_msg = self.getControl(ERROR_MSG) - self.host_field = self._add_editcontrol(725, 400, 40, 500) - self.port_field = self._add_editcontrol(725, 525, 40, 500) - - self.port_field.setText('8096') - self.setFocus(self.host_field) - - self.host_field.controlUp(self.cancel_button) - self.host_field.controlDown(self.port_field) - self.port_field.controlUp(self.host_field) - self.port_field.controlDown(self.connect_button) - self.connect_button.controlUp(self.port_field) - self.cancel_button.controlDown(self.host_field) - - def onClick(self, control): - - if control == CONNECT: - # Sign in to emby connect - self._disable_error() - - server = self.host_field.getText() - port = self.port_field.getText() - - if not server or not port: - # Display error - self._error(ERROR['Empty'], lang(30617)) - log.error("Server or port cannot be null") - - elif self._connect_to_server(server, port): - self.close() - - elif control == CANCEL: - # Remind me later - self.close() - - def onAction(self, action): - - if self.error == ERROR['Empty'] and self.host_field.getText() and self.port_field.getText(): - self._disable_error() - - if action in (ACTION_BACK, ACTION_PARENT_DIR, ACTION_PREVIOUS_MENU): - self.close() - - def _add_editcontrol(self, x, y, height, width): - - media = os.path.join(addon.getAddonInfo('path'), 'resources', 'skins', 'default', 'media') - control = xbmcgui.ControlEdit(0, 0, 0, 0, - label="User", - font="font10", - textColor="ffc2c2c2", - focusTexture=os.path.join(media, "button-focus.png"), - noFocusTexture=os.path.join(media, "button-focus.png")) - control.setPosition(x, y) - control.setHeight(height) - control.setWidth(width) - - self.addControl(control) - return control - - def _connect_to_server(self, server, port): - - server_address = "%s:%s" % (server, port) - self._message("%s %s..." % (lang(30610), server_address)) - result = self.connect_manager.connectToAddress(server_address) - - if result['State'] == CONN_STATE['Unavailable']: - self._message(lang(30609)) - return False - else: - self._server = result['Servers'][0] - return True - - def _message(self, message): - - self.error_msg.setLabel(message) - self.error_toggle.setVisibleCondition('True') - - def _error(self, state, message): - - self.error = state - self.error_msg.setLabel(message) - self.error_toggle.setVisibleCondition('True') - - def _disable_error(self): - - self.error = None - self.error_toggle.setVisibleCondition('False') diff --git a/resources/lib/dialogs/usersconnect.py b/resources/lib/dialogs/usersconnect.py deleted file mode 100644 index ed535c98..00000000 --- a/resources/lib/dialogs/usersconnect.py +++ /dev/null @@ -1,104 +0,0 @@ -# -*- coding: utf-8 -*- - -################################################################################################## - -import logging - -import xbmc -import xbmcgui - -################################################################################################## - -log = logging.getLogger("EMBY."+__name__) - -ACTION_PARENT_DIR = 9 -ACTION_PREVIOUS_MENU = 10 -ACTION_BACK = 92 -ACTION_SELECT_ITEM = 7 -ACTION_MOUSE_LEFT_CLICK = 100 -LIST = 155 -MANUAL = 200 -CANCEL = 201 - -################################################################################################## - - -class UsersConnect(xbmcgui.WindowXMLDialog): - - _user = None - _manual_login = False - - - def __init__(self, *args, **kwargs): - - self.kodi_version = int(xbmc.getInfoLabel('System.BuildVersion')[:2]) - xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) - - def set_server(self, server): - self.server = server - - def set_users(self, users): - self.users = users - - def is_user_selected(self): - return True if self._user else False - - def get_user(self): - return self._user - - def is_manual_login(self): - return self._manual_login - - - def onInit(self): - - self.list_ = self.getControl(LIST) - for user in self.users: - user_image = ("userflyoutdefault2.png" if 'PrimaryImageTag' not in user - else self._get_user_artwork(user['Id'], 'Primary')) - self.list_.addItem(self._add_listitem(user['Name'], user['Id'], user_image)) - - self.setFocus(self.list_) - - def _add_listitem(self, label, user_id, user_image): - - item = xbmcgui.ListItem(label) - item.setProperty('id', user_id) - if self.kodi_version > 15: - item.setArt({'Icon': user_image}) - else: - item.setArt({'icon': user_image}) - - return item - - def onAction(self, action): - - if action in (ACTION_BACK, ACTION_PREVIOUS_MENU, ACTION_PARENT_DIR): - self.close() - - if action in (ACTION_SELECT_ITEM, ACTION_MOUSE_LEFT_CLICK): - - if self.getFocusId() == LIST: - user = self.list_.getSelectedItem() - selected_id = user.getProperty('id') - log.info('User Id selected: %s', selected_id) - - for user in self.users: - if user['Id'] == selected_id: - self._user = user - break - - self.close() - - def onClick(self, control): - - if control == MANUAL: - self._manual_login = True - self.close() - - elif control == CANCEL: - self.close() - - def _get_user_artwork(self, user_id, item_type): - # Load user information set by UserClient - return "%s/emby/Users/%s/Images/%s?Format=original" % (self.server, user_id, item_type) diff --git a/resources/skins/default/1080i/script-plex-context.xml b/resources/skins/default/1080i/script-plex-context.xml index 380f2a9a..1b94802e 100644 --- a/resources/skins/default/1080i/script-plex-context.xml +++ b/resources/skins/default/1080i/script-plex-context.xml @@ -8,7 +8,7 @@ Background fade 100% 100% - plex-bg-fade.png + bg-fade.png @@ -45,7 +45,7 @@ 0.5 70 -5 - plex-separator.png + separator.png diff --git a/resources/skins/default/media/plex-bg-fade.png b/resources/skins/default/media/bg-fade.png similarity index 100% rename from resources/skins/default/media/plex-bg-fade.png rename to resources/skins/default/media/bg-fade.png diff --git a/resources/skins/default/media/plex-separator.png b/resources/skins/default/media/separator.png similarity index 100% rename from resources/skins/default/media/plex-separator.png rename to resources/skins/default/media/separator.png