-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #336 from MediaPortal/MP1.36.Pre-DWHD_Trakt_Update
MP1.36.Pre: DWHD Trakt Update and XML Validation
- Loading branch information
Showing
20 changed files
with
268 additions
and
174 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Unregister.bat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| @echo off | ||
| REM Unregisters Gentle.Framework in HTML 2 Help | ||
| "C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.ini" | ||
| "C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.help" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,4 +36,4 @@ | |
| <BandWidth>8</BandWidth> | ||
| <Offset>167</Offset> | ||
| </DVBTTuning> | ||
| </ArrayOfDVBTTuning>3 | ||
| </ArrayOfDVBTTuning> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 65 additions & 65 deletions
130
mediaportal/MediaPortal.Base/skin/DefaultWideHD/Trakt.Settings.Account.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,65 @@ | ||
| <?xml version="1.0" encoding="utf-8" standalone="yes"?> | ||
| <!--version="1.0" encoding="utf-8" standalone="yes"--> | ||
| <!--version="1.0" encoding="utf-8" standalone="yes"--> | ||
| <window> | ||
| <id>87272</id> | ||
| <defaultcontrol>2</defaultcontrol> | ||
| <allowoverlay>no</allowoverlay> | ||
| <define>#currentmodule:#Trakt.Translation.AccountSetup.Label</define> | ||
| <define>#selecteditem:#highlightedbutton</define> | ||
| <define>#defaultcontrol:2</define> | ||
| <define>#defaultcontrol.onleft:9997</define> | ||
| <controls> | ||
| <control> | ||
| <description>BG</description> | ||
| <type>image</type> | ||
| <id>1</id> | ||
| <texture>BH Trakt.jpg</texture> | ||
| <width>1920</width> | ||
| <height>1080</height> | ||
| <colordiffuse>90ffffff</colordiffuse> | ||
| </control> | ||
| <import>Trakt.Common.Fanart.xml</import> | ||
| <import>common.window.xml</import> | ||
| <import>common.time.xml</import> | ||
| <import>Trakt.Common.xml</import> | ||
| <control> | ||
| <type>group</type> | ||
| <description>group element</description> | ||
| <posX>525</posX> | ||
| <posY>241</posY> | ||
| <width>559</width> | ||
| <height>568</height> | ||
| <layout>StackLayout(Vertical)</layout> | ||
| <visible>!string.equals(#Trakt.Settings.Account.Dialog.Visible,true)</visible> | ||
| <control> | ||
| <type>button</type> | ||
| <description>Create New Account</description> | ||
| <id>2</id> | ||
| <width>600</width> | ||
| <label>#Trakt.Translation.CreateNewAccount.Label</label> | ||
| <onup>17</onup> | ||
| <width>799</width> | ||
| <onleft>#defaultcontrol.onleft</onleft> | ||
| </control> | ||
| <control> | ||
| <description>Login to Existing Account</description> | ||
| <type>button</type> | ||
| <id>3</id> | ||
| <width>799</width> | ||
| <label>#Trakt.Translation.LoginExistingAccount.Label</label> | ||
| <onleft>#defaultcontrol.onleft</onleft> | ||
| </control> | ||
| <control> | ||
| <description>Disconnect Current Account</description> | ||
| <type>button</type> | ||
| <id>4</id> | ||
| <width>799</width> | ||
| <label /> | ||
| <onleft>#defaultcontrol.onleft</onleft> | ||
| <ondown>2</ondown> | ||
| </control> | ||
| </control> | ||
| <import>Trakt.AccountDialog.xml</import> | ||
| </controls> | ||
| </window> | ||
| <?xml version="1.0" encoding="utf-8" standalone="yes"?> | ||
| <!--version="1.0" encoding="utf-8" standalone="yes"--> | ||
| <!--version="1.0" encoding="utf-8" standalone="yes"--> | ||
| <window> | ||
| <id>87279</id> | ||
| <defaultcontrol>2</defaultcontrol> | ||
| <allowoverlay>no</allowoverlay> | ||
| <define>#currentmodule:#Trakt.Translation.AccountSetup.Label</define> | ||
| <define>#selecteditem:#highlightedbutton</define> | ||
| <define>#defaultcontrol:2</define> | ||
| <define>#defaultcontrol.onleft:9997</define> | ||
| <controls> | ||
| <control> | ||
| <description>BG</description> | ||
| <type>image</type> | ||
| <id>1</id> | ||
| <texture>BH Trakt.jpg</texture> | ||
| <width>1920</width> | ||
| <height>1080</height> | ||
| <colordiffuse>90ffffff</colordiffuse> | ||
| </control> | ||
| <import>Trakt.Common.Fanart.xml</import> | ||
| <import>common.window.xml</import> | ||
| <import>common.time.xml</import> | ||
| <import>Trakt.Common.xml</import> | ||
| <control> | ||
| <type>group</type> | ||
| <description>group element</description> | ||
| <posX>525</posX> | ||
| <posY>241</posY> | ||
| <width>559</width> | ||
| <height>568</height> | ||
| <layout>StackLayout(Vertical)</layout> | ||
| <visible>!string.equals(#Trakt.Settings.Account.Dialog.Visible,true)</visible> | ||
| <control> | ||
| <type>button</type> | ||
| <description>Create New Account</description> | ||
| <id>2</id> | ||
| <width>600</width> | ||
| <label>#Trakt.Translation.CreateNewAccount.Label</label> | ||
| <onup>17</onup> | ||
| <width>799</width> | ||
| <onleft>#defaultcontrol.onleft</onleft> | ||
| </control> | ||
| <control> | ||
| <description>Login to Existing Account</description> | ||
| <type>button</type> | ||
| <id>3</id> | ||
| <width>799</width> | ||
| <label>#Trakt.Translation.LoginExistingAccount.Label</label> | ||
| <onleft>#defaultcontrol.onleft</onleft> | ||
| </control> | ||
| <control> | ||
| <description>Disconnect Current Account</description> | ||
| <type>button</type> | ||
| <id>4</id> | ||
| <width>799</width> | ||
| <label /> | ||
| <onleft>#defaultcontrol.onleft</onleft> | ||
| <ondown>2</ondown> | ||
| </control> | ||
| </control> | ||
| <import>Trakt.AccountDialog.xml</import> | ||
| </controls> | ||
| </window> |
Oops, something went wrong.