Skip to content

Commit

Permalink
Merge pull request #286 from Ch1llb0/Fixes
Browse files Browse the repository at this point in the history
Add favourites to customization dialog & fixes
  • Loading branch information
Ch1llb0 authored Oct 16, 2020
2 parents a523228 + 5be1b6f commit 66173d3
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
6 changes: 5 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ _Improved_
- add wide view support to games and programs
- harmonize non-focus animations
- improve scrollbar size relative to their controls
- add favourites to home menu entry/submenu and widget customization dialog

_Fixed_
- fix default view music and video navigation
Expand Down Expand Up @@ -51,6 +52,10 @@ Textures.xbt:
- update textures file with new watched/listened to indicator files
- update textures file with new automatic aspect ratio OSD control icon

overrides.xml:
- add new home menu node for favourites
- add new favourites widget shortcut to additional widgets section

template.xml:
- fix deprecated IsEmpty conditions
- rework watched/listened to widget indicator
Expand Down Expand Up @@ -375,7 +380,6 @@ MyPics.xml:
MyPlaylist.xml:
- replace visible change fade animation by VisibleFadeAnimation include


MyPrograms.xml:
- add changed/new viewtypes
- replace visible change fade animation by VisibleFadeAnimation include
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<icon>resources/icon.png</icon>
<fanart>resources/fanart.jpg</fanart>
</assets>
<news>[B]New[/B][CR]- add channel group switching buttons to OSD PVR channels list[CR]- add Library Node Editor support[CR]- new square versions of existing views for video addons and music[CR]- add automatic masking for scope skin version[CR]- add second dialog page to music, PVR and addon info dialog[CR]- add setting to force a specific view for video addons[CR]- add missing PVR seek slider[CR][CR][B]Improved[/B][CR]- improve wording in skin settings[CR]- improve watched/listened to indicator for all views/widgets[CR]- adjust media window view positioning and size[CR]- adjust wall and wide view for music[CR]- improve spacing of wall low view[CR]- improve PVR descriptions[CR]- rework now playing information and fullscreen music playback information[CR]- add missing detail labels to PVR and music info dialogs[CR]- show TV show episode thumb in video info dialog[CR]- use the more extended list view for more content types (addons, games, files and pictures)[CR]- improve second label of more extended list view[CR]- add wide view support to games and programs[CR]- harmonize non-focus animations[CR]- improve scrollbar size relative to their controls[CR][CR][B]Fixed[/B][CR]- fix default view music and video navigation[CR]- fix PVR channel window heading label[CR]- fix widget icon fallback[CR]- fix PVR OSD dialogs</news>
<news>[B]New[/B][CR]- add channel group switching buttons to OSD PVR channels list[CR]- add Library Node Editor support[CR]- new square versions of existing views for video addons and music[CR]- add automatic masking for scope skin version[CR]- add second dialog page to music, PVR and addon info dialog[CR]- add setting to force a specific view for video addons[CR]- add missing PVR seek slider[CR][CR][B]Improved[/B][CR]- improve wording in skin settings[CR]- improve watched/listened to indicator for all views/widgets[CR]- adjust media window view positioning and size[CR]- adjust wall and wide view for music[CR]- improve spacing of wall low view[CR]- improve PVR descriptions[CR]- rework now playing information and fullscreen music playback information[CR]- add missing detail labels to PVR and music info dialogs[CR]- show TV show episode thumb in video info dialog[CR]- use the more extended list view for more content types (addons, games, files and pictures)[CR]- improve second label of more extended list view[CR]- add wide view support to games and programs[CR]- harmonize non-focus animations[CR]- improve scrollbar size relative to their controls[CR]- add favourites to home menu entry/submenu and widget customization dialog[CR][CR][B]Fixed[/B][CR]- fix default view music and video navigation[CR]- fix PVR channel window heading label[CR]- fix widget icon fallback[CR]- fix PVR OSD dialogs</news>
</extension>
</addon>
7 changes: 7 additions & 0 deletions shortcuts/overrides.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@
<content>addon-program</content>
</node>
</node>
<!-- Favorites -->
<node label="1036">
<content>favourite</content>
</node>
<!-- Settings -->
<node label="10004">
<content>settings</content>
Expand Down Expand Up @@ -274,13 +278,16 @@
<content>addon-program</content>
</node>
</node>
<!-- Additional widgets -->
<node label="31230">
<!-- Skin-helper script -->
<shortcut label="$LOCALIZE[31235]" icon="DefaultFolder.png" condition="!System.HasAddon(script.skin.helper.widgets)">::INSTALL::script.skin.helper.widgets</shortcut>
<shortcut label="$LOCALIZE[31235]" icon="DefaultFolder.png" condition="System.HasAddon(script.skin.helper.widgets)">||BROWSE||script.skin.helper.service/?action=widgets&amp;path=scriptwidgets</shortcut>
<!-- Extended info script -->
<shortcut label="$LOCALIZE[31236]" icon="DefaultFolder.png" condition="!System.HasAddon(script.extendedinfo)">::INSTALL::script.extendedinfo</shortcut>
<shortcut label="$LOCALIZE[31236]" icon="DefaultFolder.png" condition="System.HasAddon(script.extendedinfo)">||BROWSE||script.skin.helper.service/?action=widgets&amp;path=extendedinfo</shortcut>
<!-- Favourites -->
<shortcut widget="Favourites" label="$LOCALIZE[1036]" widgetType="favourite" icon="DefaultFavourites.png">favourites://</shortcut>
<!-- Weather -->
<shortcut widget="WeatherWidget" label="$LOCALIZE[10508]" widgetType="custom" icon="DefaultWeather.png">$INCLUDE[weather-widget]</shortcut>
<!-- My OSMC -->
Expand Down
2 changes: 1 addition & 1 deletion xml/DialogSeekBar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<textureslidernib colordiffuse="$VAR[DialogColor1]">osd/OSDSliderNibBig.png</textureslidernib>
<textureslidernibfocus colordiffuse="$VAR[DialogColor1]">osd/OSDSliderNibBig.png</textureslidernibfocus>
<animation effect="slide" end="0,-75" time="200" condition="Window.IsActive(VideoOSD) + !Window.IsActive(playerprocessinfo)">Conditional</animation>
<visible>Player.Seeking + [!Pvr.IsPlayingTv | Pvr.IsPlayingTv + !VideoPlayer.HasEpg]</visible>
<visible>Player.Seeking + !Pvr.IsPlayingTv</visible>
</control>

<control type="slider" id="402">
Expand Down
2 changes: 1 addition & 1 deletion xml/MyPVRGuide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<!-- Program preview & info -->
<control type="group">
<include>MyPVRGuide_coords8</include>
<visible>!String.IsEmpty(ListItem.Label)</visible>
<visible>Control.IsVisible(10)</visible>
<include>VisibleFadeAnimation</include>

<control type="image">
Expand Down

0 comments on commit 66173d3

Please sign in to comment.