diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 16:24:10 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 16:24:10 +0300 |
| commit | cda2e6fb9c2f6e92e3800a8d21a2691f5744bb6b (patch) | |
| tree | b791635c0030f5e9a41d7eacd3388b2aee685f50 /Software/Visual_Studio/PPC/Tango.PPC.UI | |
| parent | bc5b579516e8b770338ff2924cc2215d1f46da2d (diff) | |
| download | Tango-cda2e6fb9c2f6e92e3800a8d21a2691f5744bb6b.tar.gz Tango-cda2e6fb9c2f6e92e3800a8d21a2691f5744bb6b.zip | |
Working on PPC...
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
5 files changed, 12 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/GlobalStatus/ready-to-dye.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/GlobalStatus/ready-to-dye.png Binary files differnew file mode 100644 index 000000000..7edf624be --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/GlobalStatus/ready-to-dye.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml index cabd05265..718eb5519 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml @@ -9,7 +9,8 @@ Title="MainWindow" Height="1000" Stylus.IsTapFeedbackEnabled="False" Stylus.IsPressAndHoldEnabled="False" Stylus.IsTouchFeedbackEnabled="False" Width="800" WindowStyle="SingleBorderWindow" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" FontFamily="{StaticResource TangoFlexoFontFamily}" FontSize="{StaticResource TangoDefaultFontSize}" - Foreground="{StaticResource TangoDarkForegroundBrush}"> + Foreground="{StaticResource TangoDarkForegroundBrush}" + FontWeight="Medium"> <Grid> <views:MainView/> </Grid> 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 2f6491be3..d4c2bb037 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 @@ -182,6 +182,7 @@ <DependentUpon>Settings.settings</DependentUpon> <DesignTimeSharedInput>True</DesignTimeSharedInput> </Compile> + <Resource Include="Images\GlobalStatus\ready-to-dye.png" /> <Resource Include="Images\user-profile.png" /> <Resource Include="Images\warning-test.png" /> <EmbeddedResource Include="Properties\Resources.resx"> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs index 5086fd323..6107a906d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs @@ -35,6 +35,9 @@ namespace Tango.PPC.UI.ViewModels public LoginViewVM() { LoginCommand = new RelayCommand(Login); + + Email = "roy@twine-s.com"; + Password = "1234"; } public override void OnApplicationStarted() 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 9e59b7f33..78d040d27 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -102,6 +102,12 @@ </touch:TouchHamburgerButton.Effect> </touch:TouchHamburgerButton> </Border> + <Grid DockPanel.Dock="Right" Margin="0 0 20 0"> + <StackPanel VerticalAlignment="Center"> + <Image Source="/Images/GlobalStatus/ready-to-dye.png" Width="33" /> + <TextBlock Margin="0 10 0 0">Ready to Dye</TextBlock> + </StackPanel> + </Grid> <Grid> <!--External Header Content Here--> </Grid> |
