Merge pull request #65 from isogeo/dev

V1.0.1
isogeo · Feb 8, 2021 · 94215de · 94215de
2 parents 3aff6f5 + f1819f3
commit 94215de
Show file tree

Hide file tree

Showing 22 changed files with 581 additions and 261 deletions.
diff --git a/AddIn/Config.daml b/AddIn/Config.daml
@@ -1,11 +1,11 @@
 <ArcGIS defaultAssembly="Isogeo.AddIn.dll" defaultNamespace="Isogeo.AddIn" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
-  <AddInInfo id="{d3cd9cd7-2008-4a27-be55-da1aeb26239f}" version="1.0.0" desktopVersion="2.5">
+  <AddInInfo id="{d3cd9cd7-2008-4a27-be55-da1aeb26239f}" version="1.0.1" desktopVersion="2.5">
     <Name>Isogeo Add-In</Name>
     <Description>ArcGis Pro Isogeo Add-In</Description>
     <Image>Icon\icon_isogeo.png</Image>
-    <Author>Vianney DOLEANS</Author>
+    <Author>Isogeo</Author>
     <Company>Isogeo</Company>
-    <Date>23/11/2020 09:00:00, 2020</Date>
+    <Date>08/02/2020 09:00:00, 2021</Date>
     <Subject>Framework</Subject>
     <!-- Note subject can be one or more of these topics:
                     Content, Framework, Editing, Geodatabase, Geometry, Geoprocessing, Layouts, Map Authoring, Map Exploration -->

diff --git a/AddIn/Views/Metadata/LicenseItem.xaml.cs b/AddIn/Views/Metadata/LicenseItem.xaml.cs
@@ -17,10 +17,10 @@ public void Init(Condition conditionInput)
             LblContent.Text = "";
 
             condition = conditionInput;
