Skip to content

Commit

Permalink
v1.0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@KilLo445
KilLo445 committed Feb 19, 2024
1 parent 7de0000 commit 84ea6f5
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 16 deletions.
Binary file added extract-xiso-gui/Fonts/Roboto/Roboto-Bold.ttf
View file
Binary file not shown.
Binary file added extract-xiso-gui/Fonts/Roboto/Roboto-Light.ttf
View file
Binary file not shown.
Binary file added extract-xiso-gui/Fonts/Roboto/Roboto-Regular.ttf
View file
Binary file not shown.
Binary file added extract-xiso-gui/Images/xbox.ico
View file
Binary file not shown.
18 changes: 11 additions & 7 deletions extract-xiso-gui/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,26 @@
ResizeMode="CanMinimize"
Background="White"
AllowsTransparency="False"
Title="extract-xiso-gui" Height="450" Width="800">
Title="extract-xiso-gui" Height="350" Width="400">
<Grid>
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="extract-xiso-gui" Foreground="Black" FontFamily="/Fonts/Roboto/#Roboto" FontWeight="Regular" FontSize="24" Height="32" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,35,0,0"/>

<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0">
<TextBox Name="ISOPathBox" Text="" IsReadOnly="True" FontSize="18" TextWrapping="NoWrap" Width="200" Height="30" BorderThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0"/>
<Button Name="BrowseBTN" Content="Browse" Click="BrowseBTN_Click" FontSize="15" Width="100" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20,0,0,0"/>
<TextBox Name="ISOPathBox" Text="" HorizontalScrollBarVisibility="Visible" IsReadOnly="True" FontFamily="/Fonts/Roboto/#Roboto" FontWeight="Light" FontSize="18" TextWrapping="NoWrap" Width="200" Height="50" BorderThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0"/>
<Button Name="BrowseBTN" Content="Browse" Click="BrowseBTN_Click" FontFamily="/Fonts/Roboto/#Roboto" FontWeight="Regular" FontSize="22" Width="100" Height="50" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,20,0,0">
<ComboBox Name="ComboBox" IsEditable="False" FontSize="18" Width="200" Height="30" BorderThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0">
<ComboBox Name="ComboBox" IsEditable="False" FontFamily="/Fonts/Roboto/#Roboto" FontWeight="Regular" FontSize="22" Width="200" Height="50" BorderThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,0">
<ComboBoxItem Content="List"/>
<ComboBoxItem Content="Rewrite"/>
<ComboBoxItem Content="Extract"/>
</ComboBox>
<Button Name="GoBTN" Content="Go!" Click="GoBTN_Click" FontSize="15" Width="100" Height="30" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20,0,0,0"/>
<Button Name="GoBTN" Content="Go!" Click="GoBTN_Click" FontFamily="/Fonts/Roboto/#Roboto" FontWeight="Bold" FontSize="22" Width="100" Height="50" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="20,0,0,0"/>
</StackPanel>
</StackPanel>
<ProgressBar Name="pb" Width="750" Height="20" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20" Visibility="Hidden"/>

<Button Name="openGitHub" Content="Open GitHub" Click="openGitHub_Click" FontFamily="/Fonts/Roboto/#Roboto" FontWeight="Light" FontSize="14" Width="100" Height="30" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,50"/>
<ProgressBar Name="pb" Width="350" Height="20" HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,20" Visibility="Hidden"/>
</Grid>
</Window>
30 changes: 24 additions & 6 deletions extract-xiso-gui/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@
using System.IO;
using System.IO.Compression;
using System.Net;
using System.Threading.Tasks;
using System.Windows;
using WinForms = System.Windows.Forms;

