From d93df33fae0130ef3bd37f263e10d78faf091522 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 19 Feb 2020 18:58:52 +0200
Subject: Improved design of FSE connections.

---
 Software/Graphics/FSE/Machine Icons/cloud.png      | Bin 0 -> 818 bytes
 Software/Graphics/FSE/Machine Icons/emulator.png   | Bin 0 -> 1246 bytes
 .../Graphics/FSE/Machine Icons/machine_accent.png  | Bin 0 -> 5556 bytes
 Software/Graphics/FSE/Machine Icons/usb.png        | Bin 0 -> 923 bytes
 Software/Graphics/FSE/Machine Icons/wifi.png       | Bin 0 -> 1213 bytes
 .../FSE/Tango.FSE.UI/Images/Connections/cloud.png  | Bin 0 -> 818 bytes
 .../Tango.FSE.UI/Images/Connections/emulator.png   | Bin 0 -> 1246 bytes
 .../Connections/external-bridge-emulator.png       | Bin 6412 -> 0 bytes
 .../Images/Connections/external-bridge-signalr.png | Bin 5399 -> 0 bytes
 .../Images/Connections/external-bridge-tcp.png     | Bin 5653 -> 0 bytes
 .../Images/Connections/external-bridge-usb.png     | Bin 5669 -> 0 bytes
 .../FSE/Tango.FSE.UI/Images/Connections/usb.png    | Bin 0 -> 923 bytes
 .../FSE/Tango.FSE.UI/Images/Connections/wifi.png   | Bin 0 -> 1213 bytes
 .../Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml |   1 -
 .../Tango.FSE.UI/Panes/MachineConnectionPane.xaml  |  35 +++++++++++++++------
 .../FSE/Tango.FSE.UI/Tango.FSE.UI.csproj           |  10 +++---
 .../FSE/Tango.FSE.UI/Views/LayoutView.xaml         |   2 +-
 17 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 Software/Graphics/FSE/Machine Icons/cloud.png
 create mode 100644 Software/Graphics/FSE/Machine Icons/emulator.png
 create mode 100644 Software/Graphics/FSE/Machine Icons/machine_accent.png
 create mode 100644 Software/Graphics/FSE/Machine Icons/usb.png
 create mode 100644 Software/Graphics/FSE/Machine Icons/wifi.png
 create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/cloud.png
 create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/emulator.png
 delete mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-emulator.png
 delete mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-signalr.png
 delete mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-tcp.png
 delete mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-usb.png
 create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/usb.png
 create mode 100644 Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/wifi.png

(limited to 'Software')

diff --git a/Software/Graphics/FSE/Machine Icons/cloud.png b/Software/Graphics/FSE/Machine Icons/cloud.png
new file mode 100644
index 000000000..8d5e5f0d9
Binary files /dev/null and b/Software/Graphics/FSE/Machine Icons/cloud.png differ
diff --git a/Software/Graphics/FSE/Machine Icons/emulator.png b/Software/Graphics/FSE/Machine Icons/emulator.png
new file mode 100644
index 000000000..5921280e0
Binary files /dev/null and b/Software/Graphics/FSE/Machine Icons/emulator.png differ
diff --git a/Software/Graphics/FSE/Machine Icons/machine_accent.png b/Software/Graphics/FSE/Machine Icons/machine_accent.png
new file mode 100644
index 000000000..992b5ba35
Binary files /dev/null and b/Software/Graphics/FSE/Machine Icons/machine_accent.png differ
diff --git a/Software/Graphics/FSE/Machine Icons/usb.png b/Software/Graphics/FSE/Machine Icons/usb.png
new file mode 100644
index 000000000..39bdc13e1
Binary files /dev/null and b/Software/Graphics/FSE/Machine Icons/usb.png differ
diff --git a/Software/Graphics/FSE/Machine Icons/wifi.png b/Software/Graphics/FSE/Machine Icons/wifi.png
new file mode 100644
index 000000000..7fa037fb4
Binary files /dev/null and b/Software/Graphics/FSE/Machine Icons/wifi.png differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/cloud.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/cloud.png
new file mode 100644
index 000000000..8d5e5f0d9
Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/cloud.png differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/emulator.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/emulator.png
new file mode 100644
index 000000000..5921280e0
Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/emulator.png differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-emulator.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-emulator.png
deleted file mode 100644
index 254fc819a..000000000
Binary files a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-emulator.png and /dev/null differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-signalr.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-signalr.png
deleted file mode 100644
index bda45ffd2..000000000
Binary files a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-signalr.png and /dev/null differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-tcp.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-tcp.png
deleted file mode 100644
index 04e47f539..000000000
Binary files a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-tcp.png and /dev/null differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-usb.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-usb.png
deleted file mode 100644
index 07814e7de..000000000
Binary files a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/external-bridge-usb.png and /dev/null differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/usb.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/usb.png
new file mode 100644
index 000000000..39bdc13e1
Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/usb.png differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/wifi.png b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/wifi.png
new file mode 100644
index 000000000..7fa037fb4
Binary files /dev/null and b/Software/Visual_Studio/FSE/Tango.FSE.UI/Images/Connections/wifi.png differ
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml
index 6d54b6410..b7ed1bb75 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/MainWindow.xaml
@@ -13,7 +13,6 @@
         WindowStartupLocation="CenterScreen"
         TextElement.Foreground="{StaticResource FSE_PrimaryForegroundBrush}"
         Background="{StaticResource FSE_PrimaryBackgroundBrush}"