-            if (conditionInput.licence != null)
+            if (conditionInput.license != null)
             {
-                LblLicense.Text = conditionInput.licence.name;
-                LblContent.Text = conditionInput.licence.content;
+                LblLicense.Text = conditionInput.license.name;
+                LblContent.Text = conditionInput.license.link;
             }
             /*else
             {

diff --git a/AddIn/Views/Metadata/LimitationItem.xaml b/AddIn/Views/Metadata/LimitationItem.xaml
@@ -14,6 +14,8 @@
     </UserControl.Resources>
     <StackPanel>
         <TextBox Style="{StaticResource HideBoxTxt}" x:Name="LblLimitation" Text="{Binding Path = limitation, Mode = OneWay}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+        <TextBox Style="{StaticResource HideBoxTxt}" x:Name="LblDirectiveDescription" Text="{Binding Path = description, Mode = OneWay}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+        <TextBox Style="{StaticResource HideBoxTxt}" x:Name="LblDirectiveName" Text="{Binding Path = description, Mode = OneWay}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
         <TextBox Style="{StaticResource HideBoxTxt}" x:Name="LblDescription" Text="{Binding Path = description, Mode = OneWay}" HorizontalAlignment="Left" VerticalAlignment="Top"/>
     </StackPanel>
 </UserControl>
diff --git a/AddIn/Views/Metadata/LimitationItem.xaml.cs b/AddIn/Views/Metadata/LimitationItem.xaml.cs
@@ -11,10 +11,13 @@ public LimitationItem()
         }
 
         public void Init(Limitation limitation)
-        {
-            LblLimitation.Text = limitation.type;
-            LblDescription.Text = limitation.description;
-            if (limitation.type == "legal")
+        { 
+            LblLimitation.Text = "Type : " + limitation.type;
+            LblDescription.Text = "Description : " + limitation.description;
+            LblDirectiveName.Text = (limitation.directive != null && limitation.directive.name != null) ? "Directive : " + limitation.directive.name : Isogeo.Language.Resources.NotReported;
+            LblDirectiveDescription.Text = (limitation.directive != null && limitation.directive.description != null) ? "Restriction : " +limitation.directive.description : Isogeo.Language.Resources.NotReported;
+
+
             {
                 LblDescription.Text += "\n" + limitation.restriction;
             }

diff --git a/AddIn/Views/Metadata/MetadataContacts.xaml b/AddIn/Views/Metadata/MetadataContacts.xaml
@@ -14,10 +14,14 @@
             <DataTemplate x:Key="ContactItem">
                 <StackPanel>
                     <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = Name, Mode = OneWay}"/>
-                    <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = Email, Mode = OneWay}"/> <!--MouseDoubleClick="LblEmail_OnMouseDoubleClick"/>-->
+                    <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = Email, Mode = OneWay}"/>
+                    <!--MouseDoubleClick="LblEmail_OnMouseDoubleClick"/>-->
                     <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = Phone, Mode = OneWay}"/>
                     <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = AddressLine1, Mode = OneWay}"/>
+                    <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = AddressLine2, Mode = OneWay}"/>
+                    <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = AddressLine3, Mode = OneWay}"/>
                     <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = City, Mode = OneWay}"/>
+                    <TextBox Style="{StaticResource HideBoxTxt}" Text="{Binding Path = Country, Mode = OneWay}"/>
                 </StackPanel>
             </DataTemplate>
         </ResourceDictionary>
@@ -49,4 +53,4 @@
             </ListBox>
         </GroupBox>
     </Grid>
-</UserControl>
+</UserControl>
diff --git a/AddIn/Views/Metadata/TechnicalInformationItem.xaml b/AddIn/Views/Metadata/TechnicalInformationItem.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:language="clr-namespace:Isogeo.Language;assembly=Isogeo.Language"
              mc:Ignorable="d" 
-             d:DesignHeight="100" d:DesignWidth="500">
+             d:DesignHeight="120" d:DesignWidth="500">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -30,13 +30,16 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <Label x:Name="LblFormat" Grid.Row="0" Grid.Column="0" Content="{x:Static language:Resources.Metadata_Geography_format}" />
-            <Label x:Name="LblFeatCount" Grid.Row="1" Grid.Column="0" Content="{x:Static language:Resources.Metadata_Geography_nbobjects}" />
-            <Label x:Name="LblGeometryType" Grid.Row="2" Grid.Column="0"  Content="{x:Static language:Resources.Metadata_Geography_geometrytype}" />
-            <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" x:Name="LblFormatValue" Grid.Row="0" Grid.Column="1" Text="{Binding Path = Format, Mode = OneWay}" />
-            <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" x:Name="LblFeatCountValue" Grid.Row="1" Grid.Column="1" Text="{Binding Path = FeatCount, Mode = OneWay}" />
-            <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" x:Name="LblGeometryTypeValue" Grid.Row="2" Grid.Column="1" Text="{Binding Path = GeometryType, Mode = OneWay}" />
+            <Label x:Name="LblName" Grid.Row="0" Grid.Column="0" Content="{x:Static language:Resources.Metadata_Geography_layerName}" />
+            <Label x:Name="LblFormat" Grid.Row="1" Grid.Column="0" Content="{x:Static language:Resources.Metadata_Geography_format}" />
+            <Label x:Name="LblFeatCount" Grid.Row="2" Grid.Column="0" Content="{x:Static language:Resources.Metadata_Geography_nbobjects}" />
+            <Label x:Name="LblGeometryType" Grid.Row="3" Grid.Column="0"  Content="{x:Static language:Resources.Metadata_Geography_geometrytype}" />
+            <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" x:Name="LblNameValue" Grid.Row="0" Grid.Column="1" Text="{Binding Path = Name, Mode = OneWay}" />
+            <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" x:Name="LblFormatValue" Grid.Row="1" Grid.Column="1" Text="{Binding Path = Format, Mode = OneWay}" />
+            <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" x:Name="LblFeatCountValue" Grid.Row="2" Grid.Column="1" Text="{Binding Path = FeatCount, Mode = OneWay}" />
+            <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" x:Name="LblGeometryTypeValue" Grid.Row="3" Grid.Column="1" Text="{Binding Path = GeometryType, Mode = OneWay}" />
         </Grid>
         <Grid  Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center" Margin="10, 10, 10, 10">
             <Grid.ColumnDefinitions>

diff --git a/AddIn/Views/Settings/ResourcesSettings.xaml b/AddIn/Views/Settings/ResourcesSettings.xaml
@@ -11,29 +11,43 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <extensions:DesignOnlyResourceDictionary Source="pack://application:,,,/ArcGIS.Desktop.Framework;component\Themes\Default.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/Isogeo.Resources;component/Styles/TextBox.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
     <GroupBox x:Name="GrpResource" Header="{x:Static language:Resources.Resources_}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="2*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <Label x:Name="LblHelp" Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Open_help}" Grid.Row="0" Grid.Column="0" />
-            <Label x:Name="LblCredits" Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Open_plugin_credits}" Grid.Row="1" Grid.Column="0" />
-            <Label x:Name="LblContactSupport"  Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Contact_support}" Grid.Row="2" Grid.Column="0" />
-            <Label Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Open_log}" Grid.Row="3" Grid.Column="0" />
-            <Button MinWidth="20" x:Name="BtnHelp" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="?" Margin="0, 10, 10, 10" Grid.Row="0" Grid.Column="1" Click="BtnHelp_Click" />
-            <Button MinWidth="20" x:Name="BtnCredits" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="i" Margin="0, 10, 10, 10" Grid.Row="1" Grid.Column="1" Click="BtnCredits_Click" />
-            <Button MinWidth="20" x:Name="BtnContactSupport" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="{x:Static language:Resources.Help}" Margin="0, 10, 10, 10" Grid.Row="2" Grid.Column="1" Click="BtnContactSupport_Click" />
-            <Button MinWidth="20" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="{x:Static language:Resources.Log}" Margin="0, 10, 10, 10" Grid.Row="3" Grid.Column="1" Click="BtnLog_Click" />
-                </Grid>
-        </GroupBox>
+        <StackPanel>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                </Grid.RowDefinitions>
+                <Label x:Name="LblHelp" Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Open_help}" Grid.Row="0" Grid.Column="0" />
+                <Label x:Name="LblCredits" Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Open_plugin_credits}" Grid.Row="1" Grid.Column="0" />
+                <Label x:Name="LblContactSupport"  Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Contact_support}" Grid.Row="2" Grid.Column="0" />
+                <Label Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Open_log}" Grid.Row="3" Grid.Column="0" />
+                <Button MinWidth="20" x:Name="BtnHelp" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="?" Margin="0, 10, 10, 10" Grid.Row="0" Grid.Column="1" Click="BtnHelp_Click" />
+                <Button MinWidth="20" x:Name="BtnCredits" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="i" Margin="0, 10, 10, 10" Grid.Row="1" Grid.Column="1" Click="BtnCredits_Click" />
+                <Button MinWidth="20" x:Name="BtnContactSupport" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="{x:Static language:Resources.Help}" Margin="0, 10, 10, 10" Grid.Row="2" Grid.Column="1" Click="BtnContactSupport_Click" />
+                <Button MinWidth="20" Style="{DynamicResource Esri_Button}" HorizontalAlignment="Right" Width="60" Content="{x:Static language:Resources.Log}" Margin="0, 10, 10, 10" Grid.Row="3" Grid.Column="1" Click="BtnLog_Click" />
+            </Grid>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="2*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                </Grid.RowDefinitions>
+                <Label Margin="0, 10, 0, 10" Content="{x:Static language:Resources.Log_path}" Grid.Row="1" Grid.Column="0" />
+                <TextBox VerticalAlignment="Center" Style="{StaticResource HideBoxTxt}" MinWidth="120" x:Name="TbLogPath" Grid.Row="1" Grid.Column="1" />
+            </Grid>
+        </StackPanel>
+    </GroupBox>
 </UserControl>
diff --git a/AddIn/Views/Settings/ResourcesSettings.xaml.cs b/AddIn/Views/Settings/ResourcesSettings.xaml.cs
@@ -11,6 +11,7 @@ public partial class ResourcesSettings : UserControl
         public ResourcesSettings()
         {
             InitializeComponent();
+            TbLogPath.Text = Log.GetLogFilePath();
         }
 
         private void BtnHelp_Click(object sender, RoutedEventArgs e)