Removed PCSC Support and LibLogicalAccess Dependency

Removed some License related Functions: No more PCSC Support and LibLogicalAccess (now owned by HID) Dependency Changed PDF Library to GemBox PDF and removed iTextPDF Dependency
c3rebro · Feb 14, 2023 · 5bb3f93 · 5bb3f93
1 parent 6dd27bf
commit 5bb3f93
Show file tree

Hide file tree

Showing 32 changed files with 230 additions and 158 deletions.
diff --git a/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs b/RFiDGear/DataAccessLayer/Remote/FromFile/ReportReaderWriter.cs
@@ -105,6 +105,8 @@ public void SetReportField(string _field, string _value)
                             ReportTemplatePath = System.IO.Path.Combine(appDataPath, reportTemplateTempFileName);
 
                             var form = pdfDoc.Form;
+                            pdfDoc.Info.Title = "RFiDGear Report";
+                            pdfDoc.Info.Author = "RFiDGear";
 
                             pdfDoc.Form.Fields[_field].Hidden = false;
                             pdfDoc.Form.Fields[_field].ReadOnly = false;

diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/ElatecNetProvider.cs
@@ -234,16 +234,16 @@ private ERROR readWriteAccessOnClassicSector(int sectorNumber, string aKey, stri
                 }
                 catch
                 {
-                    return ERROR.IOError; // IO ERROR
+                    return ERROR.IOError; // IO ElatecError
                 }
             }
 
             if(Sector.IsAuthenticated)
             {
-                return ERROR.NoError; //NO ERROR
+                return ERROR.NoError; //NO ElatecError
             }
 
-            return ERROR.AuthenticationError; // Auth ERROR
+            return ERROR.AuthenticationError; // Auth ElatecError
         }
 
         #endregion
@@ -262,7 +262,7 @@ public override ERROR ReadMifareUltralightSinglePage(int _pageNo)
         /// </summary>
         /// <param name="_appMasterKey"></param>
         /// <param name="_keyTypeAppMasterKey"></param>
