Credits Tab

tuiSSE · Jun 20, 2015 · 2052ea5 · 2052ea5
1 parent dbe9e84
commit 2052ea5
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 7 deletions.
diff --git a/Softwareprojekt2015/App.xaml b/Softwareprojekt2015/App.xaml
@@ -13,6 +13,8 @@
                 <ResourceDictionary Source="GUI/WorldMap.xaml" />
                 <ResourceDictionary Source="GUI/PageContent.xaml" />
                 <ResourceDictionary Source="GUI/Settings.xaml" />
+                <ResourceDictionary Source="GUI/Credits.xaml" />
+
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/Softwareprojekt2015/GUI/Credits.xaml b/Softwareprojekt2015/GUI/Credits.xaml
@@ -1,10 +1,37 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:Class="NSA4Dummies.Credits">
+  <DataTemplate x:Key="Credits">
+    <Viewbox>
+      <Grid x:Name="maingrid" Background="{Binding Path=MainBackground}">
+
 
-    <DataTemplate x:Key="Credits">
-        <Viewbox>
+
+          <!-- 
+                    \brief  There are two columns in the first row.
+                            Column 0: Program title and version
+                            Column 1: 'About' and 'Config' button
+                -->
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto"/>
+            <ColumnDefinition Width="*"/>
+          </Grid.ColumnDefinitions>
 
-        </Viewbox>
-    </DataTemplate>
+          <!-- 
+                    \brief  Column 0: Program title and version
+                -->
+          <Border Grid.Column="0"
+                  Padding = "20 0 0 0"
+                  HorizontalAlignment="Left">
+            <StackPanel Orientation="Horizontal">
+              <TextBlock Foreground="{Binding Path=MainForeground}" VerticalAlignment="Bottom" x:Name="pageTitle" Text="{Binding T[general.appName]}" Style="{StaticResource PageHeaderTextStyle}" />
+              <TextBlock Foreground="{Binding Path=MainForeground}" VerticalAlignment="Bottom" Margin="0 0 0 3" Opacity="0.75" Text="{Binding T[general.version]}" Style="{StaticResource SectionHeaderSmallTextStyle}" />
+            </StackPanel>
 
-</ResourceDictionary>
+          </Border>
+        </Grid>
+    </Viewbox>
+  </DataTemplate>
+</ResourceDictionary>
+
+
diff --git a/Softwareprojekt2015/GUI/Credits.xaml.cs b/Softwareprojekt2015/GUI/Credits.xaml.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace NSA4Dummies
+{
+    public partial class Credits
+    {
+        /// <summary>
+        /// Constructor of PageContent
+        /// </summary>
+        public Credits()
+        {
+
+        }
+    }
+}
+
diff --git a/Softwareprojekt2015/NSA4Dummies.csproj b/Softwareprojekt2015/NSA4Dummies.csproj
@@ -121,6 +121,10 @@
     <Compile Include="Core\IPLookup\IP2Country.cs" />
     <Compile Include="Core\ObservableCollectionEx.cs" />
     <Compile Include="DataPacket.cs" />
+    <Compile Include="GUI\Credits.xaml.cs">
+      <DependentUpon>Credits.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="GUI\PageContent.xaml.cs">
       <DependentUpon>PageContent.xaml</DependentUpon>
     </Compile>
@@ -151,8 +155,8 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="GUI\PageContent.xaml">
-      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="GUI\Settings.xaml">
       <SubType>Designer</SubType>
@@ -207,6 +211,7 @@
     </None>
     <None Include="language\de.lan">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
     </None>
     <None Include="language\en.lan">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>