Skip to content

Commit 7630237

Browse files
CodeDeadCodeDead
committed
* Changed .NET Framework to 4.7
* Bumped version number * Fixed blurry images * Made use of new UpdateManager * About window design changes * Minor design changes * Code optimizations
1 parent 913ee89 commit 7630237

12 files changed

Lines changed: 70 additions & 194 deletions

‎Advanced PortChecker/Advanced PortChecker.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Advanced_PortChecker</RootNamespace>
1111
<AssemblyName>Advanced PortChecker</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
17+
<TargetFrameworkProfile />
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -54,6 +55,9 @@
5455
</Reference>
5556
<Reference Include="UIAutomationProvider" />
5657
<Reference Include="UIAutomationTypes" />
58+
<Reference Include="UpdateManager">
59+
<HintPath>..\..\UpdateManager\UpdateManager\bin\Release\UpdateManager.dll</HintPath>
60+
</Reference>
5761
<Reference Include="WindowsBase" />
5862
<Reference Include="PresentationCore" />
5963
<Reference Include="PresentationFramework" />
@@ -68,8 +72,6 @@
6872
<Compile Include="Classes\OperationInformation.cs" />
6973
<Compile Include="Classes\PortChecker.cs" />
7074
<Compile Include="Classes\StyleManager.cs" />
71-
<Compile Include="Classes\Update.cs" />
72-
<Compile Include="Classes\UpdateManager.cs" />
7375
<Compile Include="Windows\AboutWindow.xaml.cs">
7476
<DependentUpon>AboutWindow.xaml</DependentUpon>
7577
</Compile>

‎Advanced PortChecker/App.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="Advanced_PortChecker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="Advanced_PortChecker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
1010
</startup>
1111
<userSettings>
1212
<Advanced_PortChecker.Properties.Settings>
@@ -17,11 +17,11 @@
1717
<value>#FF07779C</value>
1818
</setting>
1919
<setting name="BorderThickness" serializeAs="String">
20-
<value>1</value>
20+
<value>3</value>
2121
</setting>
2222
<setting name="AutoUpdate" serializeAs="String">
2323
<value>True</value>
2424
</setting>
2525
</Advanced_PortChecker.Properties.Settings>
2626
</userSettings>
27-
</configuration>
27+
</configuration>