-        TextElement.FontWeight="Medium"
         TextElement.FontSize="{StaticResource FSE_DefaultFontSize}"
         TitleCharacterCasing="Normal" UseNoneWindowStyle="True" EnableDWMDropShadow="True" MinWidth="800" MinHeight="600" BorderThickness="1" BorderBrush="Gray" FontFamily="{StaticResource flexo}" WindowTitleBrush="{StaticResource PrimaryHueMidBrush}">
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
index d309d3599..2b8b6c1a9 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Panes/MachineConnectionPane.xaml
@@ -15,19 +15,24 @@
             <UniformGrid Rows="3">
                 <Grid Margin="0 10">
                     <DockPanel>
-                        <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines on local serial ports..."></TextBlock>
+                        <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines on the local serial ports..."></TextBlock>
                         <ProgressBar DockPanel.Dock="Top" Height="2" IsIndeterminate="True" Margin="0 3 0 0" />
                         <ListBox ItemsSource="{Binding UsbMachines}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" PreviewMouseDoubleClick="ListBox_PreviewMouseDoubleClick">
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <Image Source="/Images/Connections/external-bridge-usb.png" Height="35" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                        <Grid Height="35" RenderOptions.BitmapScalingMode="Fant">
+                                            <Image Margin="0 10 0 0" Source="{StaticResource FSE_Machine_Small}"></Image>
+                                            <Canvas HorizontalAlignment="Right" VerticalAlignment="Top">
+                                                <Image Width="24" Canvas.Left="-14" Canvas.Top="0" Source="/Images/Connections/usb.png"></Image>
+                                            </Canvas>
+                                        </Grid>
                                         <StackPanel Margin="10 0 0 0">
                                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}">
-                                            <Run FontWeight="Bold">Port:</Run> <Run Text="{Binding ComPort,Mode=OneWay}"></Run>
+                                            <Run FontWeight="SemiBold">Port:</Run> <Run Text="{Binding ComPort,Mode=OneWay}"></Run>
                                             </TextBlock>
                                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}">
-                                            <Run FontWeight="Bold">Device:</Run> <Run Text="{Binding Device,Mode=OneWay}"></Run>
+                                            <Run FontWeight="SemiBold">Device:</Run> <Run Text="{Binding Device,Mode=OneWay}"></Run>
                                             </TextBlock>
                                         </StackPanel>
                                     </StackPanel>
@@ -44,16 +49,21 @@
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <Image Source="/Images/Connections/external-bridge-tcp.png" Height="35" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                        <Grid Height="35" RenderOptions.BitmapScalingMode="Fant">
+                                            <Image Margin="0 10 0 0" Source="{StaticResource FSE_Machine_Small}"></Image>
+                                            <Canvas HorizontalAlignment="Right" VerticalAlignment="Top">
+                                                <Image Width="20" Canvas.Left="-14" Canvas.Top="0" Source="/Images/Connections/wifi.png"></Image>
+                                            </Canvas>
+                                        </Grid>
                                         <StackPanel Margin="10 0 0 0">
                                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}">
