Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/game shortcuts #6

Merged
merged 7 commits into from Apr 26, 2019
Merged

Feature/game shortcuts #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92e2947
Created dev release
chrisism Apr 17, 2019
ae3ff7b
Merge branch 'master' into dev
chrisism Apr 17, 2019
33a5399
Added more support for Sega console
chrisism Apr 20, 2019
4d6f12a
Merge branch 'master' into dev
chrisism Apr 20, 2019
46bb959
Merged sega support in
chrisism Apr 24, 2019
b2ae328
Removed package json
chrisism Apr 24, 2019
435feb0
Implemented support for games in skinshortcuts
chrisism Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -14,3 +14,4 @@ Thumbs.db
.dist
.addon
package-lock.json
package.json
2 changes: 1 addition & 1 deletion 1080i/IncludesExpressions.xml
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
<expression name="PlatformIsMasterSystem">String.Contains(Container.ListItem(1).Property(platform),Master System)</expression>
<expression name="PlatformIsMegadrive">String.Contains(Container.ListItem(1).Property(platform),Megadrive) | String.Contains(Container.ListItem(1).Property(platform),Genesis)</expression>
<expression name="PlatformIsGameGear">String.Contains(Container.ListItem(1).Property(platform),Game Gear)</expression>
<expression name="PlatformIs32X">String.Contains(Container.ListItem(1).Property(platform),32X)</expression>
<expression name="PlatformIs32x">String.Contains(Container.ListItem(1).Property(platform),32X)</expression>

<!-- Preferred thumb shapes -->
<expression name="UsePosterShape">String.IsEqual(Control.GetLabel(5595),poster)</expression>
Expand Down
210 changes: 125 additions & 85 deletions 1080i/IncludesSkinSetings.xml
View file
Open in desktop
Expand Up @@ -1294,91 +1294,7 @@
<param name="visible" value="Skin.HasSetting(CaseOverlays)" />
</include>

