Skip to content

Commit 807508a

Browse files
NinjaCheetahNinjaCheetah
committed
.NET Core conversion Part 3 of 3. It's done!
1 parent d704a5b commit 807508a

28 files changed

Lines changed: 1620 additions & 321 deletions

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

Lines changed: 1032 additions & 0 deletions
Large diffs are not rendered by default.

‎NCX-Installer/About.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Title="About" Height="206" Width="353">
99
<Grid>
1010
<Label Content="NCX-Installer" HorizontalContentAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Top" Height="38" Width="314" FontWeight="Bold" FontSize="24"/>
11-
<Label Content="v2.4 Public Beta 2" HorizontalAlignment="Center" Margin="0,32,0,0" VerticalAlignment="Top" FontSize="16"/>
11+
<Label Content="v2.4" HorizontalAlignment="Center" Margin="0,32,0,0" VerticalAlignment="Top" FontSize="16"/>
1212
<Label Content="Created and Written by NinjaCheetah" HorizontalAlignment="Center" Margin="0,51,0,0" VerticalAlignment="Top" FontSize="16"/>
1313
<Label Content="Written in C Sharp using Visual Studio 2019" HorizontalAlignment="Center" Margin="0,73,0,0" VerticalAlignment="Top" FontSize="16"/>
1414
<Label Content="Powered by the .NET Core 3.1" HorizontalAlignment="Center" VerticalAlignment="Top" FontSize="16" Margin="0,95,0,0"/>

‎NCX-Installer/MainWindow.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<Label x:Name="label1" Content="placeholder text" HorizontalAlignment="Left" Margin="10,0,0,0" VerticalAlignment="Top" FontSize="24" FontWeight="Bold"/>
1111
<Label Content="v2.4" HorizontalAlignment="Left" Margin="707,0,0,0" VerticalAlignment="Top"/>
1212
<Label x:Name="label2" Content="News:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" FontSize="16" FontWeight="Bold" Foreground="Blue"/>
13-
<Label x:Name="label3" Content="Fetching News... Please wait." HorizontalAlignment="Left" Margin="60,42,0,0" VerticalAlignment="Top" FontSize="16"/>
1413
<Label Content="Installed" HorizontalAlignment="Left" Margin="10,88,0,0" VerticalAlignment="Top" FontSize="18" FontWeight="Bold"/>
1514
<Label Content="Click to Launch" HorizontalAlignment="Left" Margin="88,94,0,0" VerticalAlignment="Top"/>
1615
<Button x:Name="btn1" Content="" HorizontalAlignment="Left" Margin="12,122,0,0" VerticalAlignment="Top" Height="175" Width="175" Click="Button_Click_1" Visibility="Hidden">
@@ -32,8 +31,9 @@
3231
<ImageBrush ImageSource="image/settings.png"/>
3332
</Button.Background>
3433
</Button>
35-
<Button x:Name="btn8" Content="X-Store" HorizontalAlignment="Left" Margin="12,338,0,0" VerticalAlignment="Top" Height="36" Width="104" FontSize="16"/>
34+
<Button x:Name="btn8" Content="X-Store" HorizontalAlignment="Left" Margin="12,338,0,0" VerticalAlignment="Top" Height="36" Width="104" FontSize="16" Click="btn8_Click"/>
3635
<Button x:Name="btn9" Content="Archived Projects" HorizontalAlignment="Left" Margin="121,338,0,0" VerticalAlignment="Top" Height="36" Width="104" Visibility="Hidden" Click="btn9_Click"/>
36+
<TextBlock x:Name="label3" HorizontalAlignment="Left" Margin="65,49,0,0" Text="Fetching News... Please wait." TextWrapping="Wrap" VerticalAlignment="Top" Height="37" Width="635" FontSize="14"/>
3737

3838
</Grid>
3939
</Window>

‎NCX-Installer/MainWindow.xaml.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void DownloadCompleted(object sender, EventArgs e)
9494
string newsString = tr.ReadLine();
9595
newstext = Convert.ToString(newsString);
9696
tr.Close();
97-
label3.Content = newsString;
97+
label3.Text = newsString;
9898
}
9999

