Merge pull request #59 from Standaard-boos/Media

More consistency in language

Author: Standaard-boos

View/MatchingProfilePage.xaml

@@ -7,7 +7,7 @@
       xmlns:VM="clr-namespace:ViewModel;assembly=ViewModel"
       mc:Ignorable="d" 
       d:DesignHeight="1920" d:DesignWidth="1080"
-      Title="MatchingProfilePage">
+      Title="Match">
 
     <Page.Resources>
         <VM:MatchingProfilePageViewModel x:Key="vm"/>

View/OpgevenRelaties.xaml

@@ -7,7 +7,7 @@
       xmlns:VM="clr-namespace:ViewModel"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="OpgevenRelaties">
+      Title="Opgeven relaties">
 
     <Grid>
         <Grid.ColumnDefinitions>

View/OverviewMatches.xaml

@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:ViewModel="clr-namespace:ViewModel;assembly=ViewModel"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="Je matches">
+      Title="Jouw matches">
 
     <Page.DataContext>
         <ViewModel:OverviewMatchesViewModel/>

View/ProfilePage.xaml

@@ -7,7 +7,7 @@
       xmlns:VM="clr-namespace:ViewModel;assembly=ViewModel"
       mc:Ignorable="d" 
       d:DesignHeight="1920" d:DesignWidth="1080"
-      Title="Profile">
+      Title="Profiel">
 
     <ScrollViewer VerticalScrollBarVisibility="Auto" IsEnabled="True">
         <Grid x:Name="AllGrids" Background="{StaticResource BackgroundSecundary}">

View/ProfileSettings.xaml

@@ -9,7 +9,7 @@
       xmlns:components="clr-namespace:View.Components"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="ProfileSettings">
+      Title="{Binding SelectedItem.Header, ElementName=SettingsTabs}">
 
     <Page.DataContext>
         <VM:SettingsPageViewModel/>
@@ -24,7 +24,7 @@
             <RowDefinition Height="85*"/>
             <RowDefinition Height="15*"/>
         </Grid.RowDefinitions>
-        <TabControl TabStripPlacement="Top" Padding="0" BorderThickness="0" Grid.RowSpan="2">
+        <TabControl x:Name="SettingsTabs" TabStripPlacement="Top" Padding="0" BorderThickness="0" Grid.RowSpan="2">
             <TabItem Header="Persoonlijk" Selector.Selected="TabControl_Selected">
                 <Grid Background="{StaticResource BackgroundSecundary}">
                     <Grid.RowDefinitions>
@@ -52,7 +52,7 @@
                     <DatePicker Grid.Column="2" HorizontalAlignment="Left" Grid.Row="4" VerticalAlignment="Center" Width="220" Text="{Binding DateOfBirth, Mode=TwoWay}"/>
                     <RadioButton Content="Man" IsChecked="{Binding Sex, Mode=TwoWay}" Grid.Column="2" HorizontalAlignment="Left" Grid.Row="5" VerticalAlignment="Center"/>
                     <RadioButton Content="Vrouw" IsChecked="{Binding Sex, Mode=TwoWay, ConverterParameter=true, Converter={StaticResource InvertBoolConverter}}" Grid.Column="2" HorizontalAlignment="Left" Margin="80,0,0,0" Grid.Row="5" VerticalAlignment="Center"/>
-                    <Label Content="Persoonlijk" FontSize="22" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <!--<Label Content="Persoonlijk" FontSize="22" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center"/>-->
                 </Grid>
             </TabItem>
             <TabItem Header="School" Selector.Selected="TabControl_Selected">
@@ -75,7 +75,7 @@
                     <TextBox Grid.Column="2" HorizontalAlignment="Left" Grid.Row="1" Text="{Binding SchoolName, Mode=TwoWay}" TextWrapping="Wrap" VerticalAlignment="Center" Width="220" Height="18"/>
                     <TextBox Grid.Column="2" HorizontalAlignment="Left" Grid.Row="2" Text="{Binding Study, Mode=TwoWay}" TextWrapping="Wrap" VerticalAlignment="Center" Width="220" Height="18"/>
                     <TextBox Grid.Column="2" HorizontalAlignment="Left" Grid.Row="3" Text="{Binding SchoolCity, Mode=TwoWay}" TextWrapping="Wrap" VerticalAlignment="Center" Width="220" Height="18"/>
