Fix: Update log error

c3rebro · Sep 27, 2022 · 92e63c2 · 92e63c2
1 parent 3b356b0
commit 92e63c2
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 110 deletions.
diff --git a/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs b/RFiDGear/3rdParty/RedCell/RedCell.Diagnostics.Update/Updater.cs
@@ -327,7 +327,8 @@ public void Update()
                 ProcessStartInfo info = new ProcessStartInfo()
                 {
                     FileName = "msiexec.exe",
-                    Arguments = string.Format("/i \"{0}\" /lv \"c:\\temp\\rfidgeardeploy.log\"", Path.Combine(appDataPath, WorkPath, "Setup.msi")),
+                    Verb="runas",
+                    Arguments = string.Format("/i \"{0}\" ", Path.Combine(appDataPath, WorkPath, "Setup.msi")),
                     UseShellExecute = false
                 };
 

diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/LibLogicalAccessProvider.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/LibLogicalAccessProvider.cs
@@ -221,7 +221,6 @@ public override ERROR ReadChipPublic()
         #endregion common
 
         #region mifare classic
-
         public override ERROR ReadMifareClassicSingleSector(int sectorNumber, string aKey, string bKey)
         {
             Sector = new MifareClassicSectorModel();

diff --git a/RFiDGear/Model/MifareClassic/MifareClassicChipModel.cs b/RFiDGear/Model/MifareClassic/MifareClassicChipModel.cs
@@ -23,5 +23,7 @@ public MifareClassicChipModel(string uid, CARD_TYPE cardType)
             CardType = cardType;
             UID = uid;
         }
+
+        public uint FreeMemory { get; set; }
     }
 }
diff --git a/RFiDGear/Properties/AssemblyInfo.cs b/RFiDGear/Properties/AssemblyInfo.cs
@@ -27,4 +27,4 @@
 // Build Numbers by using the '*' as shown below:
 [assembly: AssemblyVersion("1.1.*")]
 [assembly: Guid("a34bc413-e349-4fd1-8b90-2eb95a333436")]
