Skip to content

Commit 91766c6

Browse files
NinjaCheetahNinjaCheetah
committed
90: v3.0 Commit 11: idk man I did some stuff but also updated to .NET 5.0.
1 parent 3a80eb9 commit 91766c6

10 files changed

Lines changed: 168 additions & 93 deletions

‎NCX-Installer/NCX-Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0-windows</TargetFramework>
66
<RootNamespace>NCX_Installer</RootNamespace>
77
<UseWPF>true</UseWPF>
88
<ApplicationIcon>Icon.ico</ApplicationIcon>

‎NCX-Installer/XSC64TL.xaml.cs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,12 @@ private void Button_Click_2(object sender, RoutedEventArgs e)
4747
NavigationService.Navigate(page);
4848
}
4949

50-
private void Button_Click_3(object sender, RoutedEventArgs e)
51-
{
52-
XSC64TLP page = new XSC64TLP();
53-
NavigationService.Navigate(page);
54-
}
55-
5650
private void Button_Click_4(object sender, RoutedEventArgs e)
5751
{
5852
using (WebClient wc = new WebClient())
5953
{
60-
btn5.Visibility = Visibility.Hidden;
54+
btn8.Visibility = Visibility.Hidden;
55+
btn10.Visibility = Visibility.Hidden;
6156
label1.Visibility = Visibility.Visible;
6257
wc.DownloadFileCompleted += DownloadCompleted;
6358
wc.DownloadProgressChanged += wc_DownloadProgressChanged;
@@ -138,15 +133,15 @@ private void Button_Click_6(object sender, RoutedEventArgs e)
138133
{
139134
using (WebClient wc = new WebClient())
140135
{
141-
btn5.Visibility = Visibility.Hidden;
136+
btn11.Visibility = Visibility.Hidden;
142137
label1.Visibility = Visibility.Visible;
143138
wc.DownloadFileCompleted += DownloadCompleted;
144139
wc.DownloadProgressChanged += wc_DownloadProgressChanged;
145140
wc.DownloadFileAsync(
146141
// Param1 = Link of file
147-
new System.Uri("https://github.com/IanSkinner1982/C64-title-loader/raw/master/build/loader.prg"),
142+
new System.Uri("https://github.com/IanSkinner1982/C64-title-loader/releases/latest/download/loader.d64"),
148143
// Param2 = Path to save
149-
System.IO.Path.Combine(SavePath, "loader-nightly.prg")
144+
System.IO.Path.Combine(SavePath, "loader.d64")
150145
);
151146
}
152147
}
@@ -156,7 +151,8 @@ private void Button_Click_7(object sender, RoutedEventArgs e)
156151
{
157152
using (WebClient wc = new WebClient())
158153
{
159-
btn5.Visibility = Visibility.Hidden;
154+
btn8.Visibility = Visibility.Hidden;
155+
btn10.Visibility = Visibility.Hidden;
160156
label1.Visibility = Visibility.Visible;
161157
wc.DownloadFileCompleted += DownloadCompleted;
162158
wc.DownloadProgressChanged += wc_DownloadProgressChanged;

‎NCX-Installer/XSC64TLP.xaml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎NCX-Installer/XSC64TLP.xaml.cs‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎NCX-Installer/XStoreHome.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<ImageBrush ImageSource="image/menu/settings.png"/>
3232
</Button.Background>
3333
</Button>
34-
<Button x:Name="btn2" Content="" HorizontalAlignment="Left" Margin="0,236,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070">
34+
<Button x:Name="btn2" Content="" HorizontalAlignment="Left" Margin="0,236,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn2_Click_1">
3535
<Button.Background>
3636
<ImageBrush ImageSource="image/menu/about.png"/>
3737
</Button.Background>

‎NCX-Installer/XStoreHome.xaml.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,11 @@ private void btn1_Click_1(object sender, RoutedEventArgs e)
6868
Settings page = new Settings();
6969
NavigationService.Navigate(page);
7070
}
71+
72+
private void btn2_Click_1(object sender, RoutedEventArgs e)
73+
{
74+
About page = new About();
75+
NavigationService.Navigate(page);
76+
}
7177
}
7278
}

‎NCX-Installer/XWareNews.xaml‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,44 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:NCX_Installer"
77
mc:Ignorable="d"
8-
d:DesignHeight="350" d:DesignWidth="600"
8+
d:DesignHeight="450" d:DesignWidth="800"
99
Title="X-Store" Background="Black">
1010

1111
<Grid>
12-
<Image HorizontalAlignment="Left" Height="175" Margin="10,10,0,0" VerticalAlignment="Top" Width="175" Source="image/ncxnewsplus.png"/>
13-
<Label Content="NCX News Plus" HorizontalAlignment="Left" Margin="185,10,0,0" VerticalAlignment="Top" FontWeight="Bold" FontSize="26" Foreground="White"/>
14-
<Label Content="By NinjaCheetah" HorizontalAlignment="Left" Margin="185,42,0,0" VerticalAlignment="Top" FontSize="20" Foreground="White"/>
15-
<Button x:Name="btn1" Content="User Page" HorizontalAlignment="Left" Margin="190,79,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="Button_Click_1" Background="{x:Null}" Foreground="White"/>
16-
<Button x:Name="btn2" Content="GitHub" HorizontalAlignment="Left" Margin="269,79,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="Button_Click" Background="{x:Null}" Foreground="White"/>
17-
<ProgressBar x:Name="progressBar1" HorizontalAlignment="Left" Height="19" Margin="10,198,0,0" VerticalAlignment="Top" Width="175" Background="#FF323232"/>
18-
<Label x:Name="label1" Content="Downloading... Please wait." HorizontalAlignment="Left" Margin="10,217,0,0" VerticalAlignment="Top" Width="175" FontSize="13" Visibility="Hidden" Foreground="White"/>
19-
<Button x:Name="btn5" Content="Install" HorizontalAlignment="Left" Margin="10,198,0,0" VerticalAlignment="Top" Width="175" Click="Button_Click_4" Foreground="White" Background="Black"/>
20-
<TextBlock HorizontalAlignment="Left" Margin="190,107,0,0" Text="NCX News Plus provides full news stories when I release them, along with the ability to see the edition and date of each article." TextWrapping="Wrap" VerticalAlignment="Top" Height="84" Width="290" FontSize="15" Foreground="White"/>
21-
<Button x:Name="btn3" Content="Back" HorizontalAlignment="Left" Margin="10,279,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="Button_Click_2" Background="{x:Null}" Foreground="White"/>
22-
<Button x:Name="btn6" Content="Launch" HorizontalAlignment="Left" Margin="10,251,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="btn6_Click" Background="{x:Null}" Visibility="Hidden" Foreground="White"/>
23-
12+
<Button x:Name="btn1" Content="" HorizontalAlignment="Left" Margin="0,-1,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn1_Click">
13+
<Button.Background>
14+
<ImageBrush ImageSource="image/menu/home.png"/>
15+
</Button.Background>
16+
</Button>
17+
<Button x:Name="btn2" Content="" HorizontalAlignment="Left" Margin="0,78,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn2_Click">
18+
<Button.Background>
19+
<ImageBrush ImageSource="image/menu/library.png"/>
20+
</Button.Background>
21+
</Button>
22+
<Button x:Name="btn3" Content="" HorizontalAlignment="Left" Margin="0,157,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn3_Click">
23+
<Button.Background>
24+
<ImageBrush ImageSource="image/menu/store.png"/>
25+
</Button.Background>
26+
</Button>
27+
<Button x:Name="btn4" Content="" HorizontalAlignment="Left" Margin="0,236,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn4_Click">
28+
<Button.Background>
29+
<ImageBrush ImageSource="image/menu/about.png"/>
30+
</Button.Background>
31+
</Button>
32+
<Button x:Name="btn5" Content="" HorizontalAlignment="Left" Margin="0,315,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn5_Click">
33+
<Button.Background>
34+
<ImageBrush ImageSource="image/menu/settings.png"/>
35+
</Button.Background>
36+
</Button>
37+
<Image HorizontalAlignment="Left" Height="100" Margin="73,10,0,0" VerticalAlignment="Top" Width="100" Source="image/ncxnewsplus.png"/>
38+
<Label Content="NCX-News+" HorizontalAlignment="Left" Margin="173,4,0,0" VerticalAlignment="Top" FontWeight="Bold" FontSize="32" Foreground="White"/>
39+
<Label Content="By NinjaCheetah" HorizontalAlignment="Left" Margin="173,40,0,0" VerticalAlignment="Top" FontSize="23" Foreground="White"/>
40+
<Button Content="User Page" HorizontalAlignment="Left" Margin="178,78,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="Button_Click_1" Background="{x:Null}" Foreground="White"/>
41+
<Button Content="GitHub" HorizontalAlignment="Left" Margin="257,78,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="Button_Click" Background="{x:Null}" Foreground="White"/>
42+
<ProgressBar x:Name="progressBar1" HorizontalAlignment="Left" Height="20" Margin="336,80,0,0" VerticalAlignment="Top" Width="175" Background="#FF323232"/>
43+
<Label x:Name="label1" Content="Downloading... Please wait." HorizontalAlignment="Left" Margin="336,98,0,0" VerticalAlignment="Top" Width="174" FontSize="13" Visibility="Hidden" Foreground="White"/>
44+
<Button x:Name="btn8" Content="Add to NCX-Core" HorizontalAlignment="Left" Margin="336,78,0,0" VerticalAlignment="Top" Height="23" Width="174" Click="Button_Click_4" Foreground="White" Background="Black"/>
45+
<TextBlock HorizontalAlignment="Left" Margin="73,118,0,0" Text="NCX-News+ is the best place to read full length NCX-News stories with information about things like software updates. News kindly written by IanSkinner1982." TextWrapping="Wrap" VerticalAlignment="Top" Height="96" Width="388" FontSize="18" Foreground="White"/>
46+
<Button x:Name="btn7" Content="Launch" HorizontalAlignment="Left" Margin="73,214,0,0" VerticalAlignment="Top" Width="74" Height="24" Click="btn7_Click" Background="{x:Null}" Visibility="Hidden" Foreground="White"/>
2447
</Grid>
2548
</Page>

‎NCX-Installer/XWareNews.xaml.cs‎

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ public partial class XWareNews : Page
2727
public XWareNews()
2828
{
2929
InitializeComponent();
30+
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe")))
31+
{
32+
btn7.Visibility = Visibility.Visible;
33+
}
3034
}
3135

3236
private void Button_Click_2(object sender, RoutedEventArgs e)
@@ -55,7 +59,7 @@ private void Button_Click_4(object sender, RoutedEventArgs e)
5559
{
5660
using (WebClient wc = new WebClient())
5761
{
58-
btn5.Visibility = Visibility.Hidden;
62+
btn8.Visibility = Visibility.Hidden;
5963
label1.Visibility = Visibility.Visible;
6064
wc.DownloadProgressChanged += wc_DownloadProgressChanged;
6165
wc.DownloadFileCompleted += DownloadCompleted;
@@ -72,7 +76,7 @@ private void Button_Click_4(object sender, RoutedEventArgs e)
7276
Directory.CreateDirectory(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus"));
7377
using (WebClient wc = new WebClient())
7478
{
75-
btn5.Visibility = Visibility.Hidden;
79+
btn8.Visibility = Visibility.Hidden;
7680
label1.Visibility = Visibility.Visible;
7781
wc.DownloadProgressChanged += wc_DownloadProgressChanged;
7882
wc.DownloadFileCompleted += DownloadCompleted;
@@ -91,7 +95,7 @@ private void Button_Click_4(object sender, RoutedEventArgs e)
9195
Directory.CreateDirectory(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus"));
9296
using (WebClient wc = new WebClient())
9397
{
94-
btn5.Visibility = Visibility.Hidden;
98+
btn8.Visibility = Visibility.Hidden;
9599
label1.Visibility = Visibility.Visible;
96100
wc.DownloadProgressChanged += wc_DownloadProgressChanged;
97101
wc.DownloadFileCompleted += DownloadCompleted;
@@ -125,5 +129,43 @@ private void btn6_Click(object sender, RoutedEventArgs e)
125129
Process.Start("C:/Program Files/NCX/CSharp Collection/CSharpCollectionVol1.exe");
126130
}
127131
}
132+
133+
private void btn1_Click(object sender, RoutedEventArgs e)
134+
{
135+
MainMenu page = new MainMenu();
136+
NavigationService.Navigate(page);
137+
}
138+
139+
private void btn2_Click(object sender, RoutedEventArgs e)
140+
{
141+
Library page = new Library();
142+
NavigationService.Navigate(page);
143+
}
144+
145+
private void btn3_Click(object sender, RoutedEventArgs e)
146+
{
147+
XStoreHome page = new XStoreHome();
148+
NavigationService.Navigate(page);
149+
}
150+
151+
private void btn4_Click(object sender, RoutedEventArgs e)
152+
{
153+
About page = new About();
154+
NavigationService.Navigate(page);
155+
}
156+
157+
private void btn5_Click(object sender, RoutedEventArgs e)
158+
{
159+
Settings page = new Settings();
160+
NavigationService.Navigate(page);
161+
}
162+
163+
private void btn7_Click(object sender, RoutedEventArgs e)
164+
{
165+
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe")))
166+
{
167+
Process.Start(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe"));
168+
}
169+
}
128170
}
129171
}

0 commit comments

Comments
 (0)