met about, beep on/off, testbuttons on/off
This commit is contained in:
Luc
parent
9e15a8b3ce
commit
7aead07211
17 changed files with 303 additions and 287 deletions
|
|
@ -21,6 +21,12 @@ EpdBaseClr::Epd2::!Epd2()
|
|||
{
|
||||
}
|
||||
|
||||
int EpdBaseClr::Epd2::SetFeedbackSound(byte sound)
|
||||
{
|
||||
epd->EndSessionControl = sound;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int EpdBaseClr::Epd2::Connect(bool reinit)
|
||||
{
|
||||
ConnectError = 0;
|
||||
|
|
|
|||
|
|
@ -132,6 +132,8 @@ namespace EpdBaseClr {
|
|||
Epd2(int port);
|
||||
~Epd2();
|
||||
!Epd2();
|
||||
|
||||
int SetFeedbackSound(byte sound);
|
||||
|
||||
int Connect(bool reinit);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
|
||||
<?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.2.0.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.3.0.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
|
||||
<Media Id="1" EmbedCab="yes" Cabinet="cab" />
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
|
|
|
|||
68
eDosStation/About.xaml
Normal file
68
eDosStation/About.xaml
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
<Window x:Class="eDosStation.About"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
|
||||
xmlns:local="clr-namespace:eDosStation"
|
||||
mc:Ignorable="d"
|
||||
Title="About" Height="600" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" WindowState="Normal" >
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="auto" />
|
||||
<RowDefinition Height="*" />
|
||||
<RowDefinition Height="auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<FlowDocumentScrollViewer Grid.Row="1" ScrollViewer.CanContentScroll="False" ScrollViewer.VerticalScrollBarVisibility="Auto">
|
||||
<FlowDocument>
|
||||
|
||||
<Paragraph FontSize="30" >
|
||||
<Image Source="/Images/EPD-MK3.png" VerticalAlignment="Center" Stretch="None" />
|
||||
<Run BaselineAlignment="Center">eDos EPD station</Run>
|
||||
</Paragraph>
|
||||
<Paragraph>2021 Version
|
||||
<TextBlock Name="aVersion" Text="1.1" />
|
||||
</Paragraph>
|
||||
<Table BorderBrush="#FF1E8CED" BorderThickness="1" FontFamily="Comic Sans MS" >
|
||||
<Table.Columns>
|
||||
<TableColumn Width="200" ></TableColumn>
|
||||
<TableColumn Width="auto" ></TableColumn>
|
||||
</Table.Columns>
|
||||
<TableRowGroup >
|
||||
<TableRow>
|
||||
<TableCell ><Paragraph TextAlignment="Right" Margin="0,5,20,0">Station ID</Paragraph></TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" Name="stationID" Text="99" />
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
<TableRow>
|
||||
<TableCell >
|
||||
<Paragraph TextAlignment="Right" Margin="0,0,20,0" >Remote sql alias</Paragraph>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<Paragraph>
|
||||
<Run BaselineAlignment="Bottom" x:Name="remoteSql" Text="sql"/>
|
||||
</Paragraph>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</TableRowGroup>
|
||||
</Table>
|
||||
|
||||
<Paragraph Margin="50,10,0,10" FontStyle="Italic">
|
||||
<Run>Architecture and testing by Isabelle Majkowski, Luc Praet</Run>
|
||||
<LineBreak />
|
||||
|
||||
<Run>Developed by Luc Vandenbroucke.</Run>
|
||||
<LineBreak />
|
||||
<Run>Technical info by Thermo</Run>
|
||||
<LineBreak/>
|
||||
<Run>and lots of research ...</Run>
|
||||
</Paragraph>
|
||||
</FlowDocument>
|
||||
</FlowDocumentScrollViewer>
|
||||
|
||||
<telerik:RadButton Grid.Row="2" Content="OK" Width="200" HorizontalAlignment="Center" Height="50" Click="RadButton_Click" />
|
||||
</Grid>
|
||||
</Window>
|
||||
42
eDosStation/About.xaml.cs
Normal file
42
eDosStation/About.xaml.cs
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
using Microsoft.Win32;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Data;
|
||||
using System.Windows.Documents;
|
||||
using System.Windows.Input;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Shapes;
|
||||
|
||||
namespace eDosStation
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaction logic for About.xaml
|
||||
/// </summary>
|
||||
public partial class About : Window
|
||||
{
|
||||
public About(Station station)
|
||||
{
|
||||
InitializeComponent();
|
||||
aVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
|
||||
stationID.Text = station.ID_Station.ToString();
|
||||
ReadAlias();
|
||||
}
|
||||
|
||||
private void RadButton_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
this.Close();
|
||||
}
|
||||
|
||||
private void ReadAlias()
|
||||
{
|
||||
RegistryKey key = Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node\\Microsoft\\MSSQLServer\\Client\\ConnectTo");
|
||||
remoteSql.Text= key.GetValue("eDos").ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,49 +1,59 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<configSections>
|
||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="eDosStation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<connectionStrings>
|
||||
<add name="eDosStation.Properties.Settings.localConnectionString"
|
||||
connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation"
|
||||
providerName="System.Data.SqlClient" />
|
||||
<add name="eDosConnectionString" connectionString="Data Source=eDos;Initial Catalog=eDos;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation"
|
||||
providerName="System.Data.SqlClient" />
|
||||
</connectionStrings>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
|
||||
</startup>
|
||||
<userSettings>
|
||||
<eDosStation.Properties.Settings>
|
||||
<setting name="ComPort" serializeAs="String">
|
||||
<value>3</value>
|
||||
</setting>
|
||||
<setting name="Inst_CODE1" serializeAs="String">
|
||||
<value>1</value>
|
||||
</setting>
|
||||
<setting name="Inst_CODE2" serializeAs="String">
|
||||
<value>11</value>
|
||||
</setting>
|
||||
<setting name="Inst_Name1" serializeAs="String">
|
||||
<value>BR1</value>
|
||||
</setting>
|
||||
<setting name="Inst_Name2" serializeAs="String">
|
||||
<value>Venus</value>
|
||||
</setting>
|
||||
<setting name="TestCSN" serializeAs="String">
|
||||
<value>0428790A0B4E80</value>
|
||||
</setting>
|
||||
<setting name="useTestButtons" serializeAs="String">
|
||||
<value>True</value>
|
||||
</setting>
|
||||
</eDosStation.Properties.Settings>
|
||||
</userSettings>
|
||||
<appSettings >
|
||||
<configSections>
|
||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<section name="eDosStation.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
||||
</sectionGroup>
|
||||
</configSections>
|
||||
<connectionStrings>
|
||||
<add name="eDosStation.Properties.Settings.localConnectionString" connectionString="Data Source=eDosLocal;Initial Catalog=eDosLocal;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation" providerName="System.Data.SqlClient" />
|
||||
<add name="eDosConnectionString" connectionString="Data Source=eDos;Initial Catalog=eDos;User ID=eDosStation;Password=Infopla+8;TrustServerCertificate=True;Application Name=eDosStation" providerName="System.Data.SqlClient" />
|
||||
</connectionStrings>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
|
||||
</startup>
|
||||
<userSettings>
|
||||
<eDosStation.Properties.Settings>
|
||||
<setting name="ComPort" serializeAs="String">
|
||||
<value>3</value>
|
||||
</setting>
|
||||
<setting name="Inst_CODE1" serializeAs="String">
|
||||
<value>1</value>
|
||||
</setting>
|
||||
<setting name="Inst_CODE2" serializeAs="String">
|
||||
<value>11</value>
|
||||
</setting>
|
||||
<setting name="Inst_Name1" serializeAs="String">
|
||||
<value>BR1</value>
|
||||
</setting>
|
||||
<setting name="Inst_Name2" serializeAs="String">
|
||||
<value>Venus</value>
|
||||
</setting>
|
||||
<setting name="TestCSN" serializeAs="String">
|
||||
<value>0428790A0B4E80</value>
|
||||
</setting>
|
||||
<setting name="useTestButtons" serializeAs="String">
|
||||
<value>True</value>
|
||||
</setting>
|
||||
</eDosStation.Properties.Settings>
|
||||
</userSettings>
|
||||
<appSettings>
|
||||
<add key="Reader" value="HID Global OMNIKEY 5022 Smart Card Reader 0" />
|
||||
<add key="TestCSN" value=""/>
|
||||
<add key="TestCode" value=""/>
|
||||
<add key="sqlLogFolder" value="c:\logs"/>
|
||||
<add key="TestCSN" value="" />
|
||||
<add key="TestCode" value="" />
|
||||
<add key="sqlLogFolder" value="c:\logs" />
|
||||
<add key="ClientSettingsProvider.ServiceUri" value="" />
|
||||
</appSettings>
|
||||
</configuration>
|
||||
<system.web>
|
||||
<membership defaultProvider="ClientAuthenticationMembershipProvider">
|
||||
<providers>
|
||||
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
|
||||
</providers>
|
||||
</membership>
|
||||
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
|
||||
<providers>
|
||||
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
|
||||
</providers>
|
||||
</roleManager>
|
||||
</system.web>
|
||||
</configuration>
|
||||
|
|
@ -587,8 +587,7 @@ namespace eDosStation
|
|||
//string TestCSN = null; // thisStation.TestCSN;
|
||||
initialising = false;
|
||||
|
||||
if (Properties.Settings.Default.useTestButtons)
|
||||
AddTestButtons();
|
||||
if (thisStation.useTestButtons) AddTestButtons();
|
||||
|
||||
if (dfReader == null)
|
||||
{
|
||||
|
|
|
|||
BIN
eDosStation/Images/EPD-MK3.png
Normal file
BIN
eDosStation/Images/EPD-MK3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
BIN
eDosStation/Images/mk3.jpg
Normal file
BIN
eDosStation/Images/mk3.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
eDosStation/Images/mk3.xcf
Normal file
BIN
eDosStation/Images/mk3.xcf
Normal file
Binary file not shown.
|
|
@ -13,7 +13,10 @@
|
|||
<DockPanel>
|
||||
<Menu DockPanel.Dock="Top">
|
||||
<MenuItem Header="Settings" Click="MenuItem_Click" />
|
||||
<MenuItem Header="Enc" Name="mEnc" Click="MEnc_Click" />
|
||||
<MenuItem Header="Advanced Settings" >
|
||||
<MenuItem Header="Enc" Name="mEnc" Click="MEnc_Click" />
|
||||
</MenuItem>
|
||||
<MenuItem Header="About" Name="mAbout" Click="mAbout_Click" HorizontalAlignment="Right" />
|
||||
</Menu>
|
||||
<StatusBar DockPanel.Dock="Bottom" >
|
||||
<StatusBarItem Name="Status" Content="Offline" HorizontalContentAlignment="Center" HorizontalAlignment="Stretch"/>
|
||||
|
|
@ -31,8 +34,8 @@
|
|||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Grid.Column="0" Name ="tVersion" Text="HPH eDos v" TextAlignment="Left" />
|
||||
<TextBlock Grid.Column="2" Name="tbTime" Text="..." TextAlignment="Right" />
|
||||
<TextBlock Grid.Column="0" FontSize="30" Name ="tVersion" Text="HPH eDos v" TextAlignment="Left" />
|
||||
<TextBlock Grid.Column="2" FontSize="30" Name="tbTime" Text="..." TextAlignment="Right" />
|
||||
</Grid>
|
||||
<StackPanel DockPanel.Dock="Left" Width="100" />
|
||||
<StackPanel DockPanel.Dock="right" Width="100" />
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@ namespace eDosStation
|
|||
thisStation.ComPort = 0;
|
||||
#endif
|
||||
ep = new EpdBaseClr.Epd2(thisStation.ComPort);
|
||||
ep.SetFeedbackSound(thisStation.useBeep);
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
{
|
||||
|
|
@ -181,5 +182,11 @@ namespace eDosStation
|
|||
{
|
||||
bgTimer.Stop();
|
||||
}
|
||||
|
||||
private void mAbout_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
About x = new About(thisStation);
|
||||
x.ShowDialog();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,5 +51,5 @@ using System.Windows;
|
|||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.2.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.0.0")]
|
||||
[assembly: AssemblyVersion("1.3.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.3.0.0")]
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ namespace eDosStation
|
|||
public string TestCSN { get; set; }
|
||||
public string TestCode { get; set; }
|
||||
public string Reader { get; internal set; }
|
||||
public bool useTestButtons { get; set; }
|
||||
public byte useBeep { get; set; }
|
||||
|
||||
public bool Changed = false;
|
||||
public int Error = 0;
|
||||
|
|
@ -27,6 +29,7 @@ namespace eDosStation
|
|||
public StringBuilder insComments;
|
||||
public TextBlock tbComments;
|
||||
public DataInterface dataInterface;
|
||||
|
||||
|
||||
public Station(DataInterface mDataInterface, string Station)
|
||||
{
|
||||
|
|
@ -72,6 +75,20 @@ namespace eDosStation
|
|||
if (rs.IsDBNull(c)) TestCSN = string.Empty; else TestCSN = Values[c].ToString();
|
||||
c = rs.GetOrdinal("Reader");
|
||||
if (rs.IsDBNull(c)) Reader = string.Empty; else Reader = Values[c].ToString();
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
c = rs.GetOrdinal("useTestButtons");
|
||||
if (rs.IsDBNull(c)) useTestButtons = false; else useTestButtons = (bool)Values[c];
|
||||
}
|
||||
catch { useTestButtons = false; }
|
||||
try
|
||||
{
|
||||
c = rs.GetOrdinal("useBeep");
|
||||
if (rs.IsDBNull(c)) useBeep = 0b00010110; else useBeep = (byte)Values[c];
|
||||
}
|
||||
catch { useBeep = 0b00010110; }
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
81
eDosStation/app.manifest
Normal file
81
eDosStation/app.manifest
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">>
|
||||
<assemblyIdentity version="1.0.0.0" name="SCKCEN.HPH.eDosStation"/>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<!-- UAC Manifest Options
|
||||
If you want to change the Windows User Account Control level replace the
|
||||
requestedExecutionLevel node with one of the following.
|
||||
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
|
||||
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
|
||||
|
||||
Specifying requestedExecutionLevel element will disable file and registry virtualization.
|
||||
Remove this element if your application requires this virtualization for backwards
|
||||
compatibility.
|
||||
-->
|
||||
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<!-- A list of the Windows versions that this application has been tested on
|
||||
and is designed to work with. Uncomment the appropriate elements
|
||||
and Windows will automatically select the most compatible environment. -->
|
||||
|
||||
<!-- Windows Vista -->
|
||||
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
|
||||
|
||||
<!-- Windows 7 -->
|
||||
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
|
||||
|
||||
<!-- Windows 8 -->
|
||||
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
|
||||
|
||||
<!-- Windows 8.1 -->
|
||||
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
|
||||
|
||||
<!-- Windows 10 -->
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
|
||||
|
||||
</application>
|
||||
</compatibility>
|
||||
|
||||
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
|
||||
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
|
||||
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
|
||||
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
|
||||
<!--
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
-->
|
||||
|
||||
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
|
||||
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="Microsoft.Windows.Common-Controls"
|
||||
version="6.0.0.0"
|
||||
processorArchitecture="*"
|
||||
publicKeyToken="6595b64144ccf1df"
|
||||
language="*"
|
||||
/>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
|
||||
<asmv3:application>
|
||||
<asmv3:windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
|
||||
<ws2:longPathAware>true</ws2:longPathAware>
|
||||
</asmv3:windowsSettings>
|
||||
</asmv3:application>
|
||||
|
||||
</assembly>
|
||||
|
|
@ -71,9 +71,7 @@
|
|||
<SignManifests>true</SignManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup />
|
||||
<PropertyGroup>
|
||||
<ApplicationManifest>eDosStation.exe.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup />
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>mk2-epd-bg.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
|
|
@ -89,6 +87,10 @@
|
|||
<PropertyGroup>
|
||||
<ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup />
|
||||
<PropertyGroup>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||
|
|
@ -96,6 +98,7 @@
|
|||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Management" />
|
||||
<Reference Include="System.Web.Extensions" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
|
|
@ -131,6 +134,9 @@
|
|||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</ApplicationDefinition>
|
||||
<Compile Include="About.xaml.cs">
|
||||
<DependentUpon>About.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="AskPwd.xaml.cs">
|
||||
<DependentUpon>AskPwd.xaml</DependentUpon>
|
||||
</Compile>
|
||||
|
|
@ -167,6 +173,10 @@
|
|||
<Compile Include="Station.cs" />
|
||||
<Compile Include="TouchEnabledTextBox.cs" />
|
||||
<Compile Include="User.cs" />
|
||||
<Page Include="About.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="AskPwd.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
|
|
@ -231,6 +241,7 @@
|
|||
<DependentUpon>App.config</DependentUpon>
|
||||
<IsTransformFile>true</IsTransformFile>
|
||||
</None>
|
||||
<None Include="app.manifest" />
|
||||
<None Include="App.Release.config">
|
||||
<DependentUpon>App.config</DependentUpon>
|
||||
<IsTransformFile>true</IsTransformFile>
|
||||
|
|
@ -246,7 +257,6 @@
|
|||
<None Include="DataSet1.xss">
|
||||
<DependentUpon>DataSet1.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="eDosStation.exe.manifest" />
|
||||
<None Include="eDosStation.snk" />
|
||||
<None Include="LOG.INI">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
|
|
@ -268,6 +278,7 @@
|
|||
<Resource Include="Images\EPD-N2.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Images\EPD-MK3.png" />
|
||||
<Content Include="IR_READER_MS_DLL.dll">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
|
|||
|
|
@ -1,230 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
|
||||
<asmv1:assemblyIdentity name="eDosStation.exe" version="1.0.0.5" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
|
||||
<application />
|
||||
<entryPoint>
|
||||
<assemblyIdentity name="eDosStation" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
|
||||
<commandLine file="eDosStation.exe" parameters="" />
|
||||
</entryPoint>
|
||||
<trustInfo>
|
||||
<security>
|
||||
<applicationRequestMinimum>
|
||||
<defaultAssemblyRequest permissionSetReference="Custom" />
|
||||
<PermissionSet ID="Custom" SameSite="site" />
|
||||
</applicationRequestMinimum>
|
||||
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<!--
|
||||
UAC Manifest Options
|
||||
If you want to change the Windows User Account Control level replace the
|
||||
requestedExecutionLevel node with one of the following.
|
||||
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
|
||||
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
|
||||
<requestedExecutionLevel level="highestAvailable" uiAccess="false" />
|
||||
|
||||
If you want to utilize File and Registry Virtualization for backward
|
||||
compatibility then delete the requestedExecutionLevel node.
|
||||
-->
|
||||
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<dependency>
|
||||
<dependentOS>
|
||||
<osVersionInfo>
|
||||
<os majorVersion="5" minorVersion="1" buildNumber="2600" servicePackMajor="0" />
|
||||
</osVersionInfo>
|
||||
</dependentOS>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="preRequisite" allowDelayedBinding="true">
|
||||
<assemblyIdentity name="Microsoft.Windows.CommonLanguageRuntime" version="4.0.30319.0" />
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="eDosStation.exe" size="168872">
|
||||
<assemblyIdentity name="eDosStation" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>E/KnitRVP+ei1Vaej6cjgpa1UffqBnKO1GR2aegGDpE=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="EpdBaseClr.dll" size="114688">
|
||||
<assemblyIdentity name="EpdBaseClr" version="1.0.6992.14736" language="neutral" processorArchitecture="x86" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>B+dDaIFlJR3Kh3p2ZQqFT/O6anyZ4lBODeH0tLZ86yk=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="OkReadBadge.dll" size="153088">
|
||||
<assemblyIdentity name="OkReadBadge" version="1.0.6992.14736" language="neutral" processorArchitecture="x86" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>2YySM+py+MGdwxX41WzJhVU94695DaB25+HuYoOWGuM=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Telerik.Windows.Controls.dll" size="6312448">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="neutral" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>61gldXt7lQcqzpoKJJ3FYFEVyEVZuSBpuvSt8+VULVE=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Telerik.Windows.Controls.Data.dll" size="1476608">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.Data" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="neutral" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>vpxYl0EJN+YP9kswpZw+w1o6CeI2zdgDhFce+EOp464=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Telerik.Windows.Controls.GridView.dll" size="3886592">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.GridView" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="neutral" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>ATonc010MtM11S0pCS5rTLHmU/6vUCjPhUXeeDnHQUs=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Telerik.Windows.Controls.Input.dll" size="3097600">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.Input" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="neutral" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>IIp9LmNDdkHUuUYin9QpGwUS2ni+q+TAFksAcTi4RT4=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="de\Telerik.Windows.Controls.resources.dll" size="396288">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.resources" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="de" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>u1S/AULtO4oO34Bo3xv3ZCn+PH4w6KVEznss6mTYk8Y=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="es\Telerik.Windows.Controls.resources.dll" size="395264">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.resources" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="es" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>Buft+iq3jMIcfpS4VvBK9BFbYTnLjfk41avcprqvguY=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="fr\Telerik.Windows.Controls.resources.dll" size="395264">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.resources" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="fr" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>7PrZk3sb54UQ+16RPCpjdnTDtNM91HO8tEZsXg4V3as=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="it\Telerik.Windows.Controls.resources.dll" size="391168">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.resources" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="it" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>+sOWwhguGw0q5U/g1J81rwh92LbN7TTL06lu+jH7mTE=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="nl\Telerik.Windows.Controls.resources.dll" size="388096">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.resources" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="nl" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>628J8Le92HH34eAO4ZHN6qwpo7JNeas0hvJUYFPeRoc=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="tr\Telerik.Windows.Controls.resources.dll" size="391168">
|
||||
<assemblyIdentity name="Telerik.Windows.Controls.resources" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="tr" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>1hKhobNYAooFlQciVJEDihh7UZl8hv69oBdDuiusKYI=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="Telerik.Windows.Data.dll" size="486912">
|
||||
<assemblyIdentity name="Telerik.Windows.Data" version="2019.1.116.45" publicKeyToken="5803CFA389C90CE7" language="neutral" processorArchitecture="msil" />
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>t0YURM1GhZsJiywm4JrwBucY2SH5KSalyHJ9qJjB4mI=</dsig:DigestValue>
|
||||
</hash>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<file name="eDosStation.exe.config" size="1809">
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>ecXdauTc0cvrZAfCWBp5vzOJP4rw4S6/gvqE4uwVarM=</dsig:DigestValue>
|
||||
</hash>
|
||||
</file>
|
||||
<file name="IR_READER_MS_DLL.dll" size="158720">
|
||||
<hash>
|
||||
<dsig:Transforms>
|
||||
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
|
||||
</dsig:Transforms>
|
||||
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
|
||||
<dsig:DigestValue>Dmc2XekRBEwqdOzPDxZ4jAKTn5iN7re86aA5JJlDgis=</dsig:DigestValue>
|
||||
</hash>
|
||||
</file>
|
||||
</asmv1:assembly>
|
||||
Loading…
Add table
Reference in a new issue