-[assembly: NeutralResourcesLanguage("en")]
+[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</StartArguments>
+    <StartArguments>REPORTTARGETPATH="C:\temp\test file.pdf" AUTORUN=1 %24JobNumber=1234 %24CardType=MifareDesfire</StartArguments>
     <StartWorkingDirectory>D:\Seafile\Dokumente Privat\Steven\Projekte\Software\Windows\RFIDGear\RFiDGear\bin\Debug\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/RFiDGear/Resources/Manifest.de.resx b/RFiDGear/Resources/Manifest.de.resx
@@ -437,25 +437,25 @@ ein Kartenlesegerät auswählen</value>
     <value>_Aufgabenstatus zurücksetzen</value>
   </data>
   <data name="menuItemRunAllTasksAutomatically" xml:space="preserve">
-    <value>_Alle Aufgaben automatisch ausführen</value>
+    <value>_Alle Aufgaben automatisch wiederholen</value>
   </data>
   <data name="menuItemRunSelectedTaskAutomatically" xml:space="preserve">
-    <value>_Markierte Aufgabe automatisch ausführen</value>
+    <value>_Markierte Aufgabe automatisch wiederholen</value>
   </data>
   <data name="menuItemRunSelectedTaskOnce" xml:space="preserve">
-    <value>Markierte Aufgaben _einmalig ausführen</value>
+    <value>Markierte Aufgabe(n) _einmalig ausführen</value>
   </data>
   <data name="menuItemRunAllTasksOnce" xml:space="preserve">
     <value>Alle A_ufgaben einmalig ausführen</value>
   </data>
   <data name="menuItemOpenProject" xml:space="preserve">
     <value>Projektdatei _öffnen...</value>
   </data>
-  <data name="menuItemSaveTask" xml:space="preserve">
-    <value>_Projektdatei Speichern unter...</value>
+  <data name="menuItemSaveTaskAs" xml:space="preserve">
+    <value>_Projekt Speichern unter...</value>
   </data>
   <data name="menuItemSaveChip" xml:space="preserve">
-    <value>_RFiD Chipliste Speichern unter...</value>
+    <value>_Chipliste Speichern unter...</value>
   </data>
   <data name="menuItemReadChipPublic" xml:space="preserve">
     <value>_RFiD Chip einlesen</value>
@@ -555,7 +555,7 @@ Soll die Aktualisierung jetzt herunter geladen und installiert werden?</value>
   <data name="menuItemShortcutOpenProject" xml:space="preserve">
     <value>Strg + O</value>
   </data>
-  <data name="menuItemShortcutSaveTask" xml:space="preserve">
+  <data name="menuItemShortcutSaveTaskAs" xml:space="preserve">
     <value>Strg + S</value>
   </data>
   <data name="menuItemShortcutReadChipPublic" xml:space="preserve">
@@ -1334,7 +1334,7 @@ Needed by:
     <value>Aufgabe zurücksetzen</value>
   </data>
   <data name="contextMenuItemExecuteAllItems" xml:space="preserve">
-    <value>Alle Aufgaben ausführen</value>
+    <value>Alle Aufgaben zurücksetzen und ausführen</value>
   </data>
   <data name="contextMenuItemAddNewTask" xml:space="preserve">
     <value>Neue Aufgabe anlegen</value>
@@ -1472,4 +1472,16 @@ https://github.com/c3rebro/rfidgear</value>
   <data name="labelReaderSetupReaderConnectStatus" xml:space="preserve">
     <value>Verbunden:</value>
   </data>
+  <data name="menuItemResetTasksReportTargetPath" xml:space="preserve">
+    <value>_Berichtausgabepfade zurücksetzen</value>
+  </data>
+  <data name="menuItemSaveTask" xml:space="preserve">
+    <value>Projekt _Speichern</value>
+  </data>
+  <data name="messageBoxMessageSetProjectAsDefault" xml:space="preserve">
+    <value>Soll dieses Projekt als Voreinstellung gesetzt und beim Start automatisch geladen werden? (Einstellung "Projekt automatisch laden muss gesetzt sein")</value>
+  </data>
+  <data name="windowCaptionAskTaskDefault" xml:space="preserve">
+    <value>Als Voreinstellung speichern?</value>
+  </data>
 </root>
diff --git a/RFiDGear/Resources/Manifest.en.resx b/RFiDGear/Resources/Manifest.en.resx
@@ -439,7 +439,7 @@ slot of an available reader</value>
   <data name="menuItemOpenProject" xml:space="preserve">
     <value>_Open Project...</value>
   </data>
-  <data name="menuItemSaveTask" xml:space="preserve">
+  <data name="menuItemSaveTaskAs" xml:space="preserve">
     <value>_Save Tasks...</value>
   </data>
   <data name="menuItemSaveChip" xml:space="preserve">
@@ -540,7 +540,7 @@ Use a csv file to acuire default keys for authentication</value>
   <data name="menuItemShortcutOpenProject" xml:space="preserve">
     <value>Ctrl + O</value>
   </data>
-  <data name="menuItemShortcutSaveTask" xml:space="preserve">
+  <data name="menuItemShortcutSaveTaskAs" xml:space="preserve">
     <value>Ctrl + S</value>
   </data>
   <data name="menuItemShortcutReadChipPublic" xml:space="preserve">
@@ -1450,4 +1450,16 @@ https://github.com/c3rebro/rfidgear</value>
   <data name="labelReaderSetupReaderConnectStatus" xml:space="preserve">
     <value>Connected:</value>
   </data>
+  <data name="menuItemResetTasksReportTargetPath" xml:space="preserve">
+    <value>Rese_t Report Target Paths</value>
+  </data>
+  <data name="menuItemSaveTask" xml:space="preserve">
+    <value>Save Tasks</value>
+  </data>
+  <data name="messageBoxMessageSetProjectAsDefault" xml:space="preserve">
+    <value>Do you want to set this Project as default when "Load last used Project on Start" is set?</value>
+  </data>
+  <data name="windowCaptionAskTaskDefault" xml:space="preserve">
+    <value>Set as Default?</value>
+  </data>
 </root>
diff --git a/RFiDGear/View/MainWindow.xaml b/RFiDGear/View/MainWindow.xaml
@@ -37,7 +37,7 @@
             Modifiers="Control" />
         <KeyBinding
             Key="S"
-            Command="{Binding SaveTaskDialogCommand}"
+            Command="{Binding SaveTaskAsDialogCommand}"
             Modifiers="Control" />
         <KeyBinding
             Key="X"
@@ -431,8 +431,11 @@
                         InputGestureText="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemShortcutOpenProject'}" />
                     <MenuItem
                         Command="{Binding SaveTaskDialogCommand}"
-                        Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemSaveTask'}"
-                        InputGestureText="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemShortcutSaveTask'}" />
+                        Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemSaveTask'}"/>
+                    <MenuItem
+                        Command="{Binding SaveTaskAsDialogCommand}"
+                        Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemSaveTaskAs'}"
+                        InputGestureText="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemShortcutSaveTaskAs'}" />
                     <MenuItem Command="{Binding SaveChipDialogCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemSaveChip'}" />
                     <Separator />
                     <MenuItem Command="{Binding CloseApplication}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemExitHeader'}" />
@@ -458,6 +461,11 @@
                     </MenuItem>
                     <Separator />
                     <MenuItem Command="{Binding RemoveChipsFromTreeCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRemoveCardsHeader'}" />
+                    <MenuItem Command="{Binding RemoveAllTasksCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRemoveAllTasks'}" />
+                    <Separator />
+                    <MenuItem Command="{Binding ResetTaskStatusCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemSetTaskStatusToUndone'}" />
+                    <MenuItem Command="{Binding ResetReportTaskDirectoryCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemResetTasksReportTargetPath'}" />
+
                 </MenuItem>
                 <!--  Edit  -->
                 <MenuItem
@@ -478,20 +486,20 @@
                         Command="{Binding WriteToChipOnceCommand}"
                         Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRunAllTasksOnce'}"
                         InputGestureText="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemShortcutWriteToChipOnce'}" />
-                    <MenuItem Command="{Binding WriteSelectedTaskToChipOnceCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRunSelectedTaskOnce'}" />
-                    <Separator />
-                    <MenuItem
-                        Command="{Binding WriteSelectedTaskToChipAutoCommand}"
-                        Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRunSelectedTaskAutomatically'}"
-                        IsChecked="{Binding IsWriteSelectedToChipAutoChecked, Mode=OneWay}" />
                     <MenuItem
                         Command="{Binding WriteToAllChipAutoCommand}"
                         Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRunAllTasksAutomatically'}"
                         IsCheckable="True"
                         IsChecked="{Binding IsWriteToAllChipAutoChecked, Mode=OneWay}" />
                     <Separator />
-                    <MenuItem Command="{Binding ResetTaskStatusCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemSetTaskStatusToUndone'}" />
-                    <MenuItem Command="{Binding RemoveAllTasksCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRemoveAllTasks'}" />
+                    <MenuItem 
+                        Command="{Binding WriteSelectedTaskToChipOnceCommand}" 
+                        Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRunSelectedTaskOnce'}" />
+                    <MenuItem
+                        Command="{Binding WriteSelectedTaskToChipAutoCommand}"
+                        Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemRunSelectedTaskAutomatically'}"
+                        IsChecked="{Binding IsWriteSelectedToChipAutoChecked, Mode=OneWay}" />
+
                 </MenuItem>
                 <!--  Programming  -->
                 <MenuItem