Skip to content

Commit

Permalink
New studio flags and shutdown menu options
Browse files Browse the repository at this point in the history
  • Loading branch information
realcopacetic committed Mar 21, 2024
1 parent 2e91048 commit bdca9ad
Show file tree
Hide file tree
Showing 28 changed files with 77 additions and 27 deletions.
2 changes: 1 addition & 1 deletion 16x9/Colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
<value>$VAR[Unfocused_Color]</value>
</variable>
<variable name="skinsettings_Background_Low_Threshold_Button_Textcolor">
<value condition="Control.HasFocus(10190) | Control.HasFocus(10191) | Control.HasFocus(10192)">$VAR[Light_Color]</value>
<value condition="Control.HasFocus(10220) | Control.HasFocus(10221) | Control.HasFocus(10222)">$VAR[Light_Color]</value>
<value>$VAR[Unfocused_Color]</value>
</variable>
<variable name="skinsettings_Background_Opacity_Button_Textcolor">
Expand Down
8 changes: 4 additions & 4 deletions 16x9/Content.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,19 @@
<label>$LOCALIZE[31401]</label>
<onclick>Dialog.Close(all)</onclick>
<onclick>ActivateWindow(home)</onclick>
<visible>!Window.IsVisible(home) + !Window.IsVisible(loginscreen)</visible>
<visible>!Skin.HasSetting(Quick_Home_Disabled) + Window.IsVisible(home) + !Window.IsVisible(loginscreen)</visible>
</item>
<item>
<description>Night Mode</description>
<label>$LOCALIZE[31408]</label>
<onclick>Skin.SetString(Theme,Dark)</onclick>
<visible>Skin.String(Theme,Light)</visible>
<visible>!Skin.HasSetting(Quick_Theme_Switcher_Disabled) + Skin.String(Theme,Light)</visible>
</item>
<item>
<description>Light Mode</description>
<label>$LOCALIZE[31407]</label>
<onclick>Skin.SetString(Theme,Light)</onclick>
<visible>!Skin.String(Theme,Light)</visible>
<visible>!Skin.HasSetting(Quick_Theme_Switcher_Disabled) + !Skin.String(Theme,Light)</visible>
</item>
<item>
<description>Settings</description>
Expand All @@ -183,7 +183,7 @@
<label>LibreELEC</label>
<onclick>Dialog.Close(all)</onclick>
<onclick>RunAddon(service.libreelec.settings)</onclick>
<visible>System.AddonIsEnabled(service.libreelec.settings)</visible>
<visible>!Skin.HasSetting(Quick_LibreELEC_Menu_Disabled) + System.AddonIsEnabled(service.libreelec.settings)</visible>
</item>
</include>

