Commit 2f852d1a authored by Francesco Carraro's avatar Francesco Carraro
Browse files

started

parent a642fbfd

INAF.Apps.Uwp.SLabDataManager/INAF.Apps.Uwp.SLabDataManager.csproj

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ 
    <Compile Include="Models\Chart\Fit\SegmentFitModel.cs" />

    <Compile Include="Models\Chart\Fit\SegmentFitModelsFactory.cs" />

    <Compile Include="Models\Chart\Processing\ProcessingResult.cs" />

    <Compile Include="Models\Containers\RecentFilesContainer.cs" />

    <Compile Include="Models\Containers\RecentStorageItemsContainer.cs" />

    <Compile Include="Models\SpectrumSummaryModel.cs" />

    <Compile Include="Models\WorkingFoldersContainer.cs" />

    <Compile Include="Models\WorkingItemsModel.cs" />

INAF.Apps.Uwp.SLabDataManager/Models/Containers/RecentFilesContainer.cs→INAF.Apps.Uwp.SLabDataManager/Models/Containers/RecentStorageItemsContainer.cs

+0 −0

File moved.

View file

INAF.Apps.Uwp.SLabDataManager/Strings/en-us/Resources.resw

+6 −0
Original line number Diff line number Diff line
@@ -1006,4 +1006,10 @@ 
  <data name="InfoMeasurementInfoDataTitle.Text" xml:space="preserve">

    <value>Fill info about measurement</value>

  </data>

  <data name="MainPivotItemMultipleFilesSelection.Header" xml:space="preserve">

    <value>Multiple selection</value>

  </data>

  <data name="MultipleSelectFolderLabel.Text" xml:space="preserve">

    <value>Select folder containing spectra</value>

  </data>

</root>
 
 No newline at end of file

INAF.Apps.Uwp.SLabDataManager/Views/MainPage.xaml

+67 −1
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
    xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"

    xmlns:xamlcontrols="using:Microsoft.UI.Xaml.Controls"

    xmlns:toolkitui="using:Microsoft.Toolkit.Uwp.UI"

    xmlns:Core="using:Microsoft.Xaml.Interactions.Core"

    xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"

    NavigationCacheMode="Required"

    Style="{StaticResource PageStyle}"

    mc:Ignorable="d">
@@ -91,7 +93,7 @@ 
                            <RowDefinition Height="*" />

                        </Grid.RowDefinitions>

                        <!-- ROW 0 -->

                        <usercontrols:OpenFileUserControl x:Name="opnXmlFilesUserControl"

                        <usercontrols:OpenFileUserControl x:Name="openXmlFilesUserControl"

                                                          RecentFilesContainer="{x:Bind ViewModel.RecentFilesXmlContainer, Mode=OneWay}"

                                                          SelectedXmlSpectrumType="{x:Bind ViewModel.SelectedXmlSpectrumType, Mode=OneWay}"

                                                          SpectraContainer="{x:Bind ViewModel.WorkingItems.SpectraContainer, Mode=OneWay}"
