Skip to content

Commit a2db772

Browse files
NinjaCheetahNinjaCheetah
committed
v2.8: XWare! Read release notes to see all information on this release.
1 parent ba4531c commit a2db772

10 files changed

Lines changed: 63 additions & 41 deletions

File tree

‎NCX-Installer Setup/NCX-Installer Setup.vdproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,15 @@
241241
{
242242
"Name" = "8:Microsoft Visual Studio"
243243
"ProductName" = "8:NCX-Installer"
244-
"ProductCode" = "8:{2F4FB86F-E3E8-4350-9665-A7EBEA28920D}"
245-
"PackageCode" = "8:{709CE380-A987-48A5-9ACB-FE867F11578C}"
244+
"ProductCode" = "8:{06AC378E-ECE5-4D38-BBAE-B49CD169E070}"
245+
"PackageCode" = "8:{9B3897F2-F612-45F3-9BED-A71FA903BC34}"
246246
"UpgradeCode" = "8:{BCE275FE-8549-4BC2-A0ED-1C1B447D64EC}"
247247
"AspNetVersion" = "8:2.0.50727.0"
248248
"RestartWWWService" = "11:FALSE"
249249
"RemovePreviousVersions" = "11:TRUE"
250250
"DetectNewerInstalledVersion" = "11:TRUE"
251251
"InstallAllUsers" = "11:FALSE"
252-
"ProductVersion" = "8:2.7.0"
252+
"ProductVersion" = "8:2.8.0"
253253
"Manufacturer" = "8:NCX"
254254
"ARPHELPTELEPHONE" = "8:"
255255
"ARPHELPLINK" = "8:"

‎NCX-Installer/About.xaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:NCX_Installer"
77
mc:Ignorable="d"
8-
Title="About" Height="206" Width="353">
8+
Title="About" Height="206" Width="353" Background="Black">
99
<Grid>
10-
<Label Content="NCX-Installer" HorizontalContentAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Top" Height="38" Width="314" FontWeight="Bold" FontSize="24"/>
11-
<Label Content="v2.7" HorizontalAlignment="Center" Margin="0,32,0,0" VerticalAlignment="Top" FontSize="16"/>
12-
<Label Content="© NinjaCheetah 2020" HorizontalAlignment="Center" Margin="0,51,0,0" VerticalAlignment="Top" FontSize="16"/>
13-
<Label Content="Written in C Sharp using Visual Studio 2019" HorizontalAlignment="Center" Margin="0,73,0,0" VerticalAlignment="Top" FontSize="16"/>
14-
<Label Content="Powered by the .NET Core 3.1" HorizontalAlignment="Center" VerticalAlignment="Top" FontSize="16" Margin="0,95,0,0"/>
15-
<Button Content="GitHub Page" HorizontalAlignment="Left" Margin="10,138,0,0" VerticalAlignment="Top" Height="23" Width="84" Click="Button_Click"/>
10+
<Label Content="NCX-Installer" HorizontalContentAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Top" Height="38" Width="314" FontWeight="Bold" FontSize="24" Foreground="White"/>
11+
<Label Content="v2.8" HorizontalAlignment="Center" Margin="0,32,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
12+
<Label Content="© NinjaCheetah 2020" HorizontalAlignment="Center" Margin="0,51,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
13+
<Label Content="Written in C Sharp using Visual Studio 2019" HorizontalAlignment="Center" Margin="0,73,0,0" VerticalAlignment="Top" FontSize="16" Foreground="White"/>
14+
<Label Content="Powered by the .NET Core 3.1" HorizontalAlignment="Center" VerticalAlignment="Top" FontSize="16" Margin="0,95,0,0" Foreground="White"/>
15+
<Button Content="GitHub Page" HorizontalAlignment="Left" Margin="10,138,0,0" VerticalAlignment="Top" Height="23" Width="84" Click="Button_Click" Foreground="White" Background="Black"/>
1616
</Grid>
1717
</Window>

‎NCX-Installer/MainWindow.xaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Title="Main Menu" Height="476" Width="758" Background="Black">
99
<Grid>
1010
<Label x:Name="label1" Content="placeholder text" HorizontalAlignment="Left" Margin="10,0,0,0" VerticalAlignment="Top" FontSize="24" FontWeight="Bold" Foreground="White"/>
11-
<Label Content="v2.7" HorizontalAlignment="Left" Margin="707,0,0,0" VerticalAlignment="Top" Foreground="White"/>
11+
<Label Content="v2.8" HorizontalAlignment="Left" Margin="707,0,0,0" VerticalAlignment="Top" Foreground="White"/>
1212
<Label x:Name="label2" Content="News:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" FontSize="16" FontWeight="Bold" Foreground="White"/>
1313
<Label Content="Quick Launch" HorizontalAlignment="Left" Margin="10,88,0,0" VerticalAlignment="Top" FontSize="18" FontWeight="Bold" Foreground="White"/>
1414
<Button x:Name="btn1" Content="" HorizontalAlignment="Left" Margin="99,122,0,0" VerticalAlignment="Top" Height="82" Width="82" Click="Button_Click_1" Visibility="Hidden">
@@ -29,6 +29,8 @@
2929
<ImageBrush ImageSource="image/ncxnewsplus.png"/>
3030
</Button.Background>
3131
</Button>
32+
<Button Content="Reload" HorizontalAlignment="Left" Margin="227,400,0,0" VerticalAlignment="Top" Height="22" Width="75" Foreground="White" Background="Black" Click="Button_Click_2"/>
33+
<TextBlock Text="If software doesn't appear after installing or the news won't update, click &quot;Reload&quot;" TextWrapping="Wrap" HorizontalAlignment="Left" Margin="310,398,0,0" VerticalAlignment="Top" Foreground="White" Height="42" Width="286"/>
3234

3335
</Grid>
3436
</Window>

‎NCX-Installer/MainWindow.xaml.cs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public MainWindow()
7676
win.Show();
7777
win.Topmost = true;
7878
}
79-
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/XWare.exe")))
79+
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe")))
8080
{
8181
btn10.Visibility = Visibility.Visible;
8282
}
@@ -108,7 +108,6 @@ private void Button_Click_3(object sender, RoutedEventArgs e)
108108
{
109109
Window1 win = new Window1();
110110
win.Show();
111-
Hide();
112111
}
113112