-        /// <returns>ERROR Level</returns>
+        /// <returns>ElatecError Level</returns>
         public override ERROR GetMiFareDESFireChipAppIDs(string _appMasterKey, DESFireKeyType _keyTypeAppMasterKey)
         {
             if (DesfireChip == null)
@@ -306,7 +306,7 @@ public override ERROR AuthToMifareDesfireApplication(string _applicationMasterKe
                     _applicationMasterKey,
                     (byte)_keyNumber,
                     (byte)(int)Enum.Parse(typeof(Elatec.NET.DESFireKeyType), Enum.GetName(typeof(RFiDGear.DataAccessLayer.DESFireKeyType), _keyType)),
-                    1) == true ? ERROR.NoError : ERROR.NotAllowed;
+                    1) == true ? ERROR.NoError : ERROR.AuthenticationError;
             }
             else
             {

diff --git a/RFiDGear/Model/GenericTaskModel.cs b/RFiDGear/Model/GenericTaskModel.cs
@@ -9,7 +9,7 @@ namespace RFiDGear.Model
     public interface IGenericTaskModel
     {
         /// <summary>
-        /// Indicates a Task Result and is interpreted by one of the following ERROR states: true = NoError, null = Empty, false = Everything else
+        /// Indicates a Task Result and is interpreted by one of the following ElatecError states: true = NoError, null = Empty, false = Everything else
         /// </summary>
         bool? IsTaskCompletedSuccessfully { get; set; }
 

diff --git a/RFiDGear/Properties/AssemblyInfo.cs b/RFiDGear/Properties/AssemblyInfo.cs
@@ -25,6 +25,6 @@
 //
 // You can specify all the values or you can use the default the Revision and
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyVersion("1.2.*")]
 [assembly: Guid("a34bc413-e349-4fd1-8b90-2eb95a333436")]
 [assembly: NeutralResourcesLanguage("")]
diff --git a/RFiDGear/RFiDGear.csproj.user b/RFiDGear/RFiDGear.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>REPORTTARGETPATH="C:\temp\test file.pdf" AUTORUN=1 %24JobNumber=1234 %24CardType=</StartArguments>
+    <StartArguments>REPORTTARGETPATH="C:\temp\test file.pdf" AUTORUN=0 %24JobNumber=1234 %24CardType=</StartArguments>
     <StartWorkingDirectory>D:\Seafile\Dokumente Privat\Steven\Projekte\Software\Windows\RFIDGear\RFiDGear\bin\Debug\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/RFiDGear/View/AboutView.xaml b/RFiDGear/View/AboutView.xaml
@@ -65,6 +65,8 @@
             Grid.Row="3"
             Grid.Column="1"
             Width="90"
+            Height="26"
+            Padding="5,2"
             Margin="0,8,0,8"
             HorizontalAlignment="Center"
             VerticalAlignment="Stretch"

diff --git a/RFiDGear/View/SettingsView/SettingsTabPages/TabPageMiscReaderSettingsView.xaml b/RFiDGear/View/SettingsView/SettingsTabPages/TabPageMiscReaderSettingsView.xaml
@@ -59,7 +59,7 @@
             <ComboBox
                 Grid.Row="1"
                 Grid.Column="1"
-                Height="auto"
+                Height="26"
                 Margin="8,7,8,3"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Top"

diff --git a/RFiDGear/View/SettingsView/SetupView.xaml b/RFiDGear/View/SettingsView/SetupView.xaml
@@ -46,7 +46,8 @@
                 Grid.Row="0"
                 Grid.Column="1"
                 Width="140"
-                Height="auto"
+                Height="26"
+                Padding="5,2"
                 Margin="8,0,4,8"
                 VerticalAlignment="Bottom"
                 HorizontalAlignment="Right"
@@ -64,7 +65,8 @@
                 Grid.Row="0"
                 Grid.Column="2"
                 Width="140"
-                Height="auto"
+                Height="26"
+                Padding="5,2"
                 Margin="4,0,4,8"
                 VerticalAlignment="Bottom"
                 HorizontalAlignment="Center"
@@ -74,7 +76,8 @@
                 Grid.Row="0"
                 Grid.Column="3"
                 Width="160"
-                Height="auto"
+                Height="26"
+                Padding="5,2"
                 Margin="4,0,8,8"
                 VerticalAlignment="Bottom"
                 HorizontalAlignment="Left"

diff --git a/RFiDGear/View/TaskViews/CommonTask/CommonTaskView.xaml b/RFiDGear/View/TaskViews/CommonTask/CommonTaskView.xaml
@@ -109,6 +109,7 @@
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,7,8,0"
                         VerticalAlignment="Stretch"
                         VerticalContentAlignment="Center"
@@ -210,6 +211,7 @@
                             <ComboBox
                                 Grid.Column="1"
                                 Margin="8,7,8,3"
+                                Height="26"
                                 ScrollViewer.VerticalScrollBarVisibility="Visible"
                                 VerticalAlignment="Stretch"
                                 ItemsSource="{dal:Enumerate {x:Type dal:ERROR}}"
@@ -251,6 +253,8 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 Width="140"
+                Height="26"
+                Padding="5,2"
                 Margin="9,8,8,8"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Bottom"
@@ -261,6 +265,8 @@
                 Grid.Row="0"
                 Grid.Column="0"
                 Width="140"
+                Height="26"
+                Padding="5,2"
                 Margin="157,8,8,8"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Bottom"

diff --git a/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageLogicTaskView.xaml b/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageLogicTaskView.xaml
@@ -59,24 +59,25 @@
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="42" />
+                                <RowDefinition Height="Auto" />
                             </Grid.RowDefinitions>
                             <Label
                                 Grid.Row="0"
                                 Grid.Column="0"
                                 Height="26"
-                                Margin="8,6,10,0"
-                                VerticalAlignment="Top"
+                                Margin="8,0,8,8"
+                                VerticalAlignment="Center"
                                 HorizontalContentAlignment="Stretch"
                                 Content="{Binding LocalizationResourceSet, ConverterParameter=labelSelectLogicFunction, Converter={StaticResource Localization}}"
                                 DataContext="{Binding}"
                                 Foreground="Black" />
                             <ComboBox
                                 Grid.Row="0"
+                                Height="26"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
                                 HorizontalAlignment="Stretch"
-                                VerticalAlignment="Bottom"
+                                VerticalAlignment="Center"
                                 ItemsSource="{dal:Enumerate {x:Type dal:LOGIC_STATE}}"
                                 SelectedItem="{Binding SelectedLogicCondition, ConverterParameter={x:Type dal:LOGIC_STATE}, Converter={StaticResource Localization}, Mode=TwoWay}" />
                         </Grid>
@@ -113,6 +114,7 @@
                                 Grid.Row="0"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
+                                Height="26"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Bottom"
                                 IsEnabled="{Binding IsLogicFuncTaskCountFuncEnabled}"
@@ -133,6 +135,7 @@
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
+                                Height="26"
                                 HorizontalAlignment="Stretch"
                                 VerticalAlignment="Bottom"
                                 IsEnabled="{Binding IsLogicFuncTaskCountFuncEnabled}"
@@ -153,6 +156,7 @@
                                 Grid.Row="2"
                                 Grid.Column="1"
                                 Margin="8,0,8,8"
+                                Height="26"
                                 VerticalAlignment="Top"
                                 VerticalContentAlignment="Center"
                                 HorizontalContentAlignment="Left"
@@ -187,6 +191,8 @@
                         </Grid.RowDefinitions>
                         <Button
                             Grid.Column="1"
+                            Height="26"
+                            Padding="5,2"
                             VerticalAlignment="Center"
                             HorizontalAlignment="Center"
                             VerticalContentAlignment="Center"
@@ -196,6 +202,8 @@
                         <Button
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
+                            Height="26"
+                            Padding="5,2"
                             VerticalContentAlignment="Center"
                             HorizontalContentAlignment="Left"
                             Command="{Binding AddEditCheckpointCommand}"
@@ -276,7 +284,6 @@
                                     <DataTemplate>
                                         <ComboBox
                                             ItemsSource="{dal:Enumerate {x:Type dal:ERROR}}"
-
                                             SelectedItem="{Binding ErrorLevel, ConverterParameter={x:Type dal:ERROR}, Converter={StaticResource Localization}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                             ScrollViewer.VerticalScrollBarVisibility="Visible"
                                             FontFamily="Lucida Console">

diff --git a/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageReportSettingsView.xaml b/RFiDGear/View/TaskViews/CommonTask/CommonTasksTabPages/TabPageReportSettingsView.xaml
@@ -89,6 +89,8 @@
                             <Button
                                 Grid.Column="1"
                                 Margin="10,0,10,8"
+                                Height="26"
+                                Padding="5,2"
                                 VerticalAlignment="Stretch"
                                 HorizontalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
@@ -125,7 +127,8 @@
                         <Button
                             Grid.Row="1"
                             Grid.Column="1"
-                            Height="auto"
+                            Height="26"
+                            Padding="5,2"
                             Margin="10,0,8,10"
                             VerticalAlignment="Bottom"
                             HorizontalAlignment="Center"
@@ -134,6 +137,8 @@
                         <Button
                             Grid.Row="1"
                             Grid.Column="0"
+                            Height="26"
+                            Padding="5,2"
                             Margin="10,0,10,10"
                             VerticalAlignment="Bottom"
                             HorizontalAlignment="Center"

diff --git a/...kViews/RFIDTasks/GenericChipTask/GenericChipTaskTabPages/TabPageBasicChipCheckUpView.xaml b/...kViews/RFIDTasks/GenericChipTask/GenericChipTaskTabPages/TabPageBasicChipCheckUpView.xaml
@@ -28,18 +28,19 @@
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch">
                     <ComboBox
-                            xmlns:dlgs="clr-namespace:MvvmDialogs.Behaviors;assembly=MVVMDialogs"
-                            xmlns:local="clr-namespace:RFiDGear"
-                            xmlns:system="clr-namespace:System;assembly=mscorlib"
-                            xmlns:v="clr-namespace:RFiDGear.View"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Margin="8,0,8,8"
-                            HorizontalAlignment="Stretch"
-                            VerticalAlignment="Bottom"
+                        xmlns:dlgs="clr-namespace:MvvmDialogs.Behaviors;assembly=MVVMDialogs"
+                        xmlns:local="clr-namespace:RFiDGear"
+                        xmlns:system="clr-namespace:System;assembly=mscorlib"
+                        xmlns:v="clr-namespace:RFiDGear.View"
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Height="26"
+                        Margin="8,0,8,8"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Bottom"
                         ScrollViewer.VerticalScrollBarVisibility="Visible"
-                            ItemsSource="{dal:Enumerate {x:Type dal:CARD_TYPE}}"
-                            SelectedItem="{Binding SelectedChipType, Converter={StaticResource Localization}, ConverterParameter={x:Type dal:CARD_TYPE}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                        ItemsSource="{dal:Enumerate {x:Type dal:CARD_TYPE}}"
+                        SelectedItem="{Binding SelectedChipType, Converter={StaticResource Localization}, ConverterParameter={x:Type dal:CARD_TYPE}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
                     <Label
                             Grid.Row="0"
                             Grid.Column="0"

diff --git a/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/GenericChipTask/GenericChipTaskView.xaml
@@ -90,6 +90,7 @@
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,7,8,0"
                         VerticalAlignment="Top"
                         VerticalContentAlignment="Center"
@@ -190,6 +191,7 @@
                                 Content="{Binding LocalizationResourceSet, ConverterParameter=labelContentExecuteConditionTaskIndex, Converter={StaticResource Localization}}" />
                             <ComboBox
                                 Grid.Column="1"
+                                Height="26"
                                 Margin="8,7,8,3"
                                 ScrollViewer.VerticalScrollBarVisibility="Visible"
                                 VerticalAlignment="Stretch"
@@ -231,6 +233,8 @@
             <Button
                 Grid.Row="0"
                 Grid.Column="0"
+                Height="26"
+                Padding="5,2"
                 Width="140"
                 Margin="9,0,0,8"
                 HorizontalAlignment="Left"
@@ -240,6 +244,8 @@
                 IsDefault="True" />
             <Button
                 Grid.Row="0"
+                Height="26"
+                Padding="5,2"
                 Grid.Column="0"
                 Width="140"
                 Margin="157,0,0,8"

diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicSetupView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicSetupView.xaml
@@ -79,6 +79,7 @@
                         <ComboBox
                             Grid.Row="0"
                             Grid.Column="0"
+                            Height="26"
                             Margin="8,8,8,8"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
@@ -128,6 +129,7 @@
                     <ComboBox
                         Grid.Row="0"
                         Grid.Column="1"
+                        Height="26"
                         Margin="8,7,8,0"
                         VerticalAlignment="Top"
                         VerticalContentAlignment="Center"
@@ -229,6 +231,7 @@
                             <ComboBox
                                 Grid.Column="1"
                                 Margin="8,7,8,3"
+                                Height="26"
                                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                                 VerticalAlignment="Stretch"
                                 ItemsSource="{dal:Enumerate {x:Type dal:ERROR}}"
@@ -268,6 +271,8 @@
                 VerticalScrollBarVisibility="Visible" />
             <Button
                 Grid.Row="0"
+                Height="26"
+                Padding="5,2"
                 Grid.Column="0"
                 Width="140"
                 Margin="9,0,0,8"
@@ -278,6 +283,8 @@
                 IsDefault="True" />
             <Button
                 Grid.Row="0"
+                Height="26"
+                Padding="5,2"
                 Grid.Column="0"
                 Width="140"
                 Margin="157,0,0,8"