Skip to content

Commit

Permalink
Version 1.5.8605
Browse files Browse the repository at this point in the history
Version 1.5.8605
-----------------------------------------------------------------
Frontend related changes
- Feature: "Help" -> "Changelog" will show up this info.
- Improvement: Auto scroll feature. Scrolling down when a tasklist executes now also
  keep the most left cell in focus.

Backend related changes
- Feature: Added internal variable
  + CUSTOMPROJECTFILE="C:\Path\where\project-file\is\placed.rfprj" would load the
	specified project file.
	NOTE: When a projectfile gets loaded, its fullpath is memorized.
	This enables the AUTORUN=1 feature to start all tasks once. If
	the CUSTOMPROJECTFILE is used instead, the last used project is ignored
  • Loading branch information
c3rebro committed Jul 24, 2023
1 parent b2d3beb commit 81bead5
Show file tree
Hide file tree
Showing 8 changed files with 185 additions and 136 deletions.
2 changes: 1 addition & 1 deletion RFiDGear/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.*")]
[assembly: AssemblyVersion("1.5.*")]
[assembly: Guid("a34bc413-e349-4fd1-8b90-2eb95a333436")]
[assembly: NeutralResourcesLanguage("")]
2 changes: 1 addition & 1 deletion RFiDGear/RFiDGear.csproj.user
Original file line number Diff line number Diff line change
@@ -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-%3f%3f.pdf" AUTORUN=0 %24JobNumber=1234 %24CardType=</StartArguments>
<StartArguments>REPORTTARGETPATH="C:\temp\test file-%3f%3f.pdf" AUTORUN=0 %24JobNumber=1234 CUSTOMPROJECTFILE="D:\CardCheck_Data\KPruefung_Vorlagen\00_RFID_Gear_Vorlage\CardCheckAssistant.rfPrj"</StartArguments>
<StartWorkingDirectory>D:\Seafile\Dokumente Privat\Steven\Projekte\Software\Windows\RFIDGear\RFiDGear\bin\Debug\</StartWorkingDirectory>
</PropertyGroup>
<PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions RFiDGear/Resources/Manifest.de.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1508,4 +1508,7 @@ https://github.com/c3rebro/rfidgear</value>
<data name="ENUM.TaskType_GenericChipTask.ChipIsMultiChip" xml:space="preserve">
<value>Prüfung auf Multitechnologiekarte</value>
</data>
<data name="menuItemShowChangeLogHeader" xml:space="preserve">
<value>Changelog</value>
</data>
</root>
3 changes: 3 additions & 0 deletions RFiDGear/Resources/Manifest.en.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1486,4 +1486,7 @@ https://github.com/c3rebro/rfidgear</value>
<data name="ENUM.TaskType_GenericChipTask.ChipIsMultiChip" xml:space="preserve">
<value>Check Tag Is MultiTag</value>
</data>
<data name="menuItemShowChangeLogHeader" xml:space="preserve">
<value>Changelog</value>
</data>
</root>
2 changes: 1 addition & 1 deletion RFiDGear/View/AboutView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Hyperlink NavigateUri="https://github.com/c3rebro/RFiDGear/releases" RequestNavigate="Hyperlink_RequestNavigate">
Changelog
Show on GitHub
</Hyperlink>
</TextBlock>

Expand Down
1 change: 1 addition & 0 deletions RFiDGear/View/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,7 @@
Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemHelpHeader'}">
<MenuItem Command="{Binding ShowHelpCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemHelpHeader'}" />
<MenuItem Command="{Binding CheckUpdateCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemCheckUpdatesHeader'}" />
<MenuItem Command="{Binding ShowChangeLogCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemShowChangeLogHeader'}" />
<MenuItem Command="{Binding NewAboutDialogCommand}" Header="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='menuItemAboutHeader'}" />
</MenuItem>
<!-- Help -->
Expand Down
6 changes: 4 additions & 2 deletions RFiDGear/View/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Windows.Input;
using System.Windows.Media;
using System;
using RFiDGear.Model;

namespace RFiDGear
{
Expand Down Expand Up @@ -119,7 +120,8 @@ static void OnSelectingItemChanged(DependencyObject sender, DependencyPropertyCh

if (grid.SelectedItem != null)
{
grid.ScrollIntoView(grid.SelectedItem, null);
grid.ScrollIntoView(grid.SelectedItem, grid.Columns[0]);

}
});

Expand All @@ -129,7 +131,7 @@ static void OnSelectingItemChanged(DependencyObject sender, DependencyPropertyCh
grid.UpdateLayout();
if (grid.SelectedItem != null)
{
grid.ScrollIntoView(grid.SelectedItem, null);
grid.ScrollIntoView(grid.SelectedItem, grid.Columns[0]);
}
}));
}
Expand Down
Loading

0 comments on commit 81bead5

Please sign in to comment.