Loading INAF.Apps.Uwp.SLabDataManager/Constants/Enums.cs +2 −1 Original line number Diff line number Diff line Loading @@ -4,12 +4,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.Constants { public class Enums { public enum FileExt public enum StorageItemType { [Description("txt")] Txt, [Description("xml")] Xml, Folder } public enum FileReadingStatus Loading INAF.Apps.Uwp.SLabDataManager/Extensions/Extensions.cs +1 −1 Original line number Diff line number Diff line Loading @@ -611,7 +611,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions return string.Join(string.Empty, "color", type.ToString().ToLowerInvariant()); } public static string ToFileExt(this FileExt fileExt) public static string ToFileExt(this StorageItemType fileExt) { return string.Join(string.Empty, ".", fileExt.GetDescription()); } Loading INAF.Apps.Uwp.SLabDataManager/Helpers/StorageItemsHelper.cs +3 −3 Original line number Diff line number Diff line Loading @@ -61,7 +61,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers } public string createFilenameForLocalSaving(string filepath, FileExt fileExt, StorageItemType fileExt, SpectrumType spectrumType) { FileInfo fi = new FileInfo(filepath); Loading @@ -78,8 +78,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers string ext = string.Join(".", temp.ToArray()); /* create new filename */ if (fileExt != FileExt.Txt) ext = ext.Replace(FileExt.Txt.GetDescription(), fileExt.GetDescription()); if (fileExt != StorageItemType.Txt) ext = ext.Replace(StorageItemType.Txt.GetDescription(), fileExt.GetDescription()); string filename = string.Join(string.Empty, filenameNoExt, "_", spectrumType, ".", ext); return filename; Loading INAF.Apps.Uwp.SLabDataManager/Styles/Custom.xaml +14 −17 Original line number Diff line number Diff line Loading @@ -79,6 +79,7 @@ <x:String x:Key="Ref">Ref</x:String> <x:String x:Key="RefWhite">RefWhite</x:String> <x:String x:Key="Xml">Xml</x:String> <x:String x:Key="Folder">Folder</x:String> <!-- CHROMELESS BUTTON STYLE --> <Style x:Key="ChromelessButtonStyle" TargetType="Button"> Loading Loading @@ -517,6 +518,7 @@ </Border> </ControlTemplate> <!-- FLYOUT FOR OPENING RECENT STORAGE ITEMS --> <Flyout x:Name="RecentFilesFlyout" x:Key="RecentFilesFlyout" Placement="BottomEdgeAlignedLeft"> Loading @@ -537,7 +539,8 @@ Visibility="{Binding Path=AreAvailable, Converter={StaticResource BoolToVisibilityInverseConverter}, Mode=OneWay}" Margin="8" Grid.Row="0" /> <ListView ItemsSource="{Binding Path=RecentFiles, Mode=OneWay}" <ListView x:Name="listViewRecentItems" ItemsSource="{Binding Path=RecentFiles, Mode=OneWay}" IsItemClickEnabled="True" SelectionMode="Single" Visibility="{Binding Path=AreAvailable, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" Loading @@ -551,12 +554,6 @@ TextTrimming="CharacterEllipsis"/> </DataTemplate> </ListView.ItemTemplate> <!-- BEHAVIORS --> <Interactivity:Interaction.Behaviors> <Core:EventTriggerBehavior EventName="ItemClick"> <Core:InvokeCommandAction Command="{Binding CommandOpenSelectedSpectrumFile}"/> </Core:EventTriggerBehavior> </Interactivity:Interaction.Behaviors> </ListView> </Grid> </Flyout> Loading INAF.Apps.Uwp.SLabDataManager/ViewModels/BaseViewModel.cs +1 −1 Original line number Diff line number Diff line Loading @@ -67,7 +67,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels } } protected async Task<StorageFile> selectFileAsync(List<FileExt> fileExts) protected async Task<StorageFile> selectFileAsync(List<StorageItemType> fileExts) { StorageFile file = null; Loading Loading
INAF.Apps.Uwp.SLabDataManager/Constants/Enums.cs +2 −1 Original line number Diff line number Diff line Loading @@ -4,12 +4,13 @@ namespace INAF.Apps.Uwp.SLabDataManager.Constants { public class Enums { public enum FileExt public enum StorageItemType { [Description("txt")] Txt, [Description("xml")] Xml, Folder } public enum FileReadingStatus Loading
INAF.Apps.Uwp.SLabDataManager/Extensions/Extensions.cs +1 −1 Original line number Diff line number Diff line Loading @@ -611,7 +611,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Extensions return string.Join(string.Empty, "color", type.ToString().ToLowerInvariant()); } public static string ToFileExt(this FileExt fileExt) public static string ToFileExt(this StorageItemType fileExt) { return string.Join(string.Empty, ".", fileExt.GetDescription()); } Loading
INAF.Apps.Uwp.SLabDataManager/Helpers/StorageItemsHelper.cs +3 −3 Original line number Diff line number Diff line Loading @@ -61,7 +61,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers } public string createFilenameForLocalSaving(string filepath, FileExt fileExt, StorageItemType fileExt, SpectrumType spectrumType) { FileInfo fi = new FileInfo(filepath); Loading @@ -78,8 +78,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers string ext = string.Join(".", temp.ToArray()); /* create new filename */ if (fileExt != FileExt.Txt) ext = ext.Replace(FileExt.Txt.GetDescription(), fileExt.GetDescription()); if (fileExt != StorageItemType.Txt) ext = ext.Replace(StorageItemType.Txt.GetDescription(), fileExt.GetDescription()); string filename = string.Join(string.Empty, filenameNoExt, "_", spectrumType, ".", ext); return filename; Loading
INAF.Apps.Uwp.SLabDataManager/Styles/Custom.xaml +14 −17 Original line number Diff line number Diff line Loading @@ -79,6 +79,7 @@ <x:String x:Key="Ref">Ref</x:String> <x:String x:Key="RefWhite">RefWhite</x:String> <x:String x:Key="Xml">Xml</x:String> <x:String x:Key="Folder">Folder</x:String> <!-- CHROMELESS BUTTON STYLE --> <Style x:Key="ChromelessButtonStyle" TargetType="Button"> Loading Loading @@ -517,6 +518,7 @@ </Border> </ControlTemplate> <!-- FLYOUT FOR OPENING RECENT STORAGE ITEMS --> <Flyout x:Name="RecentFilesFlyout" x:Key="RecentFilesFlyout" Placement="BottomEdgeAlignedLeft"> Loading @@ -537,7 +539,8 @@ Visibility="{Binding Path=AreAvailable, Converter={StaticResource BoolToVisibilityInverseConverter}, Mode=OneWay}" Margin="8" Grid.Row="0" /> <ListView ItemsSource="{Binding Path=RecentFiles, Mode=OneWay}" <ListView x:Name="listViewRecentItems" ItemsSource="{Binding Path=RecentFiles, Mode=OneWay}" IsItemClickEnabled="True" SelectionMode="Single" Visibility="{Binding Path=AreAvailable, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" Loading @@ -551,12 +554,6 @@ TextTrimming="CharacterEllipsis"/> </DataTemplate> </ListView.ItemTemplate> <!-- BEHAVIORS --> <Interactivity:Interaction.Behaviors> <Core:EventTriggerBehavior EventName="ItemClick"> <Core:InvokeCommandAction Command="{Binding CommandOpenSelectedSpectrumFile}"/> </Core:EventTriggerBehavior> </Interactivity:Interaction.Behaviors> </ListView> </Grid> </Flyout> Loading
INAF.Apps.Uwp.SLabDataManager/ViewModels/BaseViewModel.cs +1 −1 Original line number Diff line number Diff line Loading @@ -67,7 +67,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels } } protected async Task<StorageFile> selectFileAsync(List<FileExt> fileExts) protected async Task<StorageFile> selectFileAsync(List<StorageItemType> fileExts) { StorageFile file = null; Loading