114113
private void btn5_Click(object sender, RoutedEventArgs e)
@@ -162,9 +161,16 @@ private void Button_Click_1_Copy(object sender, RoutedEventArgs e)
162161

163162
private void btn10_Click(object sender, RoutedEventArgs e)
164163
{
165-
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/XWare.exe"))) {
166-
Process.Start(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/XWare.exe"));
164+
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe"))) {
165+
Process.Start(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe"));
167166
}
168167
}
168+
169+
private void Button_Click_2(object sender, RoutedEventArgs e)
170+
{
171+
MainWindow win = new MainWindow();
172+
win.Show();
173+
Hide();
174+
}
169175
}
170176
}

‎NCX-Installer/Settings1.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NCX-Installer/Settings1.settings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Value Profile="(Default)">False</Value>
1919
</Setting>
2020
<Setting Name="version" Type="System.Decimal" Scope="Application">
21-
<Value Profile="(Default)">2.7</Value>
21+
<Value Profile="(Default)">2.8</Value>
2222
</Setting>
2323
</Settings>
2424
</SettingsFile>

‎NCX-Installer/Window1.xaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:NCX_Installer"
77
mc:Ignorable="d"
8-
Title="Installed Programs" Height="391" Width="722">
8+
Title="Installed Programs" Height="391" Width="722" Background="Black">
99
<Grid>
10-
<Label x:Name="label1" Content="All Installed Programs" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="24" FontWeight="Bold"/>
10+
<Label x:Name="label1" Content="All Installed Programs" HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="24" FontWeight="Bold" Foreground="White"/>
1111
<Button x:Name="btn1" Content="" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Height="128" Width="128" Visibility="Hidden" Click="btn1_Click">
1212
<Button.Background>
1313
<ImageBrush ImageSource="image/csharpcol.png"/>
1414
</Button.Background>
1515
</Button>
16-
<Button x:Name="btn2" Content="View in Store" HorizontalAlignment="Left" Margin="10,175,0,0" VerticalAlignment="Top" Height="23" Width="128" Visibility="Hidden" Click="btn2_Click"/>
17-
<Button x:Name="btn4" Content="View in Store" HorizontalAlignment="Left" Margin="143,175,0,0" VerticalAlignment="Top" Height="23" Width="128" Visibility="Hidden" Click="btn4_Click"/>
18-
<Button x:Name="btn5" Content="Download More Apps" HorizontalAlignment="Left" Margin="276,42,0,0" VerticalAlignment="Top" Height="128" Width="128" Background="{x:Null}" Click="btn5_Click"/>
19-
<Button Content="Back" HorizontalAlignment="Left" Margin="614,10,0,0" VerticalAlignment="Top" Width="75" Height="23" Click="Button_Click"/>
16+
<Button x:Name="btn2" Content="View in Store" HorizontalAlignment="Left" Margin="10,175,0,0" VerticalAlignment="Top" Height="23" Width="128" Visibility="Hidden" Click="btn2_Click" Background="Black" Foreground="White"/>
17+
<Button x:Name="btn4" Content="View in Store" HorizontalAlignment="Left" Margin="143,175,0,0" VerticalAlignment="Top" Height="23" Width="128" Visibility="Hidden" Click="btn4_Click" Background="Black" Foreground="White"/>
18+
<Button x:Name="btn5" Content="Download More Apps" HorizontalAlignment="Left" Margin="276,42,0,0" VerticalAlignment="Top" Height="128" Width="128" Click="btn5_Click" Background="Black" Foreground="White"/>
19+
<Button x:Name="btn3" Content="" HorizontalAlignment="Left" Margin="143,42,0,0" VerticalAlignment="Top" Height="128" Width="128" Visibility="Hidden" Click="btn3_Click">
20+
<Button.Background>
21+
<ImageBrush ImageSource="image/ncxnewsplus.png"/>
22+
</Button.Background>
23+
</Button>
2024
</Grid>
2125
</Window>