100100
private void Button_Click_3(object sender, RoutedEventArgs e)
@@ -135,5 +135,11 @@ private void btn9_Click(object sender, RoutedEventArgs e)
135135
win.Show();
136136
Hide();
137137
}
138+
139+
private void btn8_Click(object sender, RoutedEventArgs e)
140+
{
141+
XStore win = new XStore();
142+
win.Show();
143+
}
138144
}
139145
}

‎NCX-Installer/NCX-Installer.csproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<None Remove="CSharp.png" />
1515
<None Remove="Icon.ico" />
1616
<None Remove="image\firsttime.png" />
17+
<None Remove="image\screen\am1.png" />
18+
<None Remove="image\screen\am2.png" />
19+
<None Remove="image\screen\cscol1.png" />
20+
<None Remove="image\screen\cscol2.png" />
1721
<None Remove="image\settings.png" />
1822
</ItemGroup>
1923

@@ -23,10 +27,19 @@
2327
<Resource Include="image\automod.png" />
2428
<Resource Include="image\csharpcol.png" />
2529
<Resource Include="image\firsttime.png" />
30+
<Resource Include="image\screen\am1.png" />
31+
<Resource Include="image\screen\am2.png" />
32+
<Resource Include="image\screen\cscol1.png" />
33+
<Resource Include="image\screen\cscol2.png" />
2634
<Resource Include="image\settings.png" />
2735
</ItemGroup>
2836

2937
<ItemGroup>
38+
<Compile Update="NavSettings.Designer.cs">
39+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
40+
<AutoGen>True</AutoGen>
41+
<DependentUpon>NavSettings.settings</DependentUpon>
42+
</Compile>
3043
<Compile Update="Settings1.Designer.cs">
3144
<DesignTimeSharedInput>True</DesignTimeSharedInput>
3245
<AutoGen>True</AutoGen>
@@ -35,6 +48,10 @@
3548
</ItemGroup>
3649

3750
<ItemGroup>
51+
<None Update="NavSettings.settings">
52+
<Generator>SettingsSingleFileGenerator</Generator>
53+
<LastGenOutput>NavSettings.Designer.cs</LastGenOutput>
54+
</None>
3855
<None Update="Settings1.settings">
3956
<Generator>SettingsSingleFileGenerator</Generator>
4057
<LastGenOutput>Settings1.Designer.cs</LastGenOutput>

‎NCX-Installer/NavSettings.Designer.cs‎

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎NCX-Installer/NavSettings.settings‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="NCX_Installer" GeneratedClassName="NavSettings">
3+
<Profiles />
4+
<Settings>
5+
<Setting Name="comingFrom" Type="System.String" Scope="User">
6+
<Value Profile="(Default)" />
7+
</Setting>
8+
</Settings>
9+
</SettingsFile>

‎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)">10.2</Value>
21+
<Value Profile="(Default)">2.4</Value>
2222
</Setting>
2323
</Settings>
2424
</SettingsFile>

‎NCX-Installer/Window1.xaml.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
4949

5050
private void btn5_Click(object sender, RoutedEventArgs e)
5151
{
52-
52+
XStore win = new XStore();
53+
win.Show();
5354
}
5455

5556
private void btn1_Click(object sender, RoutedEventArgs e)
@@ -62,7 +63,9 @@ private void btn1_Click(object sender, RoutedEventArgs e)
6263

6364
private void btn2_Click(object sender, RoutedEventArgs e)
6465
{
65-
66+
NavSettings.Default.comingFrom = "cscol";
67+
XStore win = new XStore();
68+
win.Show();
6669
}
6770

6871
private void btn3_Click(object sender, RoutedEventArgs e)
@@ -75,7 +78,9 @@ private void btn3_Click(object sender, RoutedEventArgs e)
7578

7679
private void btn4_Click(object sender, RoutedEventArgs e)
7780
{
78-
81+
NavSettings.Default.comingFrom = "am";
82+
XStore win = new XStore();
83+
win.Show();
7984
}
8085
}
8186
}

0 commit comments

Comments
 (0)