Expand Down
53 changes: 40 additions & 13 deletions 16x9/Content_Settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,63 +272,90 @@
<label>$LOCALIZE[31416]</label>
</control>
<control type="button" id="1008">
<description>LibreELEC</description>
<visible>ControlGroup(9).HasFocus(10) + System.AddonIsEnabled(service.libreelec.settings)</visible>
<label>LibreELEC</label>
<onclick>RunAddon(service.libreelec.settings)</onclick>
</control>
<control type="button" id="1009">
<description>Home menu</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>$LOCALIZE[31417]</label>
<onclick>RunScript(script.skinshortcuts,type=manage&amp;group=mainmenu)</onclick>
</control>
<control type="button" id="1009">
<control type="button" id="1010">
<description>Shutdown menu</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>$LOCALIZE[31418]</label>
<onclick>RunScript(script.skinshortcuts,type=manage&amp;group=shutdownmenu)</onclick>
</control>
<control type="button" id="1010">
<control type="radiobutton" id="1011">
<description>- Enable home shortcut in Shutdown menu</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>- $LOCALIZE[31492]</label>
<onclick>Skin.ToggleSetting(Quick_Home_Disabled)</onclick>
<selected>!Skin.HasSetting(Quick_Home_Disabled)</selected>
</control>
<control type="radiobutton" id="1012">
<description>- Enable theme switcher shortcut in Shutdown menu</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>- $LOCALIZE[31493]</label>
<onclick>Skin.ToggleSetting(Quick_Theme_Switcher_Disabled)</onclick>
<selected>!Skin.HasSetting(Quick_Theme_Switcher_Disabled)</selected>
</control>
<control type="radiobutton" id="1013">
<description>- Enable LibreELEC menu shortcut in Shutdown menu</description>
<visible>ControlGroup(9).HasFocus(10) + System.AddonIsEnabled(service.libreelec.settings)</visible>
<label>- $LOCALIZE[31494]</label>
<onclick>Skin.ToggleSetting(Quick_LibreELEC_Menu_Disabled)</onclick>
<selected>!Skin.HasSetting(Quick_LibreELEC_Menu_Disabled)</selected>
</control>
<control type="button" id="1014">
<description>Reset menus</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>$LOCALIZE[31419]</label>
<onclick>RunScript(script.skinshortcuts,type=resetall)</onclick>
</control>
<control type="label" id="1011">
<control type="label" id="1015">
<description>Artwork</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<include content="skinsettings_Default_Label" />
<label>$LOCALIZE[39123]</label>
</control>
<control type="image" id="1012">
<control type="image" id="1016">
<description>Prefer keyart screenshot</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<include content="skinsettings_Detfault_Image" />
<texture>$VAR[skinsettings_Prefer_Keyart_Screenshots]</texture>
</control>
<control type="radiobutton" id="1013">
<control type="radiobutton" id="1017">
<description>Prefer keyart for poster views</description>
<label>$LOCALIZE[31428]</label>
<onclick>Skin.ToggleSetting(Prefer_Keyart)</onclick>
<selected>Skin.HasSetting(Prefer_Keyart)</selected>
<visible>ControlGroup(9).HasFocus(10)</visible>
</control>
<control type="image" id="1015">
<control type="image" id="1018">
<description>Themes screenshot</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<include content="skinsettings_Detfault_Image" />
<texture>$VAR[skinsettings_Clearlogo_Cropper_Screenshots]</texture>
</control>
<control type="radiobutton" id="1016">
<description>Crop clearlogos</description>
<control type="radiobutton" id="1019">
<description>Enabled clearlogo cropper</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<label>$LOCALIZE[31421]</label>
<onclick>Skin.ToggleSetting(Crop_Clearlogos)</onclick>
<selected>Skin.HasSetting(Crop_Clearlogos)</selected>
</control>
<control type="button" id="1017">
<control type="button" id="1020">
<description>Clear cache</description>
<visible>ControlGroup(9).HasFocus(10) + System.AddonIsEnabled(script.copacetic.helper)</visible>
<label>- $LOCALIZE[31422]</label>
<label2>$INFO[Window(home).Property(Addon_Data_Folder_Size)]</label2>
<onclick condition="!String.Contains(Window(home).Property(Addon_Data_Folder_Size),bytes)">RunScript(script.copacetic.helper,action=clear_cache)</onclick>
</control>
<control type="radiobutton" id="1018">
<control type="radiobutton" id="1021">
<description>Colorise media flags</description>
<visible>ControlGroup(9).HasFocus(10)</visible>
<visible>Skin.HasSetting(Crop_Clearlogos)</visible>
Expand All @@ -343,8 +370,8 @@
<param name="label" value="- $LOCALIZE[31424]" />
<param name="label2" value="$INFO[Skin.String(Background_Low_Threshold)]$INFO[Skin.String(Background_High_Threshold), - ]" />
<param name="category" value="10" />
<param name="previous" value="1018" />
<param name="id" value="1019" />
<param name="previous" value="1021" />
<param name="id" value="1022" />
<param name="next" value="1001" />
</include>