‎Advanced PortChecker/Classes/StyleManager.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ internal static void ChangeStyle(DependencyObject o)
2020
{
2121
SkinStorage.SetVisualStyle(o, Properties.Settings.Default.VisualStyle);
2222
SkinStorage.SetMetroBrush(o, new SolidColorBrush(Properties.Settings.Default.MetroColor));
23-
((Window)o).BorderThickness = new Thickness(Properties.Settings.Default.BorderThickness);
23+
((ChromelessWindow)o).BorderThickness = new Thickness(Properties.Settings.Default.BorderThickness);
24+
((ChromelessWindow)o).CornerRadius = new CornerRadius(0,0,0,0);
2425
}
2526
catch (Exception ex)
2627
{

‎Advanced PortChecker/Classes/Update.cs‎

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

‎Advanced PortChecker/Classes/UpdateManager.cs‎

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

‎Advanced PortChecker/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.0.0.0")]
55-
[assembly: AssemblyFileVersion("1.0.0.0")]
54+
[assembly: AssemblyVersion("1.1.0.0")]
55+
[assembly: AssemblyFileVersion("1.1.0.0")]

‎Advanced PortChecker/Properties/Settings.Designer.cs‎

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

‎Advanced PortChecker/Properties/Settings.settings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Value Profile="(Default)">#FF07779C</Value>
1010
</Setting>
1111
<Setting Name="BorderThickness" Type="System.Int32" Scope="User">
12-
<Value Profile="(Default)">1</Value>
12+
<Value Profile="(Default)">3</Value>
1313
</Setting>
1414
<Setting Name="AutoUpdate" Type="System.Boolean" Scope="User">
1515
<Value Profile="(Default)">True</Value>

‎Advanced PortChecker/Windows/AboutWindow.xaml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
<syncfusion:ChromelessWindow x:Class="Advanced_PortChecker.Windows.AboutWindow"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
7-
mc:Ignorable="d"
8-
Title="Advanced PortChecker - About" Height="250" Width="400"
9-
Icon="/Advanced PortChecker;component/globe.ico" WindowStartupLocation="CenterScreen"
10-
AllowsTransparency="True" TitleTextAlignment="Center">
1+
<syncfusion:ChromelessWindow
2+
x:Class="Advanced_PortChecker.Windows.AboutWindow"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:syncfusion="http://schemas.syncfusion.com/wpf"
8+
mc:Ignorable="d"
9+
Title="Advanced PortChecker - About" Height="250" Width="400"
10+
UseLayoutRounding="True"
11+
Icon="/Advanced PortChecker;component/globe.ico" WindowStartupLocation="CenterScreen"
12+
AllowsTransparency="True" TitleTextAlignment="Center">
13+
1114
<Grid VerticalAlignment="Center" HorizontalAlignment="Center">
1215
<Grid.RowDefinitions>
1316
<RowDefinition Height="Auto"></RowDefinition>
@@ -17,14 +20,16 @@
1720
<Grid.ColumnDefinitions>
1821
<ColumnDefinition Width="Auto"></ColumnDefinition>
1922
<ColumnDefinition Width="Auto"></ColumnDefinition>
23+
<ColumnDefinition Width="Auto"></ColumnDefinition>
2024
</Grid.ColumnDefinitions>
2125
<Image Width="64" Height="64" Source="/Advanced PortChecker;component/globe.ico" ></Image>
22-
<TextBlock xml:space="preserve" Grid.Column="1">
26+
<Separator Margin="5" Grid.Column="1" Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
27+
<TextBlock xml:space="preserve" Grid.Column="2">
2328
<TextBlock.Text>Advanced PortChecker was created by DeadLine.
2429

2530
Images: small-n-flat by paomedia
2631
Theme by: SyncFusion
27-
Version: 1.0.0.0
32+
Version: 1.1.0.0
2833

2934
Copyright © CodeDead 2017</TextBlock.Text>
3035
</TextBlock>

‎Advanced PortChecker/Windows/MainWindow.xaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
mc:Ignorable="d"
9+
UseLayoutRounding="True"
910
Title="Advanced PortChecker" Height="350" Width="500" WindowStartupLocation="CenterScreen" TitleTextAlignment="Center"
1011
AllowsTransparency="True" Icon="/Advanced PortChecker;component/globe.ico">
1112
<Window.TaskbarItemInfo>
@@ -102,7 +103,7 @@
102103
</MenuItem>
103104
</Menu>
104105
<Grid Grid.Row="1">
105-
<GroupBox Header="Options">
106+
<GroupBox Margin="5" Header="Options">
106107
<Grid>
107108
<Grid.RowDefinitions>
108109
<RowDefinition Height="Auto"></RowDefinition>
@@ -141,7 +142,7 @@
141142
</Grid>
142143
</GroupBox>
143144
</Grid>
144-
<ListView Grid.Row="2" x:Name="LvPorts">
145+
<ListView Margin="5" Grid.Row="2" x:Name="LvPorts">
145146
<ListView.ItemContainerStyle>
146147
<Style TargetType="{x:Type ListViewItem}">
147148
<Setter Property="BorderBrush" Value="LightGray" />
@@ -182,15 +183,16 @@
182183
</GridView>
183184
</ListView.View>
184185
</ListView>
185-
<ProgressBar x:Name="PgbStatus" MinHeight="25" Grid.Row="3"></ProgressBar>
186+
<ProgressBar Margin="5" x:Name="PgbStatus" MinHeight="25" Grid.Row="3"></ProgressBar>
186187
<Grid Grid.Row="4">
187188
<Grid.ColumnDefinitions>
189+
<ColumnDefinition Width="Auto"></ColumnDefinition>
188190
<ColumnDefinition></ColumnDefinition>
189-
<ColumnDefinition></ColumnDefinition>
191+
<ColumnDefinition Width="Auto"></ColumnDefinition>
190192
</Grid.ColumnDefinitions>
191193

192-
<Button x:Name="BtnCancel" IsEnabled="False" Margin="5" Click="BtnCancel_Click" IsCancel="True">Cancel</Button>
193-
<Button x:Name="BtnScan" Grid.Column="1" Margin="5" Click="BtnScan_Click" IsDefault="True">Scan</Button>
194+
<Button x:Name="BtnCancel" MinWidth="120" IsEnabled="False" Margin="5" Click="BtnCancel_Click" IsCancel="True">Cancel</Button>
195+
<Button x:Name="BtnScan" MinWidth="120" Grid.Column="2" Margin="5" Click="BtnScan_Click" IsDefault="True">Scan</Button>
194196
</Grid>
195197
</Grid>
196198
</syncfusion:ChromelessWindow>

0 commit comments

Comments
 (0)