Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
eriksoderblom committed Dec 30, 2012
2 parents bbcc5d2 + 2af93ea commit 776bb21
Show file tree
Hide file tree
Showing 190 changed files with 827 additions and 996 deletions.
3 changes: 1 addition & 2 deletions 1080i/AddonBrowser.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window>
<window>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>no</allowoverlay>
<views>50,57,500,505,509,511,512,53,518</views>
Expand Down
4 changes: 2 additions & 2 deletions 1080i/Custom_1122_ItemChooser.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1122">
<window type="dialog" id="1122">
<defaultcontrol always="true">4</defaultcontrol>
<allowoverlay>no</allowoverlay>
<onunload>Skin.SetString($INFO[Window(home).Property(MenuItem)].Type,$INFO[Skin.String(ItemToEdit.Type)])</onunload>
Expand Down Expand Up @@ -118,6 +117,7 @@
<height>100</height>
<align>center</align>
<aspectratio>keep</aspectratio>
<colordiffuse>white</colordiffuse>
</control>
</control>
<control type="group">
Expand Down
3 changes: 1 addition & 2 deletions 1080i/Custom_1123.MediaMenuHelp.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window id="1123" type="dialog">
<window id="1123" type="dialog">
<defaultcontrol always="true">100</defaultcontrol>
<include>Animation_DialogPopup</include>
<controls>
Expand Down
10 changes: 1 addition & 9 deletions 1080i/Custom_1133_WidgetChooser.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1133">
<window type="dialog" id="1133">
<onload>ClearProperty(NoStyleSelect)</onload>
<defaultcontrol always="true">4</defaultcontrol>
<allowoverlay>no</allowoverlay>
Expand Down Expand Up @@ -303,13 +302,6 @@
<onclick>Skin.SetString(ItemToEdit.$INFO[Window(1124).Property(WidgetSelection)]Title,$LOCALIZE[42220])</onclick>
<onclick>Dialog.Close(1133)</onclick>
</item>
<item>
<label>42221</label>
<onclick>Skin.SetString(ItemToEdit.$INFO[Window(1124).Property(WidgetSelection)],googlepaneldefault)</onclick>
<onclick>Skin.SetString(ItemToEdit.$INFO[Window(1124).Property(WidgetSelection)]Title,$LOCALIZE[42221])</onclick>
<onclick>Dialog.Close(1133)</onclick>
<visible>SubString(Weather.Plugin,weather.google)</visible>
</item>
<item>
<label>31183</label>
<onclick>Skin.SetString(ItemToEdit.$INFO[Window(1124).Property(WidgetSelection)],wundergroundpaneldefault)</onclick>
Expand Down
3 changes: 1 addition & 2 deletions 1080i/Custom_1135_IconCustomizer.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1135">
<window type="dialog" id="1135">
<defaultcontrol always="true">4</defaultcontrol>
<allowoverlay>no</allowoverlay>
<onunload>Skin.SetString($INFO[Window(home).Property(MenuItem)].Type,$INFO[Skin.String(ItemToEdit.Type)])</onunload>
Expand Down
3 changes: 1 addition & 2 deletions 1080i/Custom_1136_SubCustomizer.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1136">
<window type="dialog" id="1136">
<defaultcontrol always="true">4</defaultcontrol>
<allowoverlay>no</allowoverlay>
<onload>Skin.Reset(ItemToEdit.Disable)</onload>
Expand Down
3 changes: 1 addition & 2 deletions 1080i/Custom_1148_SmartPlaylistManager.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1148">
<window type="dialog" id="1148">
<defaultcontrol always="true">4</defaultcontrol>
<allowoverlay>no</allowoverlay>
<controls>
Expand Down
3 changes: 1 addition & 2 deletions 1080i/Custom_1161_InfoLineChooser.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1161">
<window type="dialog" id="1161">
<defaultcontrol always="true">4</defaultcontrol>
<allowoverlay>no</allowoverlay>
<controls>
Expand Down
3 changes: 1 addition & 2 deletions 1080i/Custom_1162_RSSManager.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1162">
<window type="dialog" id="1162">
<defaultcontrol always="true">4</defaultcontrol>
<allowoverlay>no</allowoverlay>
<controls>
Expand Down
3 changes: 1 addition & 2 deletions 1080i/Custom_1163_ArtworkPopup.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window type="dialog" id="1163">
<window type="dialog" id="1163">
<defaultcontrol always="true">5052</defaultcontrol>
<coordinates>
<system>1</system>
Expand Down
3 changes: 1 addition & 2 deletions 1080i/DialogAddonInfo.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window>
<window>
<defaultcontrol always="true">9000</defaultcontrol>
<animation type="WindowOpen" reversible="false" condition="!Window.Previous(addonsettings)">
<effect type="zoom" start="150" end="100" center="960,540" time="300" tween="cubic" />
Expand Down
3 changes: 1 addition & 2 deletions 1080i/DialogAddonSettings.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<window>
<window>
<defaultcontrol always="true">9</defaultcontrol>
<controls>
<control type="group">
Expand Down

0 comments on commit 776bb21

Please sign in to comment.