Skip to content

Commit 02bc7b0

Browse files
itshoitsho
committed
* added icons
* updated version (1.4.2019.0422)
1 parent 307962e commit 02bc7b0

18 files changed

+36
-29
lines changed

Diff for: ‎QuickSetup.Logic/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("QuickSetup.Logic")]
13-
[assembly: AssemblyCopyright("Copyright © 2017")]
13+
[assembly: AssemblyCopyright("Copyright © 2019")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.2.2017.0314")]
36-
[assembly: AssemblyFileVersion("1.2.2017.0314")]
35+
[assembly: AssemblyVersion("1.4.2019.0422")]
36+
[assembly: AssemblyFileVersion("1.4.2019.0422")]

Diff for: ‎QuickSetup.UI/Properties/AssemblyInfo.cs

+2-2
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.3.2019.0421")]
55-
[assembly: AssemblyFileVersion("1.3.2019.0421")]
54+
[assembly: AssemblyVersion("1.4.2019.0422")]
55+
[assembly: AssemblyFileVersion("1.4.2019.0422")]

Diff for: ‎QuickSetup.UI/QuickSetup.UI.csproj

+17-7
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
<PropertyGroup>
3838
<ApplicationManifest>app.manifest</ApplicationManifest>
3939
</PropertyGroup>
40+
<PropertyGroup>
41+
<ApplicationIcon>Resources\Icons\icons8-quick-mode-on-multi.ico</ApplicationIcon>
42+
</PropertyGroup>
4043
<ItemGroup>
4144
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
4245
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll</HintPath>
@@ -187,15 +190,22 @@
187190
<Resource Include="Resources\Entypo-license.txt" />
188191
</ItemGroup>
189192
<ItemGroup>
190-
<Resource Include="Resources\Icons-flaticon\icons8-opposite-opinion-24.png" />
191-
<Resource Include="Resources\Icons-flaticon\icons8-opposite-opinion-48.png" />
193+
<Resource Include="Resources\Icons\icons8-opposite-opinion-24.png" />
194+
<Resource Include="Resources\Icons\icons8-opposite-opinion-48.png" />
195+
</ItemGroup>
196+
<ItemGroup>
197+
<Resource Include="Resources\Icons\flaticon-circumference1.png" />
198+
<Resource Include="Resources\Icons\flaticon-circumference2.png" />
199+
<Resource Include="Resources\Icons\flaticon-error.png" />
200+
<Resource Include="Resources\Icons\flaticon-question.png" />
201+
<Resource Include="Resources\Icons\flaticon-success.png" />
192202
</ItemGroup>
193203
<ItemGroup>
194-
<Resource Include="Resources\Icons-flaticon\circumference1.png" />
195-
<Resource Include="Resources\Icons-flaticon\circumference2.png" />
196-
<Resource Include="Resources\Icons-flaticon\error.png" />
197-
<Resource Include="Resources\Icons-flaticon\question.png" />
198-
<Resource Include="Resources\Icons-flaticon\success.png" />
204+
<Resource Include="Resources\Icons\icons8-quick-mode-on-100.png" />
205+
<Resource Include="Resources\Icons\icons8-quick-mode-on-24.png" />
206+
<Resource Include="Resources\Icons\icons8-quick-mode-on-32.png" />
207+
<Resource Include="Resources\Icons\icons8-quick-mode-on-48.png" />
208+
<Resource Include="Resources\Icons\icons8-quick-mode-on-multi.ico" />
199209
</ItemGroup>
200210
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
201211
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Diff for: ‎QuickSetup.UI/Resources/Converters/SoftwareStatusToImageConverter.cs

+5-7
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,26 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
1717

1818
if (origValue == SoftwareInstallStatusEnum.Installed)
1919
{
20-
return "pack://application:,,,/Resources/Icons-flaticon/success.png";
20+
return "pack://application:,,,/Resources/Icons/flaticon-success.png";
2121
}
2222
if (origValue == SoftwareInstallStatusEnum.NotInstalled)
2323
{
24-
return "pack://application:,,,/Resources/Icons-flaticon/circumference1.png";
24+
return "pack://application:,,,/Resources/Icons/flaticon-circumference1.png";
2525
}
2626
if (origValue == SoftwareInstallStatusEnum.SetupFileMissing ||
2727
origValue == SoftwareInstallStatusEnum.UnableToGetStatus)
2828
{
29-
return "pack://application:,,,/Resources/Icons-flaticon/error.png";
29+
return "pack://application:,,,/Resources/Icons/flaticon-error.png";
3030
}
3131

3232
if (origValue == SoftwareInstallStatusEnum.DifferentVersionDetected)
3333
{
34-
return "pack://application:,,,/Resources/Icons-flaticon/icons8-opposite-opinion-24.png";
34+
return "pack://application:,,,/Resources/Icons/icons8-opposite-opinion-24.png";
3535
}
36-
37-
3836

3937
//if (origValue == SoftwareInstallStatusEnum.Unknown)
4038
//{
41-
// return "pack://application:,,,/Resources/Icons-flaticon/question.png";
39+
// return "pack://application:,,,/Resources/flaticon/flaticon-question.png";
4240
//}
4341
return DependencyProperty.UnsetValue;
4442
}

Diff for: ‎QuickSetup.UI/Resources/Icons-flaticon/circumference1.png renamed to ‎QuickSetup.UI/Resources/Icons/flaticon-circumference1.png

File renamed without changes.

