Skip to content

Commit 3a80eb9

Browse files
NinjaCheetahNinjaCheetah
committed
89: v3.0 Commit 10: Finished XStore pages for CSharpCollection, lazy-dsi-file-downloader, and C64 Title Loader
1 parent b0652af commit 3a80eb9

12 files changed

Lines changed: 316 additions & 171 deletions

‎NCX-Installer/XSC64TL.xaml‎

Lines changed: 54 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,62 @@
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="XSC64TL" Background="Black">
10+
<Page.Resources>
11+
<ResourceDictionary>
12+
<ImageSource x:Key="image1">image/screen/c64tl1.png</ImageSource>
13+
<ImageSource x:Key="image2">image/screen/c64tl2.png</ImageSource>
14+
</ResourceDictionary>
15+
</Page.Resources>
1016

1117
<Grid>
12-
<Image HorizontalAlignment="Left" Height="175" Margin="10,10,0,0" VerticalAlignment="Top" Width="175" Source="image/c64titleloader.png"/>
13-
<Label Content="C64 Title Loader" HorizontalAlignment="Left" Margin="185,10,0,0" VerticalAlignment="Top" FontWeight="Bold" FontSize="26" Foreground="White"/>
14-
<Label Content="By IanSkinner1982" 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="Download" 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" TextWrapping="Wrap" VerticalAlignment="Top" Height="84" Width="290" FontSize="15" Text="One disk to rule them all... A program to load all of IanSkinner1982's Commodore 64 Programs." 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 Content="Photos" HorizontalAlignment="Left" Margin="348,79,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="Button_Click_3" Background="{x:Null}" Foreground="White"/>
23-
<Label Content="Requires External Software: Vice Emulator" HorizontalAlignment="Left" Margin="190,173,0,0" VerticalAlignment="Top" Foreground="White"/>
24-
<Label Content="Downloads to your desktop as &quot;loader.d64&quot;" HorizontalAlignment="Left" Margin="190,190,0,0" VerticalAlignment="Top" Foreground="White"/>
25-
<Button x:Name="btn4" Content="Nightly" HorizontalAlignment="Left" Margin="89,279,0,0" VerticalAlignment="Top" Foreground="White" Background="Black" Height="23" Width="75" Click="Button_Click_5" Visibility="Hidden"/>
26-
18+
<Button x:Name="btn1" Content="" HorizontalAlignment="Left" Margin="0,-1,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn1_Click">
19+
<Button.Background>
20+
<ImageBrush ImageSource="image/menu/home.png"/>
21+
</Button.Background>
22+
</Button>
23+
<Button x:Name="btn2" Content="" HorizontalAlignment="Left" Margin="0,78,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn2_Click">
24+
<Button.Background>
25+
<ImageBrush ImageSource="image/menu/library.png"/>
26+
</Button.Background>
27+
</Button>
28+
<Button x:Name="btn3" Content="" HorizontalAlignment="Left" Margin="0,157,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn3_Click">
29+
<Button.Background>
30+
<ImageBrush ImageSource="image/menu/store.png"/>
31+
</Button.Background>
32+
</Button>
33+
<Button x:Name="btn4" Content="" HorizontalAlignment="Left" Margin="0,236,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn4_Click">
34+
<Button.Background>
35+
<ImageBrush ImageSource="image/menu/about.png"/>
36+
</Button.Background>
37+
</Button>
38+
<Button x:Name="btn5" Content="" HorizontalAlignment="Left" Margin="0,315,0,0" VerticalAlignment="Top" Height="79" Width="53" BorderBrush="#00707070" Click="btn5_Click">
39+
<Button.Background>
40+
<ImageBrush ImageSource="image/menu/settings.png"/>
41+
</Button.Background>
42+
</Button>
43+
<Image HorizontalAlignment="Left" Height="100" Margin="73,10,0,0" VerticalAlignment="Top" Width="100" Source="image/c64titleloader.png"/>
44+
<Label Content="C64 Title Loader" HorizontalAlignment="Left" Margin="173,4,0,0" VerticalAlignment="Top" FontWeight="Bold" FontSize="32" Foreground="White"/>
45+
<Label Content="By IanSkinner1982" HorizontalAlignment="Left" Margin="173,40,0,0" VerticalAlignment="Top" FontSize="23" Foreground="White"/>
46+
<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"/>
47+
<Button Content="GitHub" HorizontalAlignment="Left" Margin="257,78,0,0" VerticalAlignment="Top" Width="74" Height="23" Click="Button_Click" Background="{x:Null}" Foreground="White"/>
48+
<ProgressBar x:Name="progressBar1" HorizontalAlignment="Left" Height="20" Margin="336,80,0,0" VerticalAlignment="Top" Width="175" Background="#FF323232"/>
49+
<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"/>
50+
<Button x:Name="btn8" Content="Release" HorizontalAlignment="Left" Margin="336,78,0,0" VerticalAlignment="Top" Height="23" Width="87" Click="Button_Click_4" Foreground="White" Background="Black" Visibility="Hidden"/>
51+
<TextBlock HorizontalAlignment="Left" Margin="73,118,0,0" Text="One disk to rule them all... A program to load all of IanSkinner1982's Commodore 64 Programs. Requires External Software, Vice Emulator, and downloads to your desktop as &quot;loader.d64&quot;" TextWrapping="Wrap" VerticalAlignment="Top" Height="101" Width="388" FontSize="18" Foreground="White"/>
52+
<Image x:Name="img1" HorizontalAlignment="Left" Height="202" Margin="422,202,0,0" VerticalAlignment="Top" Width="362" Source="image/screen/c64tl1.png" Stretch="Uniform"/>
53+
<Button x:Name="btn6" Content="" HorizontalAlignment="Left" Margin="284,232,0,0" VerticalAlignment="Top" Height="82" Width="133" Click="btn6_Click">
54+
<Button.Background>
55+
<ImageBrush ImageSource="image/screen/c64tl1.png" Stretch="Uniform"/>
56+
</Button.Background>
57+
</Button>
58+
<Button x:Name="btn9" Content="" HorizontalAlignment="Left" Margin="284,319,0,0" VerticalAlignment="Top" Height="85" Width="133" Click="btn9_Click">
59+
<Button.Background>
60+
<ImageBrush ImageSource="image/screen/c64tl2.png" Stretch="Uniform"/>
61+
</Button.Background>
62+
</Button>
63+
<Button x:Name="btn10" Content="Nightly" HorizontalAlignment="Left" Width="86" Height="23" Margin="424,78,0,0" VerticalAlignment="Top" Foreground="White" Background="Black" Visibility="Hidden" Click="Button_Click_7"/>
64+
<Button x:Name="btn11" Content="Download" HorizontalAlignment="Left" Margin="336,78,0,0" VerticalAlignment="Top" Width="174" Height="23" Background="Black" Foreground="White" Click="Button_Click_6"/>
2765
</Grid>
2866
</Page>

