luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

versies

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-05-04 15:04:47 +02:00
parent 0cac52369d
commit 9e15a8b3ce
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MK3/MK3Base.h
View file

@ -241,7 +241,7 @@ namespace MK3
WORD Issue();
~Epd2U();
static HANDLE Ev1 = INVALID_HANDLE_VALUE;
static HANDLE Ev1 ;
static Epd2U* current;
static void WINAPI discovery (CommsHandle hComms, DiscoveryId const discovered[], int32_t count);
};

10
SetupProject1/Product.wxs
View file

@ -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.0.4.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
<Product Id="*" Name="eDosStation" Language="1033" Version="1.2.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." />
@ -18,15 +18,7 @@
<ComponentGroupRef Id="SyncLog" />
<ComponentRef Id="eDosSyncShortcut" />
</Feature>
</Product>
<Fragment>
<CustomAction Id="CreateScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand="&quot;[SystemFolder]SCHTASKS.EXE&quot; /CREATE /TN &quot;EDos Sync&quot; /RU &quot;eDosStation&quot;/RP &quot;Infopla+8&quot; /XML &quot;[#edossync.xml]&quot;" />
<CustomAction Id="DeleteScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand="&quot;[SystemFolder]SCHTASKS.EXE&quot; /DELETE /TN &quot;EDos Sync&quot; /F" />

2
eDosStation/MainWindow.xaml
View file

@ -31,7 +31,7 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="HPH eDos" TextAlignment="Left" />
<TextBlock Grid.Column="0" Name ="tVersion" Text="HPH eDos v" TextAlignment="Left" />
<TextBlock Grid.Column="2" Name="tbTime" Text="..." TextAlignment="Right" />
</Grid>
<StackPanel DockPanel.Dock="Left" Width="100" />

4
eDosStation/MainWindow.xaml.cs
View file

@ -95,6 +95,8 @@ namespace eDosStation
{
bool ok = true;
string errMsg = string.Empty;
tVersion.Text = "HPH eDos "+ System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
bgTimer = new DispatcherTimer(DispatcherPriority.Background);
bgTimer.Interval = TimeSpan.FromSeconds(60);
bgTimer.Tick += BgTimer_Tick;
@ -150,11 +152,11 @@ namespace eDosStation
}
else
ibComment.Visibility = Visibility.Hidden;
setLocalStatus();
}
else
setErrorStatus(errMsg);
BgTimer_Tick(null, null);
bgTimer.Start();
}

4
eDosStation/Properties/AssemblyInfo.cs
View file

@ -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.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("1.2.0.0")]
[assembly: AssemblyFileVersion("1.2.0.0")]