-                    <Label Content="School" Grid.Column="1" FontSize="22" HorizontalAlignment="Left"  VerticalAlignment="Center"/>
+                    <!--<Label Content="School" Grid.Column="1" FontSize="22" HorizontalAlignment="Left"  VerticalAlignment="Center"/>-->
                 </Grid>
             </TabItem>
             <TabItem Header="Beschrijving" Selector.Selected="TabControl_Selected">
@@ -93,7 +93,7 @@
                     </Grid.ColumnDefinitions>
                     <Label Content="Schrijf hier wat leuks over jezelf (max 420 woorden)." Grid.Column="1" HorizontalAlignment="Left" Grid.Row="1" VerticalAlignment="Center" Height="26" Width="281"/>
                     <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Description, Mode=TwoWay}" TextWrapping="Wrap" Grid.ColumnSpan="1" />
-                    <Label Content="Beschrijving" Grid.Column="1" FontSize="22" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <!--<Label Content="Beschrijving" Grid.Column="1" FontSize="22" HorizontalAlignment="Left" VerticalAlignment="Center"/>-->
                 </Grid>
             </TabItem>
             <TabItem Header="Interesses" Selector.Selected="TabControl_Selected">
@@ -108,7 +108,7 @@
                         <ColumnDefinition Width="70*"/>
                         <ColumnDefinition Width="25*"/>
                     </Grid.ColumnDefinitions>
-                    <Label Content="Interesses" Grid.Column="1" FontSize="22" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                    <!--<Label Content="Interesses" Grid.Column="1" FontSize="22" HorizontalAlignment="Left" VerticalAlignment="Center"/>-->
                     <ItemsControl x:Name="InterestControl" Grid.Column="1" Grid.Row="1" ItemsSource="{Binding ChosenInterests, Mode=TwoWay}">
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
@@ -128,6 +128,7 @@
                     <StackPanel.DataContext>
                         <VM:ProfilePagePhotosViewModel/>
                     </StackPanel.DataContext>
+                    <!--<Label Content="Profielfoto's" Grid.Column="1" FontSize="22" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="20"/>-->
                     <ItemsControl ItemsSource="{Binding Images}" Margin="20">
                         <!-- Example array for design -->
                         <!--<d:ItemsControl.ItemsSource>

View/SearchPreferencePage.xaml

@@ -7,7 +7,7 @@
       xmlns:vm="clr-namespace:ViewModel;assembly=ViewModel"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="SearchPreferencePage">
+      Title="Zoekvoorkeuren">
 
     <Page.Resources>
         <vm:SearchPreferencePageViewModel x:Key="vm"/>
@@ -24,7 +24,6 @@
             <ColumnDefinition Width="70*"/>
             <ColumnDefinition Width="25*"/>
         </Grid.ColumnDefinitions>
-        <Label Content="Zoekvoorkeuren" Grid.Column="1" FontSize="22" HorizontalAlignment="Left" VerticalAlignment="Center"/>
         <StackPanel DataContext="{StaticResource vm}" Grid.Column="1" Grid.Row="1">
             <ToggleButton x:Name = "cb1" Content = "Vrienden"
                           Margin = "5" Width = "100" HorizontalAlignment = "Left" IsChecked="{Binding Friend}" />

ViewModel/MainPageViewModel.cs

@@ -103,11 +103,11 @@ private ObservableCollection<MainMenuNavigationItemData> SetObservableCollection
                 MainWindowPage = @"HomePages\HomePageBeforeLogin.xaml";
                 collection.Add(new MainMenuNavigationItemData("Home", MainWindowPage, null));
             }
-            collection.Add(new MainMenuNavigationItemData("Profile", "ProfilePage.xaml", null));
+            collection.Add(new MainMenuNavigationItemData("Profiel", "ProfilePage.xaml", null));
             collection.Add(new MainMenuNavigationItemData("Zoeken naar matches", "MatchingProfilePage.xaml", null));
             collection.Add(new MainMenuNavigationItemData("Mijn matches", "OverviewMatches.xaml", null));
             collection.Add(new MainMenuNavigationItemData("Zoekvoorkeuren", "SearchPreferencePage.xaml", null));
-            collection.Add(new MainMenuNavigationItemData("Settings", "ProfileSettings.xaml", null));
+            collection.Add(new MainMenuNavigationItemData("Instellingen", "ProfileSettings.xaml", null));
 
             return collection;
         }