Expand Down Expand Up @@ -546,7 +573,7 @@
<label>$LOCALIZE[31488]</label>
<onclick>Skin.ToggleSetting(shutdownmenu_Shortcut)</onclick>
<selected>Skin.HasSetting(shutdownmenu_Shortcut)</selected>
</control>
</control>
<control type="label" id="1341">
<description>List</description>
<visible>ControlGroup(9).HasFocus(13)</visible>
Expand Down
4 changes: 2 additions & 2 deletions 16x9/Startup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<onload condition="!Skin.String(Trailer_Autoplay_Interval)">Skin.SetString(Trailer_Autoplay_Interval,3)</onload>
<onload condition="!Skin.String(script-upnext_Artwork)">Skin.SetString(script-upnext_Artwork,Fanart)</onload>
<onload condition="!Skin.String(visualisation_Layout)">Skin.SetString(visualisation_Layout,Small)</onload>
<onload condition="![Skin.HasSetting(Preferred_Rating_BBFC) | Skin.HasSetting(Preferred_Rating_MPAA) | Skin.HasSetting(Preferred_Rating_CHVRS) | Skin.HasSetting(Preferred_Rating_ACB) | Skin.HasSetting(Preferred_Rating_IFCO) | Skin.HasSetting(Preferred_Rating_FSK) | Skin.HasSetting(Preferred_Rating_DJCTQ) | Skin.HasSetting(Preferred_Rating_KIJKWIJZER) | Skin.HasSetting(Preferred_Rating_EIRIN)]">Skin.SetBool(Preferred_Rating_BBFC)</onload>

<!-- Widget defaults -->
<onload condition="!Skin.HasSetting(Widget1_Content_Disabled) + !Skin.HasSetting(Widget1_Content_InProgress) + !Skin.HasSetting(Widget1_Content_NextUp) + !Skin.HasSetting(Widget1_Content_LatestMovies) + !Skin.HasSetting(Widget1_Content_LatestTVShows) + !Skin.HasSetting(Widget1_Content_RandomMovies) + !Skin.HasSetting(Widget1_Content_RandomTVShows) + !Skin.HasSetting(Widget1_Content_LatestAlbums) + !Skin.HasSetting(Widget1_Content_RecentAlbums) + !Skin.HasSetting(Widget1_Content_RandomAlbums) + !Skin.HasSetting(Widget1_Content_LikedSongs) + !Skin.HasSetting(Widget1_Content_Favourites) + !Skin.HasSetting(Widget1_Content_Custom)">Skin.SetBool(Widget1_Content_InProgress)</onload>
<onload condition="!Skin.String(Widget1_View)">Skin.SetString(Widget1_View,Strip)</onload>
Expand Down Expand Up @@ -207,8 +209,6 @@
<onload condition="!Skin.String(GridView_Details_Images)">Skin.SetString(GridView_Details_Images,Off)</onload>
<onload condition="!Skin.String(GridView_Details_Programs_Folders)">Skin.SetString(GridView_Details_Programs_Folders,TitleAndInfo)</onload>
<onload condition="!Skin.String(GridView_Details_Programs_Files)">Skin.SetString(GridView_Details_Programs_Files,TitleAndInfo)</onload>
<!-- MPAA preferred flags -->
<onload condition="![Skin.HasSetting(Preferred_Rating_BBFC) | Skin.HasSetting(Preferred_Rating_MPAA) | Skin.HasSetting(Preferred_Rating_CHVRS) | Skin.HasSetting(Preferred_Rating_ACB) | Skin.HasSetting(Preferred_Rating_IFCO) | Skin.HasSetting(Preferred_Rating_FSK) | Skin.HasSetting(Preferred_Rating_DJCTQ) | Skin.HasSetting(Preferred_Rating_KIJKWIJZER) | Skin.HasSetting(Preferred_Rating_EIRIN)]">Skin.SetBool(Preferred_Rating_BBFC)</onload>
<!-- Startup -->
<onload>SetProperty(SkinInitStarted,1,Home)</onload>
<onload>ReplaceWindow($INFO[System.StartupWindow])</onload>
Expand Down
12 changes: 6 additions & 6 deletions 16x9/Variables_Labels_Windows.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@
<value condition="Control.HasFocus(10240) | Control.HasFocus(10241) | Control.HasFocus(10242)">$LOCALIZE[31587]</value>
<value condition="Control.HasFocus(1005)">$LOCALIZE[31512]</value>
<value condition="Control.HasFocus(1008)">$LOCALIZE[31517]</value>
<value condition="Control.HasFocus(1009)">$LOCALIZE[31518]</value>
<value condition="Control.HasFocus(1013)">$LOCALIZE[31528]</value>
<value condition="Control.HasFocus(1016)">$LOCALIZE[31521]</value>
<value condition="Control.HasFocus(1017)">$LOCALIZE[31522]</value>
<value condition="Control.HasFocus(1018)">$LOCALIZE[31523]</value>
<value condition="Control.HasFocus(10190) | Control.HasFocus(10181) | Control.HasFocus(10192)">$LOCALIZE[31524]</value>
<value condition="Control.HasFocus(1010)">$LOCALIZE[31518]</value>
<value condition="Control.HasFocus(1017)">$LOCALIZE[31528]</value>
<value condition="Control.HasFocus(1019)">$LOCALIZE[31521]</value>
<value condition="Control.HasFocus(1020)">$LOCALIZE[31522]</value>
<value condition="Control.HasFocus(1021)">$LOCALIZE[31523]</value>
<value condition="Control.HasFocus(10220) | Control.HasFocus(10221) | Control.HasFocus(10222)">$LOCALIZE[31524]</value>
<!-- Background -->
<value condition="Control.HasFocus(16010) | Control.HasFocus(16011)">$LOCALIZE[31526]</value>
<value condition="Control.HasFocus(16030) | Control.HasFocus(16031)">$LOCALIZE[31527]</value>
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
### Changelog
---
**1.1.20**
- Added additional details to info screens for local movies and episodes. Access 'Details' tab by pressing left on the infoscreen menu.https://github.com/realcopacetic/skin.copacetic/issues/116
- Added additional details to info screens for local movies and episodes. Access 'Details' tab by pressing left on the infoscreen menu.
https://github.com/realcopacetic/skin.copacetic/issues/116
https://github.com/realcopacetic/skin.copacetic/issues/115
- Added option to disable hardcoded shutdownmenu items (Home, Light/Night, LibreELEC) in skin settings under Copacetic > General > Menus https://github.com/realcopacetic/skin.copacetic/issues/121
- Added new LibreELEC shortcut in skin settings under Copacetic > General > Menus https://github.com/realcopacetic/skin.copacetic/issues/121
- New studio flags for Ascot Elite Entertainment, Gravitas Ventures, Hanway Films, IM Global, Open Road, RankinBass, Screen Media, Toei, Toei Animation, Vertical, Well Go USA https://github.com/realcopacetic/skin.copacetic/issues/119

