Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
eriksoderblom committed Jan 1, 2013
2 parents c8da6c2 + 40c1364 commit a1b1869bbe0136006e1201797bd33ba7adee7c15
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -90,7 +90,7 @@
<control type="button" id="7">
<label>$INFO[system.profilename,$LOCALIZE[20126] ]</label>
<include>Objects_ShutdownMenuButton</include>
- <onclick>Dialog.Close(all)</onclick>
+ <onclick>Dialog.Close(all,true)</onclick>
<onclick>System.LogOff</onclick>
<visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
<visible>System.Loggedon</visible>
@@ -625,7 +625,7 @@
</item>
<item>
<label>20126</label>
- <onclick>Dialog.Close(all)</onclick>
+ <onclick>Dialog.Close(all,true)</onclick>
<onclick>System.LogOff</onclick>
<visible>Substring(Control.GetLabel(4327),shutdown) + IsEmpty(Skin.String(ShutdownSub6)) + [System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)] + System.Loggedon</visible>
</item>
@@ -5,8 +5,8 @@
<onunload>ClearProperty(CustomYesNoDialog,1124)</onunload>
<onload>SetProperty(Transparency,default,1124)</onload>
<onload>Dialog.Close(1133)</onload>
- <onunload>Skin.SetString(ItemToEdit.$INFO[Window(1124).Property(WidgetSelection)]Title)</onunload>
- <zorder>4</zorder>
+<!-- <onunload>Skin.SetString(ItemToEdit.$INFO[Window(1124).Property(WidgetSelection)]Title)</onunload>
+ --> <zorder>4</zorder>
<coordinates>
<system>1</system>
<posx>0</posx>
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -598,7 +598,7 @@
<control type="button" id="22">
<label>$LOCALIZE[31096]</label>
<onclick>ActivateWindow(videos,plugin://plugin.video.youtube/?path=/root/search&amp;feed=search&amp;search=$INFO[ListItem.Label],return)</onclick>
- <onclick>Dialog.Close(all)</onclick>
+ <onclick>Dialog.Close(all,true)</onclick>
<include>DialogVideoInfoButton</include>
</control>
</control>
@@ -127,7 +127,7 @@
<control type="button" id="22">
<label>$LOCALIZE[31096]</label>
<onclick>ActivateWindow(videos,plugin://plugin.video.youtube/?path=/root/search&amp;feed=search&amp;search=$INFO[ListItem.Title],return)</onclick>
- <onclick>Dialog.Close(all)</onclick>
+ <onclick>Dialog.Close(all,true)</onclick>
<include>DialogVideoInfoButton</include>
</control>
</control>
@@ -177,7 +177,7 @@
</item>
<item id="10">
<label>31066</label>
- <onclick>Dialog.Close(all)</onclick>
+ <onclick>Dialog.Close(all,true)</onclick>
<visible>Control.IsVisible(199)</visible>
</item>
</content>

0 comments on commit a1b1869

Please sign in to comment.