zune/ZuneModdingHelper
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneModdingHelper.git synced 2026-07-27 13:12:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and hacks for Home.uix

Browse Source
This commit is contained in:
Yoshi Askharoun
2024-03-29 11:33:44 -05:00
parent 4973d72474
commit b3a66bd258
2 changed files with 202 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneModdingHelper/Home.uix
+45 -122
View File
@@ -4,18 +4,21 @@
xmlns:sys="assembly://mscorlib/System"
xmlns:isui="assembly://IrisShell/IrisShell.UI"
xmlns:iris="assembly://UIX/Microsoft.Iris"
xmlns:styles="clr-res://UIXControls!Controls.Styles.uix"
xmlns:styles="res://UIXControls!Styles.uix"
xmlns:istyles="clr-res://IrisShell!Controls.Styles.uix"
xmlns:ianim="clr-res://IrisShell!Controls.Animations.uix"
xmlns:page="clr-res://IrisShell!Controls.PageStack.uix"
xmlns:toptoolbar="clr-res://ZuneModdingHelper!Controls.TopToolbar.uix"
xmlns:popuplayer="clr-res://UIXControls!Controls.PopupLayer.uix"
xmlns:jil="clr-res://IrisShell!Controls.JumpInList.uix"
xmlns:popuplayer="res://UIXControls!PopupLayer.uix"
xmlns:animations="res://UIXControls!Animations.uix"
xmlns:nonclient="clr-res://ZuneModdingHelper!Controls.NonClientControls.uix"
xmlns:focus="clr-res://IrisShell!Controls.FocusRect.uix">
<!--
xmlns:bottomtoolbar="clr-res://IrisShell!Controls.BottomToolbar.uix"
xmlns:cnav="clr-res://IrisShell!Controls.CollectionNavigation.uix"
xmlns:snav="clr-res://IrisShell!Controls.SocialNavigation.uix"
xmlns:animations="clr-res://UIXControls!Controls.Animations.uix"
xmlns:nonclient="clr-res://IrisShell!Controls.NonClientControls.uix"
xmlns:focus="clr-res://IrisShell!Controls.FocusRect.uix">
-->
<UI Name="Frame" Base="page:PageStack">
<Properties>
@@ -28,22 +31,21 @@
<isui:CurrentPageCommandHandler Name="Page"/>
<isui:DictionaryCommandHandler Name="Collection"
<!--<isui:DictionaryCommandHandler Name="Collection"
DictionaryCommandHandler="{cnav:Navigation.Root}"/>
<isui:DictionaryCommandHandler Name="Device"
DictionaryCommandHandler="{cnav:DeviceNavigation.Root}"/>
<isui:DictionaryCommandHandler Name="Social"
DictionaryCommandHandler="{snav:Navigation.Root}"/>
DictionaryCommandHandler="{snav:Navigation.Root}"/>-->
<isui:WebUrlCommandHandler Name="Web"/>
<!--<isui:WebUrlCommandHandler Name="Web"/>
<isui:HelpCommandHandler Name="Help"/>
<isui:HelpCommandHandler Name="Help"/>-->
</Handlers>
</isui:DictionaryCommandHandler>
<jil:JumpInList Name="JumpInList"/>
@@ -54,7 +56,7 @@
<sys:Boolean Name="AutoHideToolbars"/>
<Timer Name="KeyIdleTimer" Interval="{MouseActivityTimeout}" AutoRepeat="false" Enabled="false"/>
<styles:WindowState Name="WindowState"/>
<istyles:WindowState Name="WindowState"/>
</Locals>
<Input>
@@ -64,26 +66,8 @@
<KeyHandler Name="CancelSettings" Key="Escape" DisallowedModifiers="Alt,Shift,Windows,Ctrl" HandlerStage="Bubbled" />
<ShortcutHandler Name="ShortcutPlay" Shortcut="Play" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Play}"/>
<ShortcutHandler Name="ShortcutPause" Shortcut="Pause" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Pause}"/>
<ShortcutHandler Name="ShortcutPlayPause" Shortcut="PlayPause" HandlerStage="Bubbled"/>
<ShortcutHandler Name="ShortcutStop" Shortcut="Stop" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Stop}"/>
<ShortcutHandler Name="ShortcutSkipBack" Shortcut="SkipBack" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Back}"/>
<ShortcutHandler Name="ShortcutSkipForward" Shortcut="SkipForward" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Forward}"/>
<KeyHandler Name="KeyHandlerForward" Key="F" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Forward}"/>
<KeyHandler Name="KeyHandlerBack" Key="B" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Back}"/>
<KeyHandler Name="KeyHandlerStop" Key="S" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.Stop}"/>
<KeyHandler Name="KeyHandlerPlayPause" Key="P" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled"/>
<KeyHandler Name="KeyHandlerToggleShuffle" Key="H" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled"/>
<KeyHandler Name="KeyHandlerToggleRepeat" Key="T" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled"/>
<KeyHandler Name="KeyHandlerHelp" Key="F1" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
<KeyHandler Name="KeyHandlerToggleMute" Key="F7" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
<KeyHandler Name="KeyHandlerVolumeDown" Key="F8" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
<KeyHandler Name="KeyHandlerVolumeUp" Key="F9" DisallowedModifiers="Alt,Shift,Ctrl,Windows" HandlerStage="Bubbled"/>
<KeyHandler Name="KeyHandlerFastForward" Key="F" RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.FastforwardHotkey}"/>
<KeyHandler Name="KeyHandlerRewind" Key="B" RequiredModifiers="Ctrl,Shift" DisallowedModifiers="Alt,Windows" HandlerStage="Bubbled" Command="{isui:TransportControls.Instance.RewindHotkey}"/>
<KeyHandler Name="KeyHandlerSearchFocus" Key="E" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{isui:Search.Instance.SearchFocusHotkey}"/>
<!--<KeyHandler Name="KeyHandlerSearchFocus" Key="E" RequiredModifiers="Ctrl" DisallowedModifiers="Alt,Shift,Windows" HandlerStage="Bubbled" Command="{isui:Search.Instance.SearchFocusHotkey}"/>-->
<FocusHandler Name="FocusChangedUsingKeyboard" Reason="Key" HandlerStage="Bubbled"/>
<KeyHandler Name="ShowFocusRectF10" Key="F10" Handle="false" HandlerStage="Routed"/>
@@ -105,7 +89,7 @@
</Script>
<Script>
<!--<Script>
//isui:IrisPage page = [Shell.CurrentPage];
isui:IrisPage page = Shell.CurrentPage;
if (page is isui:CategoryPage)
@@ -116,7 +100,7 @@
{
CancelSettings.Command = null;
}
</Script>
</Script>-->
<Script>
@@ -180,7 +164,7 @@
TopToolbar.InvisibleMode = hideNow;
BottomToolbar.InvisibleMode = hideNow;
//BottomToolbar.InvisibleMode = hideNow;
@@ -188,7 +172,7 @@
FocusRect.Alpha = (float)!hideNow;
AnyKeys.StopRoute = hideNow;
styles:WindowState.InputActive = !hideNow;
istyles:WindowState.InputActive = !hideNow;
</Script>
<Script>
@@ -204,77 +188,15 @@
</Script>
<Script>
[DeclareTrigger(ShortcutPlayPause.Invoked)]
[DeclareTrigger(KeyHandlerPlayPause.Invoked)]
if (isui:TransportControls.Instance.Playing)
{
isui:TransportControls.Instance.Pause.Invoke();
}
else
{
isui:TransportControls.Instance.Play.Invoke();
}
</Script>
<Script>
bool shouldBeVisible = isui:JumpInListManager.Instance.IsActive;
if (shouldBeVisible &amp;&amp; !JumpInList.Helper.IsVisible)
{
JumpInList.Helper.Show(JumpInList);
}
else if (!shouldBeVisible &amp;&amp; JumpInList.Helper.IsVisible)
{
JumpInList.Helper.Hide();
}
</Script>
<Script>
if (!JumpInList.Helper.IsVisible)
{
isui:JumpInListManager.Instance.Clear();
}
</Script>
<Script>
SpaceKeyHandler.Command = TopToolbar.MenuCommand;
</Script>
<Script>
[DeclareTrigger(KeyHandlerToggleShuffle.Invoked)]
isui:TransportControls.Instance.Shuffling.NextValue(true);
</Script>
<Script>
[DeclareTrigger(KeyHandlerToggleRepeat.Invoked)]
isui:TransportControls.Instance.Repeating.NextValue(true);
</Script>
<Script>
[DeclareTrigger(KeyHandlerToggleMute.Invoked)]
isui:TransportControls.Instance.Muted.NextValue(true);
</Script>
<Script>
[DeclareTrigger(KeyHandlerVolumeDown.Invoked)]
isui:TransportControls.Instance.Volume.Value = isui:TransportControls.Instance.Volume.Value - 10.0;
</Script>
<Script>
[DeclareTrigger(KeyHandlerVolumeUp.Invoked)]
isui:TransportControls.Instance.Volume.Value = isui:TransportControls.Instance.Volume.Value + 10.0;
</Script>
<Script>
[DeclareTrigger(KeyHandlerHelp.Invoked)]
string helpPath = "Help\\" + isui:Shell.LoadString(&quot;IDS_ZUNECLIENT_LOCALE&quot;) + "\LandingPage.htm";
string helpPath = "Help\\" + isui:Shell.LoadString(&quot;IDS_ZUNECLIENT_LOCALE&quot;) + "\\LandingPage.htm";
isui:Shell.DefaultInstance.Execute(helpPath, null);
</Script>
@@ -288,7 +210,7 @@
<Script>
if (!iris:Application.Window.Active || !isui:PopupManager.Instance.AnyDialogs)
if (!iris:Application.Window.Active)// || !isui:PopupManager.Instance.AnyDialogs)
{
FocusRect.Visible = false;
}
@@ -299,7 +221,7 @@
</Script>
<Script>
MainBackground.Content = new Image(Shell.BackgroundImage, styles:Styles.BackgroundMargins);
MainBackground.Content = new Image(Shell.BackgroundImage, istyles:Styles.BackgroundMargins);
</Script>
</Scripts>
@@ -314,18 +236,18 @@
</LayoutInput>
</focus:FocusRect>
<nonclient:WindowResizeBorderLayer Name="ResizeBorders" Layout="Fill"/>
<nonclient:WindowResizeBorderLayer Name="ResizeBorders" Layout="Default"/>
<popuplayer:PopupLayer Name="PopupLayer" Layout="Fill"/>
<popuplayer:PopupLayer Name="PopupLayer" Layout="Default"/>
<Graphic Name="Grabber" Content="{styles:Styles.Grabber}" MaximumSize="9,6" Layout="Fill">
<Graphic Name="Grabber" Content="{istyles:Styles.Grabber}" MaximumSize="9,6" Layout="Default">
<LayoutInput>
<AnchorLayoutInput Name="GrabberLayout" Bottom="Parent,1" Right="Parent,1,-1"/>
</LayoutInput>
</Graphic>
<Graphic Name="EnergyBar" Content="{styles:Styles.EnergyBar}" MaximumSize="0,6" Layout="Fill" Visible="true" Margins="1,0,0,0"/>
<Graphic Name="EnergyBar" Content="{styles:Styles.EnergyBar}" MaximumSize="0,6" Layout="Default" Visible="true" Margins="1,0,0,0"/>
<Panel Layout="Anchor" Navigation="RememberFocus,ContainAll,WrapTabOrder" FocusOrder="0">
@@ -335,44 +257,45 @@
<toptoolbar:TopToolbar Name="TopToolbar" Shell="{Shell}" FocusOrder="1">
<LayoutInput>
<DockLayoutInput Position="Top"/>
</LayoutInput>
<!--<LayoutInput>Top</LayoutInput>-->
</toptoolbar:TopToolbar>
<bottomtoolbar:BottomToolbar Name="BottomToolbar" Shell="{Shell}" FocusOrder="4">
<LayoutInput>
<DockLayoutInput Position="Bottom"/>
</LayoutInput>
</bottomtoolbar:BottomToolbar>
<!--<bottomtoolbar:BottomToolbar Name="BottomToolbar" Shell="{Shell}" FocusOrder="4">
<LayoutInput>Bottom</LayoutInput>
</bottomtoolbar:BottomToolbar>-->
<Panel>
<Children>
<Text WordWrap="true" Content="Bottom toolbar!" />
</Children>
<!--<LayoutInput>
<DockLayoutInput>Bottom</DockLayoutInput>
</LayoutInput>-->
</Panel>
<page:PageBase Name="ForegroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}" FocusOrder="2" Margins="{styles:Styles.FrameMargins}">
<LayoutInput>
<DockLayoutInput Position="Client"/>
</LayoutInput>
<page:PageBase Name="ForegroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}" FocusOrder="2" Margins="{istyles:Styles.FrameMargins}">
<!--<LayoutInput>Client</LayoutInput>-->
</page:PageBase>
</Children>
</Panel>
<page:PageBase Name="BackgroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}" FocusOrder="3" Layout="Fill"/>
<page:PageBase Name="BackgroundUI" Shell="{Shell}" Page="{Shell.CurrentPage}" FocusOrder="3" Layout="Default"/>
</Children>
</Panel>
<Graphic
Name="MainBackground"
Layout="Fill"
ErrorImage="{styles:Styles.DefaultBackgroundImage}"
>
Layout="Default"
ErrorImage="{istyles:Styles.DefaultBackgroundImage}">
<Animations>
<Animation Animation="{animations:Animations.MainBackgroundPageTransitionHide}"/>
<Animation Animation="{ianim:Animations.MainBackgroundPageTransitionHide}"/>
</Animations>
</Graphic>
ZuneModdingHelper/ZuneModdingHelper.csproj
-1
View File
@@ -32,7 +32,6 @@
<ItemGroup>
<EmbeddedResource Include="**\*.uix" />
<None Remove="Controls\TOPTOOLBAR.UIX" />
<Resource Include="Assets\ZMH_Icons.ttf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>