‎NCX-Installer/Window1.xaml.cs‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ namespace NCX_Installer
1919
/// </summary>
2020
public partial class Window1 : Window
2121
{
22+
static readonly string SavePath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
23+
2224
public Window1()
2325
{
2426
InitializeComponent();
@@ -27,6 +29,11 @@ public Window1()
2729
btn1.Visibility = Visibility.Visible;
2830
btn2.Visibility = Visibility.Visible;
2931
}
32+
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe")))
33+
{
34+
btn3.Visibility = Visibility.Visible;
35+
btn4.Visibility = Visibility.Visible;
36+
}
3037
}
3138

3239
private void Button_Click(object sender, RoutedEventArgs e)
@@ -36,12 +43,6 @@ private void Button_Click(object sender, RoutedEventArgs e)
3643
Hide();
3744
}
3845

39-
protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
40-
{
41-
base.OnClosing(e);
42-
Environment.Exit(0);
43-
}
44-
4546
private void btn5_Click(object sender, RoutedEventArgs e)
4647
{
4748
XStore win = new XStore();
@@ -65,9 +66,17 @@ private void btn2_Click(object sender, RoutedEventArgs e)
6566

6667
private void btn4_Click(object sender, RoutedEventArgs e)
6768
{
68-
NavSettings.Default.comingFrom = "am";
69+
NavSettings.Default.comingFrom = "nplus";
6970
XStore win = new XStore();
7071
win.Show();
7172
}
73+
74+
private void btn3_Click(object sender, RoutedEventArgs e)
75+
{
76+
if (File.Exists(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe")))
77+
{
78+
Process.Start(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.exe"));
79+
}
80+
}
7281
}
7382
}

‎NCX-Installer/XStore.xaml.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,19 @@ public partial class XStore : Window
2121
public XStore()
2222
{
2323
InitializeComponent();
24-
if (NavSettings.Default.comingFrom == "")
24+
switch (NavSettings.Default.comingFrom)
2525
{
26-
_NavigationFrame.Navigate(new XStoreHome());
27-
}
28-
else if (NavSettings.Default.comingFrom == "cscol")
29-
{
30-
NavSettings.Default.comingFrom = "";
31-
_NavigationFrame.Navigate(new XSCSharpCol());
26+
case "cscol":
27+
NavSettings.Default.comingFrom = "";
28+
_NavigationFrame.Navigate(new XSCSharpCol());
29+
break;
30+
case "nplus":
31+
NavSettings.Default.comingFrom = "";
32+
_NavigationFrame.Navigate(new XWareNews());
33+
break;
34+
default:
35+
_NavigationFrame.Navigate(new XStoreHome());
36+
break;
3237
}
3338
}
3439
}

‎NCX-Installer/XWareNews.xaml.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ public void DownloadCompleted(object sender, EventArgs e)
111111
File.Delete(System.IO.Path.Combine(SavePath, "NCX-Core/NCXNewsPlus/NCXNewsPlus.zip"));
112112
label1.Content = "Download Complete";
113113
NavSettings.Default.mainReload = true;
114-
MainWindow win = new MainWindow();
115-
win.Hide();
116-
MainWindow win2 = new MainWindow();
117-
win2.Show();
118114
}
119115

120116
void wc_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)

0 commit comments

Comments
 (0)