diff --git a/1080i/Custom_1175_Dialog_Discover.xml b/1080i/Custom_1175_Dialog_Discover.xml new file mode 100644 index 000000000..d5114bd5b --- /dev/null +++ b/1080i/Custom_1175_Dialog_Discover.xml @@ -0,0 +1,171 @@ + + + 8000 + Skin.SetString(Discover.TMDbType,movie) + + + + Dimension_DialogHugeMenu + Animation_Right_Delay + + !$EXP[Exp_InfoDialogs] + !Window.IsVisible(1113) + + + True + + + + + True + Dimension_DialogHugeMenu + + + Dimension_Dialog_Body + + Dialog_Side_Grouplist_Def + Close + 8000 + + 01 + $LOCALIZE[15067] + special://skin/extras/icons/circle-xmark.png + true + Action(Close) + + + 02 + $LOCALIZE[1024] + special://skin/extras/icons/folder.png + true + Dialog.Close(1175,force) + ActivateWindow(videos,$INFO[window(home).property(tmdbhelper.userdiscover.folderpath)]$INFO[Control.GetLabel(9099).index(1),&with_text_query=,],return) + + + 03 + 4 + $VAR[Label_Discover_TMDbType] + $VAR[Image_Discover_TMDbType] + true + Skin.SetString(Discover.TMDbType,tv) + Skin.SetString(Discover.TMDbType,movie) + RunPlugin(plugin://plugin.video.themoviedb.helper/?info=user_discover&tmdb_type=tv&method=clear) + + + 04 + $LOCALIZE[192] + special://skin/extras/icons/triangle-exclamation.png + true + RunScript(script.skinvariables,set_editcontrol=9099,window_id=1175,setfocus=9004) + RunPlugin(plugin://plugin.video.themoviedb.helper/?info=user_discover&tmdb_type=tv&method=clear) + + + + + + + Dimension_DialogHugeMenu + True + 800 + + + + $LOCALIZE[31066] + TMDbHelper + true + + Dialog_Head_CloseButton + + + + Dimension_Dialog_Body + + + 480 + + + Dimension_Dialog_Body_Group + + + true + 9099 + edit + + SetFocus(8000,99999,absolute) + SetFocus(8000,0,absolute) + + 9000 + 7000 + + + + 8000 + dialog_fg + Layout_MenuList + true + + 9099 + 9099 + + 9000 + 7000 + + 80 + + plugin://plugin.video.themoviedb.helper/?info=user_discover&tmdb_type=$INFO[Skin.String(Discover.TMDbType)]&method=skip$INFO[Window(Home).Property(TMDbHelper.UserDiscover.ParamsDict),&reload=,] + + RunPlugin($INFO[Container(8000).ListItem.FolderPath]) + + + + + + + + 480 + 40 + + + + 7000 + String.IsEqual(ListItem.Label,$LOCALIZE[31046]) + + + Container(7000).IsUpdating + + + 61 + + 8000 + 61 + + + + fallback/no-results.png + Integer.IsEqual(Container(7000).NumItems,0) | [Integer.IsEqual(Container(7000).NumItems,1) + String.IsEqual(Container(7000).ListItemAbsolute(0).Label,$LOCALIZE[31046])] + + + + $INFO[window(home).property(tmdbhelper.userdiscover.folderpath)]$INFO[Control.GetLabel(9099).index(1),&with_text_query=,] + + + + -40 + + dialog_fg + Container(7000).IsUpdating + + + + + + + 61 + 7000 + + + + + + \ No newline at end of file diff --git a/1080i/Includes_Images.xml b/1080i/Includes_Images.xml index f01d5ffce..68515e374 100644 --- a/1080i/Includes_Images.xml +++ b/1080i/Includes_Images.xml @@ -18,6 +18,11 @@ special://skin/extras/icons/tv.png + + special://skin/extras/icons/film.png + special://skin/extras/icons/tv.png + + special://skin/extras/icons/world.png $INFO[Container(29303).Listitem.Icon] diff --git a/1080i/Includes_Labels.xml b/1080i/Includes_Labels.xml index 56fd8c665..4337eb1f6 100644 --- a/1080i/Includes_Labels.xml +++ b/1080i/Includes_Labels.xml @@ -568,6 +568,11 @@ $LOCALIZE[208] + + $LOCALIZE[20342] + $LOCALIZE[20343] + + $LOCALIZE[31162] $LOCALIZE[29915] diff --git a/1080i/Includes_Lists.xml b/1080i/Includes_Lists.xml index fd0e07aad..fb83b0518 100644 --- a/1080i/Includes_Lists.xml +++ b/1080i/Includes_Lists.xml @@ -545,6 +545,33 @@ + + false + + + vertical + panel + $PARAM[id] + view_poster_item_w + view_poster_item_h + view_poster_itemlayout_w + view_poster_itemlayout_h + Layout_Poster + $PARAM[focusedlayout_special] + 40 + 40 + + $PARAM[icon] + $PARAM[detailed] + $PARAM[hidden_button_enabled] + $PARAM[hidden_button] + 0 + + + + + + false diff --git a/1080i/Includes_Search_Filter.xml b/1080i/Includes_Search_Filter.xml index a7a28771b..3db3c7ed5 100644 --- a/1080i/Includes_Search_Filter.xml +++ b/1080i/Includes_Search_Filter.xml @@ -118,7 +118,7 @@ - + videos guid-discoverall $NUMBER[52] @@ -142,7 +142,7 @@ true - + videos guid-libraryall $NUMBER[52] diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml index 806cf27bf..0319c9500 100644 --- a/1080i/MyVideoNav.xml +++ b/1080i/MyVideoNav.xml @@ -9,5 +9,10 @@ Defs_TMDbHelper_Loader View_Main + + + 9901 + plugin://script.skinvariables/?info=get_dbitem_movie_details&dbid=$INFO[ListItem.DBID]&reload=$INFO[ListItem.Title] + diff --git a/1080i/VideoFullScreen.xml b/1080i/VideoFullScreen.xml index ee7f6451d..3ef5cd98e 100644 --- a/1080i/VideoFullScreen.xml +++ b/1080i/VideoFullScreen.xml @@ -2,6 +2,7 @@ Animation_OSD_Fullscreen_Change ClearProperty(OSDRelaunchFullscreen,Home) + Dialog.Close(1175,force) panel_bg_70 diff --git a/addon.xml b/addon.xml index ff1bb9a8f..53a1cf5d0 100644 --- a/addon.xml +++ b/addon.xml @@ -1,9 +1,9 @@ - + - + diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po index 2f86257ac..54e829b29 100644 --- a/language/resource.language.en_gb/strings.po +++ b/language/resource.language.en_gb/strings.po @@ -2637,3 +2637,8 @@ msgstr "" msgctxt "#31552" msgid "Widgets for $INFO[Window.Property(hub_prefix)] hub" msgstr "" + +#: /1080i/Custom_1175_Dialog_Discover.xml +msgctxt "#31553" +msgid "Query" +msgstr "" diff --git a/shortcuts/skinvariables-shortcut-config.json b/shortcuts/skinvariables-shortcut-config.json index e6878a04e..71d4de7ce 100644 --- a/shortcuts/skinvariables-shortcut-config.json +++ b/shortcuts/skinvariables-shortcut-config.json @@ -999,6 +999,12 @@ "icon": "special://skin/extras/icons/binoculars.png", "link": "true" }, + { + "name": "Discover (Dialog)", + "path": "ActivateWindow(1175)", + "icon": "special://skin/extras/icons/binoculars.png", + "link": "true" + }, { "name": "Movies Hub", "path": "ActivateWindow(1101)",