From aeebb8d47e1d78b50d9ae5afd9df6eaf9765ed87 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 8 Jan 2019 17:59:31 +0200
Subject: Started working on power module...

---
 .../PPC/Tango.PPC.UI/Tango.PPC.UI.csproj           |  6 ++++-
 .../PPC/Tango.PPC.UI/Views/LayoutView.xaml         | 29 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 7 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index 93a2e6c6a..12465fee3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -359,6 +359,10 @@
       <Project>{91b70e9b-66a7-4873-ae10-400e71cf404f}</Project>
       <Name>Tango.PPC.MachineSettings</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.PPC.Power\Tango.PPC.Power.csproj">
+      <Project>{1d0f15b7-c1f3-4b9e-b0bc-a5b9e50c91d0}</Project>
+      <Name>Tango.PPC.Power</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.PPC.Storage\Tango.PPC.Storage.csproj">
       <Project>{04febb02-f782-4b96-b47d-f6902afa43be}</Project>
       <Name>Tango.PPC.Storage</Name>
@@ -491,7 +495,7 @@ del "$(TargetDir)firmware_package.tfp"</PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 872b6b71e..0b3e0b1ee 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -49,7 +49,7 @@
                             <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <Border>
+                                        <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 1 0 0" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}">
                                                 <touch:TouchButton Margin="0 0 0 0" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" FontSize="{StaticResource TangoHeaderFontSize}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
@@ -76,15 +76,32 @@
                             </StackPanel>
                         </StackPanel>
 
-                        <!--<StackPanel DockPanel.Dock="Bottom">
-                            <Separator Margin="0 10 0 0" Background="#505050" />
-                            <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Command="{Binding SignOutCommand}" FontSize="{StaticResource TangoHeaderFontSize}" Foreground="{StaticResource TangoDarkForegroundBrush}">
+                        <StackPanel DockPanel.Dock="Bottom">
+                            <Separator Margin="0 10 0 0" Background="{StaticResource TangoDividerBrush}" />
+                            <!--<touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="30" Command="{Binding SignOutCommand}" FontSize="{StaticResource TangoHeaderFontSize}" Foreground="{StaticResource TangoDarkForegroundBrush}">
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                     <touch:TouchIcon VerticalAlignment="Center" Angle="180" Icon="Logout" Width="32" Height="32"></touch:TouchIcon>
                                     <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">Sign Out</TextBlock>
                                 </StackPanel>
-                            </touch:TouchButton>
-                        </StackPanel>-->
+                            </touch:TouchButton>-->
+
+                            <ItemsControl ItemsSource="{Binding ModuleLoader.UserModules}">
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 1 0 0" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                <touch:TouchButton Margin="0 0 0 0" Padding="30" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" FontSize="{StaticResource TangoHeaderFontSize}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                                        <Image VerticalAlignment="Center" Source="{Binding Image}" Width="48" Height="48"></Image>
+                                                        <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                    </StackPanel>
+                                                </touch:TouchButton>
+                                            </Border>
+                                        </Border>
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </StackPanel>
                     </DockPanel>
                 </Border>
             </touch:TouchSideMenu.MenuContent>
-- 
cgit v1.3.1