@@ -123,6 +125,69 @@ 
                                                                       Grid.Row="2" />

                    </Grid>

                </PivotItem>

                <!-- PIVOT-ITEM MULTIPLE FILES SELECTION -->

                <PivotItem x:Name="pivotItemMultipleFilesSelection"

                           x:Uid="MainPivotItemMultipleFilesSelection"

                           Header="Multiple files selection">

                    <Grid>

                        <Grid.RowDefinitions>

                            <RowDefinition Height="Auto" />

                            <RowDefinition Height="*" />

                        </Grid.RowDefinitions>

                        <Grid.ColumnDefinitions>

                            <ColumnDefinition Width="Auto" />

                            <ColumnDefinition Width="Auto" />

                            <ColumnDefinition Width="*" />

                        </Grid.ColumnDefinitions>

                        <!-- ROW 0 -->

                        <TextBlock x:Name="textblockFolderSelectorTitle"

                                   x:Uid="MultipleSelectFolderLabel"

                                   Text="Select INPUT folder"

                                   FontWeight="SemiBold"

                                   Margin="8"

                                   Grid.Row="0" 

                                   Grid.Column="0"

                                   Grid.ColumnSpan="3"/>

                        <!-- ROW 1 -->

                        <Button x:Name="buttonInputFolder"

                                FontFamily="Segoe MDL2 Assets"

                                Width="48"

                                Height="36"

                                Margin="8"

                                Background="{ThemeResource SystemAccentColor}"

                                Grid.Row="1"

                                Grid.Column="0">

                            <SymbolIcon Symbol="OpenFile"/>

                            <Interactivity:Interaction.Behaviors>

                                <Core:EventTriggerBehavior EventName="Tapped">

                                    <Core:InvokeCommandAction Command="{x:Bind CommandSelectSpectrumFile}" />

                                </Core:EventTriggerBehavior>

                            </Interactivity:Interaction.Behaviors>

                        </Button>

                        <Button x:Name="buttonRecentFolders"

                                FontFamily="Segoe MDL2 Assets"

                                Content="&#xE70D;"

                                HorizontalAlignment="Left"

                                Width="48"

                                Height="36"

                                Margin="8"

                                Background="{ThemeResource SystemAccentColor}"

                                Grid.Row="1"

                                Grid.Column="1"

                                DataContext="{x:Bind RecentFilesContainer, Mode=OneWay}"

                                Flyout="{StaticResource RecentFilesFlyout}">

                            <ToolTipService.ToolTip>

                                <TextBlock x:Uid="RecentFilesLabel" />

                            </ToolTipService.ToolTip>

                        </Button>

                        <TextBlock x:Name="textblockInputFolder"

                                   Margin="8,16"

                                   TextWrapping="WrapWholeWords"

                                   Grid.Row="1"

                                   Grid.Column="2" >

                        </TextBlock>

                    </Grid>

                </PivotItem>

            </Pivot>



            <!-- PROGRESS RING -->
@@ -145,6 +210,7 @@ 


            <!-- LOGBOOK -->

            <usercontrols:LogBookUserControl x:Name="logbookUserControl"

                                             d:Visibility="Collapsed"

                                             x:Load="{x:Bind ViewModel.IsLogBookRequired, Mode=OneWay}"

                                             LogBookViewModel="{x:Bind ViewModel.LogBookViewModel, Mode=OneWay}"

                                             CommandHide="{x:Bind ViewModel.CommandHideLogBook}"

INAF.Apps.Uwp.SLabDataManager/Views/UserControls/OpenFile/OpenFileUserControl.xaml.cs

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.Views.UserControls 
{

    public sealed partial class OpenFileUserControl : UserControl

    {

        public static readonly DependencyProperty RecentFilesContainerProperty = DependencyProperty.Register("RecentFilesContainer", typeof(RecentFilesContainer), typeof(OpenFileUserControl), new PropertyMetadata(null));

        public static readonly DependencyProperty RecentFilesContainerProperty = DependencyProperty.Register("RecentFilesContainer", typeof(RecentStorageItemsContainer), typeof(OpenFileUserControl), new PropertyMetadata(null));



        public static readonly DependencyProperty SelectedXmlSpectrumTypeProperty = DependencyProperty.Register("SelectedXmlSpectrumType", typeof(int), typeof(OpenFileUserControl), new PropertyMetadata(SpectrumType.None));

        public static readonly DependencyProperty SpectraContainerProperty = DependencyProperty.Register("SpectraContainer", typeof(SpectraContainer), typeof(OpenFileUserControl), new PropertyMetadata(null, OnSpectraContainerChanged));
@@ -62,9 +62,9 @@ namespace INAF.Apps.Uwp.SLabDataManager.Views.UserControls 
        }



        #region properties

        public RecentFilesContainer RecentFilesContainer

        public RecentStorageItemsContainer RecentFilesContainer

        {

            get { return (RecentFilesContainer)GetValue(RecentFilesContainerProperty); }

            get { return (RecentStorageItemsContainer)GetValue(RecentFilesContainerProperty); }

            set { SetValue(RecentFilesContainerProperty, value); }

        }