From 902e8f57121eaa1b351881d4c1fe268d01a4f22a Mon Sep 17 00:00:00 2001
From: Husky <damianbodde@googlemail.com>
Date: Sun, 22 Mar 2020 22:11:54 +0100
Subject: [PATCH] Controlls editiert

---
 KanSan/MainWindow.xaml              | 12 ++++----
 KanSan/UI/Objekte/UCObjektEdit.xaml | 48 ++++++++++++++++++++++++++++-
 KanSan/my_controls.xaml             | 10 +++---
 3 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/KanSan/MainWindow.xaml b/KanSan/MainWindow.xaml
index c2761c6..c5582ee 100644
--- a/KanSan/MainWindow.xaml
+++ b/KanSan/MainWindow.xaml
@@ -5,11 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:KanSan"
         xmlns:syncfusion="clr-namespace:Syncfusion.Windows.Shared;assembly=Syncfusion.Shared.WPF" x:Class="KanSan.MainWindow"
-        TitleTextAlignment="Center"
+        TitleTextAlignment="Center" TitleBarBackground="BlueViolet"
         mc:Ignorable="d"
         Title="{Binding ApplicationTitle}" Height="450" Width="800" WindowStartupLocation="CenterScreen" WindowState="Maximized">
-    
-        
+
+
 
     <Window.Resources>
         <ResourceDictionary>
@@ -20,8 +20,8 @@
     </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="29*" />
-            <ColumnDefinition Width="171*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="206*" />
@@ -32,7 +32,7 @@
             <RadioButton Name="rbProjekte" Content="Projekte" Style="{StaticResource ToggelButtonList}" Checked="rbProjekte_Checked" />
             <RadioButton Name="rbBaustellen" Content="Baustellen" Style="{StaticResource ToggelButtonList}" Checked="rbBaustellen_Checked" />
             <RadioButton x:Name="rbObjekte" Content="Objekte" Style="{StaticResource ToggelButtonList}" Checked="rbObjekte_Checked" />
-            
+
         </StackPanel>
         <ContentControl Grid.Column="1" Name="ContentController" Content="KanSan"/>
         <StatusBar Grid.ColumnSpan="2" Margin="0,1,0,0" Grid.Row="1">
diff --git a/KanSan/UI/Objekte/UCObjektEdit.xaml b/KanSan/UI/Objekte/UCObjektEdit.xaml
index c6a5e26..3492158 100644
--- a/KanSan/UI/Objekte/UCObjektEdit.xaml
+++ b/KanSan/UI/Objekte/UCObjektEdit.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:self="clr-namespace:KanSan.ViewModel;assembly=KanSan.ViewModel"
              xmlns:local="clr-namespace:KanSan.UI"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" Background="LightGray">
@@ -14,7 +15,52 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
-        <CheckBox Content="Rohrleitung in Betrieb" IsChecked="True" Style="{StaticResource checkBoxCircle}"/>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <StackPanel Grid.Column="1">
+            <CheckBox Content="Rohrleitung in Betrieb" IsChecked="True" Style="{StaticResource checkBoxCircle}"/>
+            <CheckBox Content="Wasserhaltung durchgeführt" IsChecked="True" Style="{StaticResource checkBoxCircle}" />
+            <CheckBox Content="Haltung gespült" IsChecked="True"  Style="{StaticResource checkBoxCircle}" />
+            <CheckBox Content="Genehmigung Erforderlich" IsChecked="True" Style="{StaticResource checkBoxCircle}" />
+            <CheckBox Content="Baustellen sicherung erforderlich" IsChecked="False" Style="{StaticResource checkBoxCircle}" />
+        </StackPanel>
+        <Grid Grid.Column="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Label Grid.Row="0" Grid.Column="0" Content="Strassename"/>
+            <Label Grid.Row="1" Grid.Column="0" Content="Obere Punkt" />
+            <Label Grid.Row="2" Grid.Column="0" Content="Untere Punkt" />
+            <Label Grid.Row="3" Grid.Column="0" Content="Objektbezeichnung" />
+            <Label Grid.Row="4" Grid.Column="0" Content="Durchmesser" />
+            <Label Grid.Row="5" Grid.Column="0" Content="Material" />
+
+            <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Strassename}" />
+            <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding OberePunkt}" />
+            <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding UnterePunkt}" />
+            <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding Objektnummer}" />
+            <TextBox Grid.Row="4" Grid.Column="1" Text="{Binding DN}" />
+            <ComboBox Grid.Row="5" Grid.Column="1">
+                <ComboBoxItem Content="Lala" />
+                <ComboBoxItem Content="Haha" />
+            </ComboBox>
+            <!--<TextBox Grid.Row="5" Grid.Column="1" Text="{Binding Material}" />-->
+        </Grid>
         <!--<RadioButton Name="my" Content="Rohrleitung in Betrieb" Style="{StaticResource ToggelButtonList}" />-->
     </Grid>
 </UserControl>
diff --git a/KanSan/my_controls.xaml b/KanSan/my_controls.xaml
index a3a297b..8304906 100644
--- a/KanSan/my_controls.xaml
+++ b/KanSan/my_controls.xaml
@@ -16,11 +16,11 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="UIElement.IsMouseOver" Value="True">
-                            <Setter TargetName="rect" Property="Shape.Fill" Value="#FFFFA500" />
+                            <Setter TargetName="rect" Property="Shape.Fill" Value="BlueViolet"/>
                             <Setter Property="Foreground" Value="#FFFFFFFF"/>
                         </Trigger>
                         <Trigger Property="ToggleButton.IsChecked" Value="True">
-                            <Setter TargetName="rect" Property="Shape.Fill" Value="#FFFFA500" />
+                            <Setter TargetName="rect" Property="Shape.Fill" Value="BlueViolet" />
                             <Setter Property="Foreground" Value="#FFFFFFFF" />
                         </Trigger>
                     </ControlTemplate.Triggers>
@@ -34,7 +34,7 @@
         <Setter Property="Content" Value="" />
         <Setter Property="IsEnabled" Value="{Binding Change}" />
         <Setter Property="FrameworkElement.FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Foreground" Value="#FFFFFFFF" />
+        <Setter Property="Foreground" Value="Black" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CheckBox}">
@@ -49,13 +49,13 @@
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="ToggleButton.IsChecked" Value="True">
-                            <Setter TargetName="highlightCircle" Property="Shape.Fill" Value="#FFFFA500"/>
+                            <Setter TargetName="highlightCircle" Property="Shape.Fill" Value="BlueViolet"/>
                         </Trigger>
                         <Trigger Property="ToggleButton.IsChecked" Value="False">
                             <Setter TargetName="highlightCircle" Property="Shape.Fill" Value="#FFFFFFFF" />
                         </Trigger>
                         <Trigger Property="UIElement.IsFocused" Value="True">
-                            <Setter TargetName="outerEllipse" Property="Shape.Stroke" Value="#FFFFA500" />
+                            <Setter TargetName="outerEllipse" Property="Shape.Stroke" Value="BlueViolet" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>