Diff for: ‎QuickSetup.UI/Resources/Icons-flaticon/circumference2.png renamed to ‎QuickSetup.UI/Resources/Icons/flaticon-circumference2.png

File renamed without changes.

Diff for: ‎QuickSetup.UI/Resources/Icons-flaticon/error.png renamed to ‎QuickSetup.UI/Resources/Icons/flaticon-error.png

File renamed without changes.

Diff for: ‎QuickSetup.UI/Resources/Icons-flaticon/question.png renamed to ‎QuickSetup.UI/Resources/Icons/flaticon-question.png

File renamed without changes.

Diff for: ‎QuickSetup.UI/Resources/Icons-flaticon/success.png renamed to ‎QuickSetup.UI/Resources/Icons/flaticon-success.png

File renamed without changes.

Diff for: ‎QuickSetup.UI/Resources/Icons-flaticon/icons8-opposite-opinion-24.png renamed to ‎QuickSetup.UI/Resources/Icons/icons8-opposite-opinion-24.png

File renamed without changes.

Diff for: ‎QuickSetup.UI/Resources/Icons-flaticon/icons8-opposite-opinion-48.png renamed to ‎QuickSetup.UI/Resources/Icons/icons8-opposite-opinion-48.png

File renamed without changes.

Diff for: ‎QuickSetup.UI/Resources/Icons/icons8-quick-mode-on-100.png

2.15 KB
Loading

Diff for: ‎QuickSetup.UI/Resources/Icons/icons8-quick-mode-on-24.png

501 Bytes
Loading

Diff for: ‎QuickSetup.UI/Resources/Icons/icons8-quick-mode-on-32.png

716 Bytes
Loading

Diff for: ‎QuickSetup.UI/Resources/Icons/icons8-quick-mode-on-48.png

1.05 KB
Loading

Diff for: ‎QuickSetup.UI/Resources/Icons/icons8-quick-mode-on-multi.ico

56.7 KB
Binary file not shown.

Diff for: ‎QuickSetup.UI/Views/MainView.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Title="Quick Setup"
99
Height="600"
1010
Width="800"
11+
Icon="../Resources/Icons/icons8-quick-mode-on-48.png"
1112
d:DataContext="{d:DesignInstance Type=viewModel:MainViewModel,
1213
IsDesignTimeCreatable=True}"
1314
BorderThickness="5"
@@ -29,7 +30,7 @@
2930
<TextBlock HorizontalAlignment="Right" FontSize="8">
3031
<Run Text="This Project is using the following products:" />
3132
<LineBreak />
32-
<Run Text=".NET, Log4Net, MahApps.Metro, Xceed WPF, GalaSoft.MvvmLight, FlatIcon.com" />
33+
<Run Text=".NET, Log4Net, MahApps, Xceed WPF, MvvmLight, FlatIcon, Icons8" />
3334
</TextBlock>
3435
</StatusBarItem>
3536
</StatusBar>

Diff for: ‎QuickSetup.UI/Views/SingleSoftwareView.xaml

+7-9
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
xmlns:viewModel="clr-namespace:QuickSetup.UI.ViewModel"
9+
Icon="../Resources/Icons/icons8-quick-mode-on-48.png"
910
Title="Single Software - Edit"
1011
MinWidth="400"
1112
d:DataContext="{d:DesignInstance Type=viewModel:SoftwareDirectoryViewModel}"
@@ -14,13 +15,10 @@
1415
SizeToContent="WidthAndHeight"
1516
WindowStartupLocation="CenterOwner"
1617
mc:Ignorable="d">
17-
18-
<Window.Resources>
19-
<ResourceDictionary Source="../Resources/AppStyle/AppStyle.xaml"/>
20-
</Window.Resources>
2118

22-
23-
19+
<Window.Resources>
20+
<ResourceDictionary Source="../Resources/AppStyle/AppStyle.xaml" />
21+
</Window.Resources>
2422

2523
<StackPanel Margin="10">
2624
<Grid>
@@ -170,7 +168,7 @@
170168
<VisualBrush Visual="{StaticResource appbar_folder}" />
171169
</Rectangle.Fill>
172170
</Rectangle>
173-
</InlineUIContainer><Run Text=" Folder"/></TextBlock>
171+
</InlineUIContainer><Run Text=" Folder" /></TextBlock>
174172
<TextBlock Grid.Row="0"
175173
Grid.Column="1"
176174
Text="{Binding Path=CurrentFolder,
@@ -182,7 +180,7 @@
182180
<VisualBrush Visual="{StaticResource appbar_page}" />
183181
</Rectangle.Fill>
184182
</Rectangle>
185-
</InlineUIContainer><Run Text=" File Name"/></TextBlock>
183+
</InlineUIContainer><Run Text=" File Name" /></TextBlock>
186184
<DockPanel Grid.Row="1" Grid.Column="1">
187185
<Button MinWidth="50"
188186
Command="{Binding Path=BrowseToSelectSetupFileCommand}"
@@ -198,7 +196,7 @@
198196
<VisualBrush Visual="{StaticResource appbar_sound_mute}" />
199197
</Rectangle.Fill>
200198
</Rectangle>
201-
</InlineUIContainer><Run Text=" Parameters"/></TextBlock>
199+
</InlineUIContainer><Run Text=" Parameters" /></TextBlock>
202200
<TextBox Grid.Row="2"
203201
Grid.Column="1"
204202
Text="{Binding Path=ClonedModel.SetupSilentParams,

0 commit comments

Comments
 (0)