-                                            <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
+                                            <Run FontWeight="SemiBold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
                                             </TextBlock>
                                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}">
-                                            <Run FontWeight="Bold">IP Address:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
+                                            <Run FontWeight="SemiBold">IP Address:</Run> <Run Text="{Binding IPAddress,Mode=OneWay}"></Run>
                                             </TextBlock>
                                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}">
-                                            <Run FontWeight="Bold">Organization:</Run> <Run Text="{Binding Machine.Organization.Name,Mode=OneWay}"></Run>
+                                            <Run FontWeight="SemiBold">Organization:</Run> <Run Text="{Binding Machine.Organization.Name,Mode=OneWay}"></Run>
                                             </TextBlock>
                                         </StackPanel>
                                     </StackPanel>
@@ -64,13 +74,18 @@
                 </Grid>
                 <Grid Margin="0 10">
                     <DockPanel>
-                        <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines over the internet..."></TextBlock>
+                        <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Top" Text="Scanning for machines across the internet..."></TextBlock>
                         <ProgressBar DockPanel.Dock="Top" Height="2" IsIndeterminate="True" Margin="0 3 0 0" />
                         <ListBox ItemsSource="{Binding SignalRMachines}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" PreviewMouseDoubleClick="ListBox_PreviewMouseDoubleClick">
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                        <Image Source="/Images/Connections/external-bridge-signalr.png" Height="35" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                        <Grid Height="35" RenderOptions.BitmapScalingMode="Fant">
+                                            <Image Margin="0 10 0 0" Source="{StaticResource FSE_Machine_Small}"></Image>
+                                            <Canvas HorizontalAlignment="Right" VerticalAlignment="Top">
+                                                <Image Width="18" Canvas.Left="-14" Canvas.Top="0" Source="/Images/Connections/cloud.png"></Image>
+                                            </Canvas>
+                                        </Grid>
                                         <StackPanel Margin="10 0 0 0">
                                             <TextBlock FontSize="{StaticResource FSE_SmallFontSize}">
                                             <Run FontWeight="Bold">S/N:</Run> <Run Text="{Binding SerialNumber,Mode=OneWay}"></Run>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
index 2a242d226..265828dc3 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tango.FSE.UI.csproj
@@ -244,13 +244,13 @@
     <Resource Include="Images\login.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\Connections\external-bridge-emulator.png" />
-    <Resource Include="Images\Connections\external-bridge-signalr.png" />
-    <Resource Include="Images\Connections\external-bridge-tcp.png" />
-    <Resource Include="Images\Connections\external-bridge-usb.png" />
+    <Resource Include="Images\login_white.png" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\login_white.png" />
+    <Resource Include="Images\Connections\cloud.png" />
+    <Resource Include="Images\Connections\emulator.png" />
+    <Resource Include="Images\Connections\usb.png" />
+    <Resource Include="Images\Connections\wifi.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets" Condition="Exists('..\..\packages\MaterialDesignThemes.3.0.1\build\MaterialDesignThemes.targets')" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
index 86c0db78d..57f9c5d55 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/LayoutView.xaml
@@ -36,7 +36,7 @@
                 <!--Right Panes-->
                 <Border x:Name="paneConnection" Padding="5" BorderBrush="{StaticResource FSE_BorderBrush}" BorderThickness="1 0 0 0" Width="350" HorizontalAlignment="Right" Visibility="{Binding IsConnectionPaneOpened,Converter={StaticResource BooleanToVisibilityConverter}}">
                     <Border.Background>
-                        <ImageBrush ImageSource="/Images/abstracts/abstract1.png" Stretch="UniformToFill" Opacity="0.3" />
+                        <ImageBrush ImageSource="/Images/abstracts/abstract1.png" Stretch="UniformToFill" Opacity="0.2" />
                     </Border.Background>
                     <Border.Style>
                         <Style TargetType="Border">
-- 
cgit v1.3.1