Skip to content

Commit 03d4505

Browse files
emoachtemoacht
authored
Merge pull request #400 from emoacht/develop
Develop
2 parents 535d061 + bfe7cfb commit 03d4505

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1199
-628
lines changed

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Additional languages:
3131
- Romanian (ro) by @calini
3232
- Russian (ru-RU) by @SigmaTel71
3333
- Turkish (tr-TR) by @webbudesign
34+
- Ukrainian (uk-UA) by @kaplun07
3435
- Simplified Chinese (zh-Hans) by @ComMouse, @zhujunsan, @XMuli, @FISHandCHEAP and @FrzMtrsprt
3536
- Traditional Chinese (zh-Hant) by @toto6038 and @XMuli
3637

‎Source/IconImage/AppIcon.xaml renamed to ‎Source/IconImage/DarkAppIcon.xaml

+132-131
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,133 @@
1-
<UserControl x:Class="IconImage.AppIcon"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:local="clr-namespace:IconImage"
7-
mc:Ignorable="d"
8-
d:DesignHeight="256" d:DesignWidth="256"
9-
Width="256" Height="256">
10-
<UserControl.Resources>
11-
<Color x:Key="EdgeColor">#FF343434</Color>
12-
<Color x:Key="BackColor">#FF262626</Color>
13-
14-
<SolidColorBrush x:Key="LightBrush" Color="White"/>
15-
<SolidColorBrush x:Key="EdgeBrush" Color="{StaticResource BackColor}"/>
16-
<SolidColorBrush x:Key="BackBrush" Color="{StaticResource BackColor}"/>
17-
</UserControl.Resources>
18-
19-
<Grid Background="{x:Null}">
20-
<Rectangle Fill="{StaticResource BackBrush}"/>
21-
22-
<Grid>
23-
<Border BorderBrush="{StaticResource EdgeBrush}"
24-
BorderThickness="32"
25-
Width="144" Height="112"
26-
HorizontalAlignment="Center" VerticalAlignment="Center"/>
27-
<Border BorderBrush="{StaticResource LightBrush}"
28-
BorderThickness="16"
29-
Width="128" Height="96" HorizontalAlignment="Center" VerticalAlignment="Center"/>
30-
</Grid>
31-
32-
<Grid>
33-
<Rectangle Width="32" Height="64" Margin="104,8,0,0"
34-
HorizontalAlignment="Left" VerticalAlignment="Top"
35-
Fill="{StaticResource EdgeBrush}"/>
36-
37-
<Line X1="120" Y1="16" X2="120" Y2="64"
38-
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
39-
</Grid>
40-
41-
<Grid RenderTransformOrigin="0.5 0.5">
42-
<Rectangle Width="34" Height="54" Margin="103,-8,0,0"
43-
HorizontalAlignment="Left" VerticalAlignment="Top"
44-
Fill="{StaticResource EdgeBrush}"/>
45-
46-
<Line X1="120" Y1="0" X2="120" Y2="38"
47-
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
48-
49-
<Grid.RenderTransform>
50-
<RotateTransform Angle="45"/>
51-
</Grid.RenderTransform>
52-
</Grid>
53-
54-
<Grid RenderTransformOrigin="0.5 0.5">
55-
<Rectangle Width="32" Height="56" Margin="104,0,0,0"
56-
HorizontalAlignment="Left" VerticalAlignment="Top"
57-
Fill="{StaticResource EdgeBrush}"/>
58-
59-
<Line X1="120" Y1="8" X2="120" Y2="50"
60-
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
61-
62-
<Grid.RenderTransform>
63-
<RotateTransform Angle="90"/>
64-
</Grid.RenderTransform>
65-
</Grid>
66-
67-
<Grid RenderTransformOrigin="0.5 0.5">
68-
<Rectangle Width="34" Height="50" Margin="103,-8,0,0"
69-
HorizontalAlignment="Left" VerticalAlignment="Top"
70-
Fill="{StaticResource EdgeBrush}"/>
71-
72-
<Line X1="120" Y1="0" X2="120" Y2="34"
73-
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
74-
75-
<Grid.RenderTransform>
76-
<RotateTransform Angle="135"/>
77-
</Grid.RenderTransform>
78-
</Grid>
79-
80-
<Grid RenderTransformOrigin="0.5 0.5">
81-
<Rectangle Width="32" Height="64" Margin="104,8,0,0"
82-
HorizontalAlignment="Left" VerticalAlignment="Top"
83-
Fill="{StaticResource EdgeBrush}"/>
84-
85-
<Line X1="120" Y1="16" X2="120" Y2="64"
86-
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
87-
88-
<Grid.RenderTransform>
89-
<RotateTransform Angle="180"/>
90-
</Grid.RenderTransform>
91-
</Grid>
92-
93-
<Grid RenderTransformOrigin="0.5 0.5">
94-
<Rectangle Width="34" Height="54" Margin="103,-8,0,0"
95-
HorizontalAlignment="Left" VerticalAlignment="Top"
96-
Fill="{StaticResource EdgeBrush}"/>
97-
98-
<Line X1="120" Y1="0" X2="120" Y2="38"
99-
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
100-
101-
<Grid.RenderTransform>
102-
<RotateTransform Angle="225"/>
103-
</Grid.RenderTransform>
104-
</Grid>
105-
106-
<Grid RenderTransformOrigin="0.5 0.5">
107-
<Rectangle Width="32" Height="56" Margin="104,0,0,0"
108-
HorizontalAlignment="Left" VerticalAlignment="Top"
109-
Fill="{StaticResource EdgeBrush}"/>
110-
111-
<Line X1="120" Y1="8" X2="120" Y2="50"
112-
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
113-
114-
<Grid.RenderTransform>
115-
<RotateTransform Angle="270"/>
116-
</Grid.RenderTransform>
117-
</Grid>
118-
119-
<Grid RenderTransformOrigin="0.5 0.5">
120-
<Rectangle Width="34" Height="50" Margin="103,-8,0,0"
121-
HorizontalAlignment="Left" VerticalAlignment="Top"
122-
Fill="{StaticResource EdgeBrush}"/>
123-
124-
<Line X1="120" Y1="0" X2="120" Y2="34"
125-
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
126-
127-
<Grid.RenderTransform>
128-
<RotateTransform Angle="315"/>
129-
</Grid.RenderTransform>
130-
</Grid>
131-
</Grid>
1+
<UserControl x:Class="IconImage.DarkAppIcon"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:local="clr-namespace:IconImage"
7+
mc:Ignorable="d"
8+
d:DesignHeight="256" d:DesignWidth="256"
9+
Width="256" Height="256">
10+
<UserControl.Resources>
11+
<Color x:Key="EdgeColor">#FF343434</Color>
12+
<!-- To produce images for tray icon, back color shall be transparent. -->
13+
<Color x:Key="BackColor">#FF262626</Color>
14+
15+
<SolidColorBrush x:Key="LightBrush" Color="White"/>
16+
<SolidColorBrush x:Key="EdgeBrush" Color="{StaticResource BackColor}"/>
17+
<SolidColorBrush x:Key="BackBrush" Color="{StaticResource BackColor}"/>
18+
</UserControl.Resources>
19+
20+
<Grid Background="{x:Null}">
21+
<Rectangle Fill="{StaticResource BackBrush}"/>
22+
23+
<Grid>
24+
<Border BorderBrush="{StaticResource EdgeBrush}"
25+
BorderThickness="32"
26+
Width="144" Height="112"
27+
HorizontalAlignment="Center" VerticalAlignment="Center"/>
28+
<Border BorderBrush="{StaticResource LightBrush}"
29+
BorderThickness="16"
30+
Width="128" Height="96" HorizontalAlignment="Center" VerticalAlignment="Center"/>
31+
</Grid>
32+
33+
<Grid>
34+
<Rectangle Width="32" Height="64" Margin="104,8,0,0"
35+
HorizontalAlignment="Left" VerticalAlignment="Top"
36+
Fill="{StaticResource EdgeBrush}"/>
37+
38+
<Line X1="120" Y1="16" X2="120" Y2="64"
39+
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
40+
</Grid>
41+
42+
<Grid RenderTransformOrigin="0.5 0.5">
43+
<Rectangle Width="34" Height="54" Margin="103,-8,0,0"
44+
HorizontalAlignment="Left" VerticalAlignment="Top"
45+
Fill="{StaticResource EdgeBrush}"/>
46+
47+
<Line X1="120" Y1="0" X2="120" Y2="38"
48+
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
49+
50+
<Grid.RenderTransform>
51+
<RotateTransform Angle="45"/>
52+
</Grid.RenderTransform>
53+
</Grid>
54+
55+
<Grid RenderTransformOrigin="0.5 0.5">
56+
<Rectangle Width="32" Height="56" Margin="104,0,0,0"
57+
HorizontalAlignment="Left" VerticalAlignment="Top"
58+
Fill="{StaticResource EdgeBrush}"/>
59+
60+
<Line X1="120" Y1="8" X2="120" Y2="50"
61+
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
62+
63+
<Grid.RenderTransform>
64+
<RotateTransform Angle="90"/>
65+
</Grid.RenderTransform>
66+
</Grid>
67+
68+
<Grid RenderTransformOrigin="0.5 0.5">
69+
<Rectangle Width="34" Height="50" Margin="103,-8,0,0"
70+
HorizontalAlignment="Left" VerticalAlignment="Top"
71+
Fill="{StaticResource EdgeBrush}"/>
72+
73+
<Line X1="120" Y1="0" X2="120" Y2="34"
74+
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
75+
76+
<Grid.RenderTransform>
77+
<RotateTransform Angle="135"/>
78+
</Grid.RenderTransform>
79+
</Grid>
80+
81+
<Grid RenderTransformOrigin="0.5 0.5">
82+
<Rectangle Width="32" Height="64" Margin="104,8,0,0"
83+
HorizontalAlignment="Left" VerticalAlignment="Top"
84+
Fill="{StaticResource EdgeBrush}"/>
85+
86+
<Line X1="120" Y1="16" X2="120" Y2="64"
87+
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
88+
89+
<Grid.RenderTransform>
90+
<RotateTransform Angle="180"/>
91+
</Grid.RenderTransform>
92+
</Grid>
93+
94+
<Grid RenderTransformOrigin="0.5 0.5">
95+
<Rectangle Width="34" Height="54" Margin="103,-8,0,0"
96+
HorizontalAlignment="Left" VerticalAlignment="Top"
97+
Fill="{StaticResource EdgeBrush}"/>
98+
99+
<Line X1="120" Y1="0" X2="120" Y2="38"
100+
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
101+
102+
<Grid.RenderTransform>
103+
<RotateTransform Angle="225"/>
104+
</Grid.RenderTransform>
105+
</Grid>
106+
107+
<Grid RenderTransformOrigin="0.5 0.5">
108+
<Rectangle Width="32" Height="56" Margin="104,0,0,0"
109+
HorizontalAlignment="Left" VerticalAlignment="Top"
110+
Fill="{StaticResource EdgeBrush}"/>
111+
112+
<Line X1="120" Y1="8" X2="120" Y2="50"
113+
Stroke="{StaticResource LightBrush}" StrokeThickness="16"/>
114+
115+
<Grid.RenderTransform>
116+
<RotateTransform Angle="270"/>
117+
</Grid.RenderTransform>
118+
</Grid>
119+
120+
<Grid RenderTransformOrigin="0.5 0.5">
121+
<Rectangle Width="34" Height="50" Margin="103,-8,0,0"
122+
HorizontalAlignment="Left" VerticalAlignment="Top"
123+
Fill="{StaticResource EdgeBrush}"/>
124+
125+
<Line X1="120" Y1="0" X2="120" Y2="34"
126+
Stroke="{StaticResource LightBrush}" StrokeThickness="18"/>
127+
128+
<Grid.RenderTransform>
129+
<RotateTransform Angle="315"/>
130+
</Grid.RenderTransform>
131+
</Grid>
132+
</Grid>
132133
</UserControl>