<!-- Game Thumbs -->
<control type="label" id="17170">
<include>SkinSettings_Header</include>
<label>Game Thumbnails</label>
<textcolor>$INFO[Skin.String(GeneralTextColor)]</textcolor>
</control>
<control type="button" id="17171">
<include>SkinSettings_Button</include>
<label>Default Game thumbnail shape</label>
<label2>$INFO[Skin.String(game.thumbshape.default.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.default,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17172">
<include>SkinSettings_Button</include>
<label>Thumbnail shape NES</label>
<label2>$INFO[Skin.String(game.thumbshape.nes.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.nes,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17173">
<include>SkinSettings_Button</include>
<label>Thumbnail shape SNES</label>
<label2>$INFO[Skin.String(game.thumbshape.snes.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.snes,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17174">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Nintendo64</label>
<label2>$INFO[Skin.String(game.thumbshape.n64.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.n64,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17175">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Gameboy</label>
<label2>$INFO[Skin.String(game.thumbshape.gb.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.gb,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17176">
<include>SkinSettings_Button</include>
<label>Thumbnail shape NDS/3DS</label>
<label2>$INFO[Skin.String(game.thumbshape.nds.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.nds,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17177">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Nintendo Switch</label>
<label2>$INFO[Skin.String(game.thumbshape.switch.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.switch,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17178">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation 3</label>
<label2>$INFO[Skin.String(game.thumbshape.ps3.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.ps3,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17179">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation 2</label>
<label2>$INFO[Skin.String(game.thumbshape.ps2.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.ps2,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17180">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation 1</label>
<label2>$INFO[Skin.String(game.thumbshape.ps1.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.ps1,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17181">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation Portable</label>
<label2>$INFO[Skin.String(game.thumbshape.psp.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.psp,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17182">
<include>SkinSettings_Button</include>
<label>Thumbnail shape PC (Microsoft Windows)</label>
<label2>$INFO[Skin.String(game.thumbshape.win.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.win,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17183">
<include>SkinSettings_Button</include>
<label>Thumbnail shape PC (MS DOS)</label>
<label2>$INFO[Skin.String(game.thumbshape.dos.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.dos,header=Select preferred thumbnail type)</onclick>
</control>

<include>SkinSettings_GamePlatformShapes</include>
</control>
<!--scrollbar for medialibrary settings-->
<control type="scrollbar" id="317">
Expand Down Expand Up @@ -3621,6 +3537,130 @@
<usealttexture>String.IsEqual(Window(Home).Property(SkinSettingSection),31)</usealttexture>
</control>
</include>


<include name="SkinSettings_GamePlatformShapes">
<!-- Game Thumbs -->
<control type="label" id="17170">
<include>SkinSettings_Header</include>
<label>Game Thumbnails</label>
<textcolor>$INFO[Skin.String(GeneralTextColor)]</textcolor>
</control>
<control type="button" id="17171">
<include>SkinSettings_Button</include>
<label>Default Game thumbnail shape</label>
<label2>$INFO[Skin.String(game.thumbshape.default.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.default,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17172">
<include>SkinSettings_Button</include>
<label>Thumbnail shape NES</label>
<label2>$INFO[Skin.String(game.thumbshape.nes.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.nes,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17173">
<include>SkinSettings_Button</include>
<label>Thumbnail shape SNES</label>
<label2>$INFO[Skin.String(game.thumbshape.snes.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.snes,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17174">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Nintendo64</label>
<label2>$INFO[Skin.String(game.thumbshape.n64.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.n64,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17175">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Gameboy</label>
<label2>$INFO[Skin.String(game.thumbshape.gb.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.gb,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17176">
<include>SkinSettings_Button</include>
<label>Thumbnail shape NDS/3DS</label>
<label2>$INFO[Skin.String(game.thumbshape.nds.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.nds,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17177">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Nintendo Switch</label>
<label2>$INFO[Skin.String(game.thumbshape.switch.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.switch,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17178">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation 3</label>
<label2>$INFO[Skin.String(game.thumbshape.ps3.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.ps3,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17179">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation 2</label>
<label2>$INFO[Skin.String(game.thumbshape.ps2.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.ps2,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17180">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation 1</label>
<label2>$INFO[Skin.String(game.thumbshape.ps1.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.ps1,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17181">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Playstation Portable</label>
<label2>$INFO[Skin.String(game.thumbshape.psp.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.psp,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17182">
<include>SkinSettings_Button</include>
<label>Thumbnail shape PC (Microsoft Windows)</label>
<label2>$INFO[Skin.String(game.thumbshape.win.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.win,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17183">
<include>SkinSettings_Button</include>
<label>Thumbnail shape PC (MS DOS)</label>
<label2>$INFO[Skin.String(game.thumbshape.dos.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.dos,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17185">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Sega Master System</label>
<label2>$INFO[Skin.String(game.thumbshape.msys.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.msys,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17186">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Sega Megadrive/Genesis</label>
<label2>$INFO[Skin.String(game.thumbshape.megadr.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.megadr,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17187">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Sega 32x</label>
<label2>$INFO[Skin.String(game.thumbshape.32x.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.32x,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17188">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Sega Saturn</label>
<label2>$INFO[Skin.String(game.thumbshape.saturn.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.saturn,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17189">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Sega Dreamcast</label>
<label2>$INFO[Skin.String(game.thumbshape.dcast.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.dcast,header=Select preferred thumbnail type)</onclick>
</control>
<control type="button" id="17190">
<include>SkinSettings_Button</include>
<label>Thumbnail shape Sega Gamegear</label>
<label2>$INFO[Skin.String(game.thumbshape.gear.label)]</label2>
<onclick>RunScript(script.skin.helper.service,action=setskinsetting,setting=game.thumbshape.gear,header=Select preferred thumbnail type)</onclick>
</control>
</include>

<include name="SkinSettings_MenuButtonLarge">
<font>Reg28</font>
Expand Down
6 changes: 5 additions & 1 deletion 1080i/IncludesVariables.xml
View file
Open in desktop
Expand Up @@ -1394,8 +1394,12 @@
<value condition="$EXP[InGameMode] + $EXP[PlatformIsMasterSystem] + Skin.String(game.thumbshape.msys)">$INFO[Skin.String(game.thumbshape.msys)]</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIsMegadrive] + [Skin.String(game.thumbshape.megadr,auto) | !Skin.String(game.thumbshape.megadr)]">poster</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIsMegadrive] + Skin.String(game.thumbshape.megadr)">$INFO[Skin.String(game.thumbshape.megadr)]</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIsSaturn] + [Skin.String(game.thumbshape.saturn,auto) | !Skin.String(game.thumbshape.saturn)]">poster</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIs32x] + [Skin.String(game.thumbshape.32x,auto) | !Skin.String(game.thumbshape.32x)]">poster</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIs32x] + Skin.String(game.thumbshape.32x)">$INFO[Skin.String(game.thumbshape.32x)]</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIsSaturn] + [Skin.String(game.thumbshape.saturn,auto) | !Skin.String(game.thumbshape.saturn)]">slim</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIsSaturn] + Skin.String(game.thumbshape.saturn)">$INFO[Skin.String(game.thumbshape.saturn)]</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIsGameGear] + [Skin.String(game.thumbshape.gear,auto) | !Skin.String(game.thumbshape.gear)]">poster</value>
<value condition="$EXP[InGameMode] + $EXP[PlatformIsGameGear] + Skin.String(game.thumbshape.gear)">$INFO[Skin.String(game.thumbshape.gear)]</value>

<value condition="$EXP[InGameMode] + [Skin.String(game.thumbshape.default) + !Skin.String(game.thumbshape.default,auto)]">$INFO[Skin.String(game.thumbshape.default)]</value>
<value condition="$EXP[InGameMode]">square</value>
Expand Down
6 changes: 3 additions & 3 deletions addon.xml
View file
Open in desktop
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.titan.mod.beta.leia" version="18.1.12" name="T i t a n - M O D (BETA) for LEIA" provider-name="mardukl,cartman.dos,marcelveldt,mgonzales">
<addon id="skin.titan.mod.beta.leia" version="18.1.12-alpha.3" name="T i t a n - M O D (BETA) for LEIA" provider-name="mardukl,cartman.dos,marcelveldt,mgonzales">
<requires>
<import addon="xbmc.gui" version="5.14.0"/>
<import addon="script.skinshortcuts" version="0.6.5"/>
Expand All @@ -16,8 +16,8 @@
<import addon="resource.images.backgroundoverlays.basic" version="1.0.0"/>
</requires>
<extension point="xbmc.gui.skin" debugging="false">
<res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
<res width="1920" height="1200" aspect="16:10" default="false" folder="1080i" />
<res width="1920" height="1080" aspect="16:9" default="true" folder="1080i"/>
<res width="1920" height="1200" aspect="16:10" default="false" folder="1080i"/>
</extension>
<extension point="xbmc.addon.metadata">
<summary lang="bg_BG">Обликът "Titan MOD BETA for Kodi Leia" за MediaPortal адаптиран за Kodi, с много добавени функции.</summary>
Expand Down
2 changes: 2 additions & 0 deletions extras/skinsettings.xml
View file
Open in desktop
Expand Up @@ -568,6 +568,8 @@
<setting id="game.thumbshape.dcast" value="||SUBLEVEL||game.thumbshapes" label="Custom shape" condition="" icon="" description="Choose the desired type of thumbnail"/>
<setting id="game.thumbshape.gear" value="auto" default="true" label="Automatic shape" condition="" icon="" description="Automatically apply default type of thumbnail"/>
<setting id="game.thumbshape.gear" value="||SUBLEVEL||game.thumbshapes" label="Custom shape" condition="" icon="" description="Choose the desired type of thumbnail"/>
<setting id="game.thumbshape.saturn" value="auto" default="true" label="Automatic shape" condition="" icon="" description="Automatically apply default type of thumbnail"/>
<setting id="game.thumbshape.saturn" value="||SUBLEVEL||game.thumbshapes" label="Custom shape" condition="" icon="" description="Choose the desired type of thumbnail"/>

<setting id="game.thumbshapes" value="poster" label="Poster" condition="" icon="" description="Apply poster type of thumbnail"/>
<setting id="game.thumbshapes" value="bluray" label="Blu-ray" condition="" icon="" description="Apply Blu-ray type of thumbnail"/>
Expand Down