Skip to content
This repository was archived by the owner on Oct 3, 2022. It is now read-only.

Commit 1505c7c

Browse files
BinderDynBinderDyn
authored
Merge pull request #32 from BinderDyn/license-disclaimer-icon
license, disclaimer and icon
2 parents 9169a92 + aee32ff commit 1505c7c

File tree

13 files changed

+122
-1
lines changed

13 files changed

+122
-1
lines changed

‎.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache‎

0 Bytes
Binary file not shown.

‎.vs/TakeMyTime.NETCore/v16/.suo‎

2 KB
Binary file not shown.

‎TakeMyTime.WPF/About/About.xaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Page x:Class="TakeMyTime.WPF.About.About"
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:TakeMyTime.WPF.About"
7+
mc:Ignorable="d"
8+
Background="{StaticResource BackgroundGrey}"
9+
Foreground="{StaticResource LightWhite}"
10+
d:DesignHeight="450" d:DesignWidth="800"
11+
Title="About">
12+
13+
<Grid>
14+
<StackPanel Orientation="Vertical">
15+
<TextBox Foreground="{StaticResource LightWhite}" Background="Transparent" BorderThickness="0" Text="Internet: https://github.com/BinderDyn/TakeMyTime.NETCore/"
16+
Padding="20" IsReadOnly="True" TextWrapping="Wrap"></TextBox>
17+
<TextBlock Foreground="{StaticResource LightWhite}" TextWrapping="Wrap" Padding="20">
18+
<TextBlock.Text>
19+
MIT License
20+
21+
Copyright (c) 2020 Marvin Binder -
22+
23+
Permission is hereby granted, free of charge, to any person obtaining a copy
24+
of this software and associated documentation files (the "Software"), to deal
25+
in the Software without restriction, including without limitation the rights
26+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
27+
copies of the Software, and to permit persons to whom the Software is
28+
furnished to do so, subject to the following conditions:
29+
30+
The above copyright notice and this permission notice shall be included in all
31+
copies or substantial portions of the Software.
32+
33+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
SOFTWARE.
40+
</TextBlock.Text>
41+
</TextBlock>
42+
</StackPanel>
43+
</Grid>
44+
</Page>

‎TakeMyTime.WPF/About/About.xaml.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
using System.Windows;
5+
using System.Windows.Controls;
6+
using System.Windows.Data;
7+
using System.Windows.Documents;
8+
using System.Windows.Input;
9+
using System.Windows.Media;
10+
using System.Windows.Media.Imaging;
11+
using System.Windows.Navigation;
12+
using System.Windows.Shapes;
13+
14+
namespace TakeMyTime.WPF.About
15+
{
16+
/// <summary>
17+
/// Interaktionslogik für About.xaml
18+
/// </summary>
19+
public partial class About : Page
20+
{
21+
public About()
22+
{
23+
InitializeComponent();
24+
}
25+
}
26+
}

‎TakeMyTime.WPF/Images/favicon.ico‎

16.6 KB
Binary file not shown.

‎TakeMyTime.WPF/MainWindow.xaml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,31 @@
230230
</StackPanel>
231231
</Button>
232232
</ListViewItem>
233-
233+
<Separator Foreground="{StaticResource LightWhite}"></Separator>
234+
<ListViewItem Height="60">
235+
<Button x:Name="btn_About"
236+
Height="60"
237+
HorizontalAlignment="Left"
238+
Background="Transparent"
239+
Foreground="Transparent"
240+
BorderThickness="0"
241+
Click="btn_About_Click"
242+
>
243+
<StackPanel Orientation="Horizontal">
244+
<materialDesign:PackIcon Kind="InfoCircle"
245+
VerticalAlignment="Center"
246+
Margin="20 10"
247+
Height="40"
248+
Width="25"
249+
Foreground="{StaticResource LightWhite}"
250+
></materialDesign:PackIcon>
251+
<TextBlock
252+
Text="{x:Static resource:MainWindow.AboutMenuItem}"
253+
VerticalAlignment="Center"
254+
Foreground="{StaticResource LightWhite}"></TextBlock>
255+
</StackPanel>
256+
</Button>
257+
</ListViewItem>
234258
</ListView>
235259
</StackPanel>
236260

‎TakeMyTime.WPF/MainWindow.xaml.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ private void btn_Settings_Click(object sender, RoutedEventArgs e)
128128
fr_Content.Navigate(new ProjectTypeOverview());
129129
}
130130

131+
private void btn_About_Click(object sender, RoutedEventArgs e)
132+
{
133+
fr_Content.Navigate(new About.About());
134+
}
135+
131136
#endregion
132137

133138
#endregion

‎TakeMyTime.WPF/Resources/MainWindow.Designer.cs‎

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

‎TakeMyTime.WPF/Resources/MainWindow.de-DE.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<data name="AboutMenuItem" xml:space="preserve">
121+
<value>Mehr</value>
122+
</data>
120123
<data name="AssignmentMenuItem" xml:space="preserve">
121124
<value>Aufgaben</value>
122125
</data>

‎TakeMyTime.WPF/Resources/MainWindow.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<data name="AboutMenuItem" xml:space="preserve">
121+
<value>About this app</value>
122+
</data>
120123
<data name="AssignmentMenuItem" xml:space="preserve">
121124
<value>Assignments</value>
122125
</data>

0 commit comments

Comments
 (0)