diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-21 14:43:51 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-11-21 14:43:51 +0200 |
| commit | 9ee373ebf7518c96fdf685da792568680dd7f135 (patch) | |
| tree | 92c2c8f60c383ab61e86e02d40ce6677cd77d955 | |
| parent | 36dcf50eec20835ab1955932e89f9c6ffc68acde (diff) | |
| download | Tango-9ee373ebf7518c96fdf685da792568680dd7f135.tar.gz Tango-9ee373ebf7518c96fdf685da792568680dd7f135.zip | |
Working on Touch File Explorer.
| -rw-r--r-- | Software/Graphics/Mobile/File Explorer/pulse.png | bin | 9007 -> 2588 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Tango.Explorer/ExplorerFileItem.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Explorer/Images/pulse.png | bin | 9007 -> 2588 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Tango.Explorer/Themes/Generic.xaml | 16 | ||||
| -rw-r--r-- | Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/Software/Graphics/Mobile/File Explorer/pulse.png b/Software/Graphics/Mobile/File Explorer/pulse.png Binary files differindex 1cabab56d..a369eb899 100644 --- a/Software/Graphics/Mobile/File Explorer/pulse.png +++ b/Software/Graphics/Mobile/File Explorer/pulse.png diff --git a/Software/Visual_Studio/Tango.Explorer/ExplorerFileItem.cs b/Software/Visual_Studio/Tango.Explorer/ExplorerFileItem.cs index e4ac8f5d4..6340ea848 100644 --- a/Software/Visual_Studio/Tango.Explorer/ExplorerFileItem.cs +++ b/Software/Visual_Studio/Tango.Explorer/ExplorerFileItem.cs @@ -18,7 +18,7 @@ namespace Tango.Explorer fileItem.Path = path; fileItem.Description = definition.Description; - fileItem.Name = System.IO.Path.GetFileName(path); + fileItem.Name = System.IO.Path.GetFileNameWithoutExtension(path); fileItem.Icon = definition.Icon; return fileItem; diff --git a/Software/Visual_Studio/Tango.Explorer/Images/pulse.png b/Software/Visual_Studio/Tango.Explorer/Images/pulse.png Binary files differindex 1cabab56d..a369eb899 100644 --- a/Software/Visual_Studio/Tango.Explorer/Images/pulse.png +++ b/Software/Visual_Studio/Tango.Explorer/Images/pulse.png diff --git a/Software/Visual_Studio/Tango.Explorer/Themes/Generic.xaml b/Software/Visual_Studio/Tango.Explorer/Themes/Generic.xaml index a141dc88f..c920ce6bc 100644 --- a/Software/Visual_Studio/Tango.Explorer/Themes/Generic.xaml +++ b/Software/Visual_Studio/Tango.Explorer/Themes/Generic.xaml @@ -15,13 +15,15 @@ <touch:TouchListBox SelectionMode="None" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=local:ExplorerControl},Path=CurrentFolder.Items}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=local:ExplorerControl},Path=SelectedItem,Mode=TwoWay}"> <touch:TouchListBox.ItemTemplate> <DataTemplate DataType="local:ExplorerItem"> - <DockPanel Margin="5"> - <Image DockPanel.Dock="Left" Source="{Binding Icon}" Width="64" Height="64" /> - <StackPanel VerticalAlignment="Center" Margin="20 0 0 0"> - <TextBlock FontSize="16" Text="{Binding Name}"></TextBlock> - <TextBlock Opacity="0.5" FontSize="12" Margin="0 5 0 0" Text="{Binding Description}"></TextBlock> - </StackPanel> - </DockPanel> + <Border Padding="8" BorderBrush="#E9E9E9" BorderThickness="0 0 0 1"> + <DockPanel> + <Image DockPanel.Dock="Left" Source="{Binding Icon}" Width="50" Height="50" /> + <StackPanel VerticalAlignment="Center" Margin="20 0 0 0"> + <TextBlock FontSize="16" Text="{Binding Name}"></TextBlock> + <TextBlock Opacity="0.5" FontSize="12" Margin="0 5 0 0" Text="{Binding Description}"></TextBlock> + </StackPanel> + </DockPanel> + </Border> </DataTemplate> </touch:TouchListBox.ItemTemplate> </touch:TouchListBox> diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml index ff1afdd22..b8301312d 100644 --- a/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml +++ b/Software/Visual_Studio/Utilities/Tango.UITests/MainWindow.xaml @@ -21,12 +21,12 @@ <RowDefinition Height="232*"/> <RowDefinition Height="50"/> </Grid.RowDefinitions> - <explorer:ExplorerControl x:Name="explorer" CurrentPath="{Binding CurrentPath}" /> + <explorer:ExplorerControl x:Name="explorer" CurrentPath="{Binding CurrentPath,Mode=TwoWay}" /> <StackPanel Orientation="Horizontal" Grid.Row="1"> <Button Click="Button_Click">LOAD</Button> <Button Command="{Binding ElementName=explorer,Path=BackCommand}">BACK</Button> - <TextBox Width="200" Margin="10 0 0 0" Text="{Binding CurrentPath}"></TextBox> + <TextBox Width="200" Margin="10 0 0 0" Text="{Binding ElementName=explorer,Path=CurrentPath}"></TextBox> </StackPanel> </Grid> </Window> |