‎NCX-Installer/XSC64TL.xaml.cs‎

Lines changed: 72 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ public partial class XSC64TL : Page
2626
public XSC64TL()
2727
{
2828
InitializeComponent();
29-
if (Settings1.Default.betaVer == true)
30-
{
31-
btn4.Visibility = Visibility.Visible;
32-
}
29+
3330
}
3431

3532
private void Button_Click(object sender, RoutedEventArgs e)
@@ -85,6 +82,77 @@ void wc_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs
8582
}
8683

8784
private void Button_Click_5(object sender, RoutedEventArgs e)
85+
{
86+
87+
}
88+
89+
private void btn6_Click(object sender, RoutedEventArgs e)
90+
{
91+
img1.Source = (ImageSource)FindResource("image1");
92+
}
93+
94+
private void btn9_Click(object sender, RoutedEventArgs e)
95+
{
96+
img1.Source = (ImageSource)FindResource("image2");
97+
}
98+
99+
private void btn1_Click(object sender, RoutedEventArgs e)
100+
{
101+
MainMenu page = new MainMenu();
102+
NavigationService.Navigate(page);
103+
}
104+
105+
private void btn2_Click(object sender, RoutedEventArgs e)
106+
{
107+
Library page = new Library();
108+
NavigationService.Navigate(page);
109+
}
110+
111+
private void btn3_Click(object sender, RoutedEventArgs e)
112+
{
113+
XStoreHome page = new XStoreHome();
114+
NavigationService.Navigate(page);
115+
}
116+
117+
private void btn4_Click(object sender, RoutedEventArgs e)
118+
{
119+
About page = new About();
120+
NavigationService.Navigate(page);
121+
}
122+
123+
private void btn5_Click(object sender, RoutedEventArgs e)
124+
{
125+
Settings page = new Settings();
126+
NavigationService.Navigate(page);
127+
}
128+
129+
private void Button_Click_6(object sender, RoutedEventArgs e)
130+
{
131+
if (Settings1.Default.betaVer == true)
132+
{
133+
btn11.Visibility = Visibility.Hidden;
134+
btn10.Visibility = Visibility.Visible;
135+
btn8.Visibility = Visibility.Visible;
136+
}
137+
else
138+
{
139+
using (WebClient wc = new WebClient())
140+
{
141+
btn5.Visibility = Visibility.Hidden;
142+
label1.Visibility = Visibility.Visible;
143+
wc.DownloadFileCompleted += DownloadCompleted;
144+
wc.DownloadProgressChanged += wc_DownloadProgressChanged;
145+
wc.DownloadFileAsync(
146+
// Param1 = Link of file
147+
new System.Uri("https://github.com/IanSkinner1982/C64-title-loader/raw/master/build/loader.prg"),
148+
// Param2 = Path to save
149+
System.IO.Path.Combine(SavePath, "loader-nightly.prg")
150+
);
151+
}
152+
}
153+
}
154+
155+
private void Button_Click_7(object sender, RoutedEventArgs e)
88156
{
89157
using (WebClient wc = new WebClient())
90158
{

‎NCX-Installer/XSCSCP.xaml‎

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

‎NCX-Installer/XSCSCP.xaml.cs‎

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

0 commit comments

Comments
 (0)