‎Source/IconImage/AppIcon.xaml.cs renamed to ‎Source/IconImage/DarkAppIcon.xaml.cs

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using System.Windows;
7-
using System.Windows.Controls;
8-
using System.Windows.Data;
9-
using System.Windows.Documents;
10-
using System.Windows.Input;
11-
using System.Windows.Media;
12-
using System.Windows.Media.Imaging;
13-
14-
namespace IconImage
15-
{
16-
public partial class AppIcon : UserControl
17-
{
18-
public AppIcon()
19-
{
20-
InitializeComponent();
21-
}
22-
}
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.Windows;
7+
using System.Windows.Controls;
8+
using System.Windows.Data;
9+
using System.Windows.Documents;
10+
using System.Windows.Input;
11+
using System.Windows.Media;
12+
using System.Windows.Media.Imaging;
13+
14+
namespace IconImage
15+
{
16+
public partial class DarkAppIcon : UserControl
17+
{
18+
public DarkAppIcon()
19+
{
20+
InitializeComponent();
21+
}
22+
}
2323
}

‎Source/IconImage/IconImage.csproj

+10-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@
5555
<SubType>Designer</SubType>
5656
</ApplicationDefinition>
5757
<Compile Include="ScaleConverter.cs" />
58-
<Page Include="AppIcon.xaml">
58+
<Page Include="DarkAppIcon.xaml">
59+
<SubType>Designer</SubType>
60+
<Generator>MSBuild:Compile</Generator>
61+
</Page>
62+
<Page Include="LightAppIcon.xaml">
5963
<SubType>Designer</SubType>
6064
<Generator>MSBuild:Compile</Generator>
6165
</Page>
@@ -67,8 +71,11 @@
6771
<DependentUpon>App.xaml</DependentUpon>
6872
<SubType>Code</SubType>
6973
</Compile>
70-
<Compile Include="AppIcon.xaml.cs">
71-
<DependentUpon>AppIcon.xaml</DependentUpon>
74+
<Compile Include="DarkAppIcon.xaml.cs">
75+
<DependentUpon>DarkAppIcon.xaml</DependentUpon>
76+
</Compile>
77+
<Compile Include="LightAppIcon.xaml.cs">
78+
<DependentUpon>LightAppIcon.xaml</DependentUpon>
7279
</Compile>
7380
<Compile Include="FrameworkElementImage.cs" />
7481
<Compile Include="MainWindow.xaml.cs">

0 commit comments

Comments
 (0)