Still to do:
- login background
- Make consistent overlay on embedded videoplayer for live tv and fade it out when screensaver kicks in
Expand Down
18 changes: 18 additions & 0 deletions language/resource.language.en_gb/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,24 @@ msgctxt "#31419"
msgid "Reset all menus"
msgstr ""

#: NEW
#/16x9/Content_Settings.xml
msgctxt "#31492"
msgid "Enable home shortcut in Shutdown menu"
msgstr ""

#: NEW
#/16x9/Content_Settings.xml
msgctxt "#31493"
msgid "Enable theme switcher shortcut in Shutdown menu"
msgstr ""

#: NEW
#/16x9/Content_Settings.xml
msgctxt "#31494"
msgid "Enable LibreELEC menu shortcut in Shutdown menu"
msgstr ""

#/16x9/Content_Settings.xml
msgctxt "#31420"
msgid "Background service"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Ascot Elite Entertainment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Gravitas Ventures.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/HanWay Films.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/IM Global.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Open Road Films.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Rankin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/RankinBass Productions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Screen Media Ventures.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Screen Media.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Toei Animation Company.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Toei Company.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Toei Douga.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Toei Inc..png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Toei Tokyo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Toei Video Company.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Toei.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Vertical Entertainment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/flags/studios/Well Go USA Entertainment.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bdca9ad

Please sign in to comment.