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

Improved decomp error debugging

Browse Source
This commit is contained in:
Yoshi Askharoun
2021-10-27 14:09:51 -05:00
parent 180e272ca8
commit 6fcfe0c819
7 changed files with 131 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneUIXTools.ViewModels/ZuneUIXTools.ViewModels.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>preview</LangVersion>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>uixtools.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup>
ZuneUIXTools/MainWindow.xaml.cs
+9 -1
View File
@@ -266,7 +266,7 @@ namespace ZuneUIXTools
Application.Run();
InterpreterContext.UseDecompile = false;
File.WriteAllText(System.IO.Path.ChangeExtension(compiledFile, ".decomp.uix"), InterpreterContext.DecompileResult.InnerXml);
File.WriteAllText(System.IO.Path.ChangeExtension(compiledFile, $".decomp.uix"), InterpreterContext.DecompileResults.Last().InnerXml);
}
catch (Exception ex)
{
@@ -276,6 +276,14 @@ namespace ZuneUIXTools
$"Failed to decompile '{compiledFile}'",
"Zune UIX Tools", MessageBoxButton.OK, MessageBoxImage.Error
);
System.Diagnostics.Debug.WriteLine(ex.ToString());
TextBlock errBlock = new TextBlock
{
Text = ex.ToString(),
Margin = new Thickness(0, 0, 0, 4)
};
ErrorPanel.Children.Add(errBlock);
});
}
}
ZuneUIXTools/ZuneUIXTools.csproj
+2 -2
View File
@@ -5,8 +5,8 @@
<TargetFramework>net48</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>Images\VCSIrisProject.ico</ApplicationIcon>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>uixtools.pfx</AssemblyOriginatorKeyFile>
<!--<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>uixtools.pfx</AssemblyOriginatorKeyFile>-->
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
test/testA.decomp.uix
+11 -1
View File
@@ -1 +1,11 @@
<UI Name="Default"><Content><Text Color="A=255, R=255, G=0, B=0" Content="Howdy from Microsoft.Iris!" /></Content></UI>
<UIX xmlns="http://schemas.microsoft.com/2007/uix">
<UI Name="Default">
<Content>
<Text Content="Howdy from Microsoft.Iris!">
<Color>
<Color R="255" A="255" />
</Color>
</Text>
</Content>
</UI>
</UIX>
test/text.decomp.uix
+101 -1
View File
@@ -1 +1,101 @@
<UI Name="Default" />
<UIX xmlns="http://schemas.microsoft.com/2007/uix">
<UI Name="Default">
<Locals>
<Font FontSize="10" AltFontSize="10" FontName="Bahnschrift" Name="SmallFont" />
<Font FontName="JetBrains Mono" FontSize="18" FontStyle="Bold, Italic" Name="BigFont" />
</Locals>
<Content>
<Panel>
<Layout>
<FlowLayout Orientation="Vertical">
<Spacing>
<MajorMinor Major="50" />
</Spacing>
</FlowLayout>
</Layout>
<Children>
<Host Name="TextSettings" />
<Host Name="UsingMargins" />
<Host Name="UsingColorfillWithText" />
</Children>
</Panel>
</Content>
</UI>
<UI Name="TextSettings">
<Content>
<Panel>
<Layout>
<FlowLayout Orientation="Vertical" MinimumSampleSize="3" />
</Layout>
<MaximumSize>
<Size Width="140" />
</MaximumSize>
<Children>
<Text MaximumLines="3" WordWrap="True" Content="This large text will wrap. This sentence won't be displayed because it exceeds the 3 line maximum.">
<HighlightColor>
<Color R="255" G="215" A="255" />
</HighlightColor>
<Font>
<Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
</Font>
</Text>
</Children>
</Panel>
</Content>
</UI>
<UI Name="UsingMargins">
<Content>
<Panel>
<Layout>
<FlowLayout Orientation="Vertical" MinimumSampleSize="3" />
</Layout>
<Children>
<Text Content="You can use margins to create space between text items:">
<Color>
<Color R="127" G="255" B="212" A="255" />
</Color>
<Font>
<Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
</Font>
</Text>
<Text Content="This sentence has a top margin of 20 pixels.">
<Margins>
<Inset Top="20" />
</Margins>
<Color>
<Color R="135" G="206" B="235" A="255" />
</Color>
<Font>
<Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
</Font>
</Text>
</Children>
</Panel>
</Content>
</UI>
<UI Name="UsingColorfillWithText">
<Content>
<Panel>
<Layout>
<FlowLayout Orientation="Vertical" MinimumSampleSize="3" />
</Layout>
<MinimumSize>
<Size Width="500" Height="40" />
</MinimumSize>
<Children>
<Text LineAlignment="Center" Content="&lt;b&gt;Gig em&lt;b/&gt;, Ags!">
<Color>
<Color R="128" A="255" />
</Color>
<Font>
<Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
</Font>
<NamedStyles>
<Dictionary />
</NamedStyles>
</Text>
</Children>
</Panel>
</Content>
</UI>
</UIX>
test/text.uib
BIN
View File
Binary file not shown.
test/text.uix
+7 -2
View File
@@ -4,7 +4,6 @@
<UI Name="Default">
<!-- This UI displays the other UIs. TextDisplay -->
<Locals>
<Font Name="SmallFont" Font="Bahnschrift,10" />
<Font Name="BigFont" FontName="JetBrains Mono" FontSize="18" FontStyle="Bold,Italic"/>
</Locals>
@@ -51,7 +50,13 @@
<Content>
<Panel Layout="VerticalFlow" MinimumSize="500,40">
<Children>
<Text LineAlignment="Center" Color="Maroon" Font="Bahnschrift" Content="Gig em, Ags!" />
<Text LineAlignment="Center" Color="Maroon" Font="Bahnschrift" Content="&lt;b&gt;Gig em&lt;b/&gt;, Ags!">
<NamedStyles>
<TextStyle Name="StyleA">
<FontSize>24</FontSize>
</TextStyle>
</NamedStyles>
</Text>
</Children>
</Panel>
</Content>