namespace extract_xiso_gui
{
public partial class MainWindow : Window
{
string guiVersion = "1.0.3";
string onlineVerLink = "https://pastebin.com/raw/nbvmxK7D";
string guiVersion = "1.0.4";
string onlineVerLink = "https://raw.githubusercontent.com/KilLo445/extract-xiso-gui/master/extract-xiso-gui/version.txt";
string updateDL = "https://github.com/KilLo445/extract-xiso-gui/releases/latest";
string updaterDL = "https://github.com/KilLo445/extract-xiso-gui/raw/master/extract-xiso-gui/updater.exe";

Expand All @@ -35,9 +36,10 @@ public partial class MainWindow : Window
string xisoMode;

string mainCMD;
string finalCMD;
string[] finalCMD;

bool BackupDL;
bool xisoRunning = false;

public MainWindow()
{
Expand Down Expand Up @@ -220,6 +222,12 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
}
}

if (comboBoxSelection == null || comboBoxSelection == "")
{
MessageBox.Show("Please select a mode.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
return;
}

if (comboBoxSelection != null)
{
if (comboBoxSelection == "List")
Expand All @@ -242,7 +250,7 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
outputDir = Path.Combine(extractOutputDirDialog.SelectedPath);
Directory.CreateDirectory(outputDir);

MessageBoxResult delISO = MessageBox.Show("Would you like to delete the original ISO after rewrite?", "Delete original ISO", MessageBoxButton.YesNo, MessageBoxImage.Information);
MessageBoxResult delISO = MessageBox.Show("Would you like to delete the original ISO after rewrite?", "Delete ISO", MessageBoxButton.YesNo, MessageBoxImage.Information);
if (delISO == MessageBoxResult.Yes)
{
mainCMD = $"\"{extractXISO}\" -D -d \"{outputDir}\" -r \"{isoFilename}\"";
Expand Down Expand Up @@ -288,9 +296,8 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
"pause",
"exit"
};
File.WriteAllLines(xisoBat, finalCMD);
Process.Start(xisoBat);

File.WriteAllLines(xisoBat, finalCMD);
if (xisoMode == "r" || xisoMode == "x")
{
MessageBoxResult openExtracted = MessageBox.Show("Would you like to open your output directory?", "", MessageBoxButton.YesNo, MessageBoxImage.Information);
Expand All @@ -299,6 +306,8 @@ private void GoBTN_Click(object sender, RoutedEventArgs e)
Process.Start(outputDir);
}
}
Process.Start(xisoBat);
return;
}
}

Expand Down Expand Up @@ -358,6 +367,15 @@ private void DownloadXISOComplete(object sender, AsyncCompletedEventArgs e)
}
}

private void openGitHub_Click(object sender, RoutedEventArgs e)
{
try
{
Process.Start("https://github.com/KilLo445/extract-xiso-gui");
}
catch (Exception ex) { MessageBox.Show($"{ex}", "Error", MessageBoxButton.OK, MessageBoxImage.Error); }
}

struct Version
{
internal static Version zero = new Version(0, 0, 0);
Expand Down
78 changes: 78 additions & 0 deletions extract-xiso-gui/app.manifest
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<!-- UAC Manifest Options
If you want to change the Windows User Account Control level replace the
requestedExecutionLevel node with one of the following.
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
Specifying requestedExecutionLevel element will disable file and registry virtualization.
Remove this element if your application requires this virtualization for backwards
compatibility.
-->
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- A list of the Windows versions that this application has been tested on
and is designed to work with. Uncomment the appropriate elements
and Windows will automatically select the most compatible environment. -->

<!-- Windows Vista -->
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->

<!-- Windows 7 -->
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->

<!-- Windows 8 -->
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->

<!-- Windows 8.1 -->
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->

<!-- Windows 10 -->
<!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->

</application>
</compatibility>

<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config.
Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->

<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
</windowsSettings>
</application>

<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
<!--
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
-->

</assembly>
19 changes: 16 additions & 3 deletions extract-xiso-gui/extract-xiso-gui.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,19 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<DebugType>embedded</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Images\xbox.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>
</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down Expand Up @@ -92,6 +95,10 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.manifest" />
<Resource Include="Fonts\Roboto\Roboto-Bold.ttf" />
<Resource Include="Fonts\Roboto\Roboto-Light.ttf" />
<Resource Include="Fonts\Roboto\Roboto-Regular.ttf" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand All @@ -108,5 +115,11 @@
<ItemGroup>
<None Include="updater.exe" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\xbox.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="version.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

0 comments on commit 84ea6f5

Please sign in to comment.