This commit is contained in:
parent
c3252978de
commit
5f15b039e9
@ -45,6 +45,7 @@ namespace ENI2.Controls
|
|||||||
okButton.Click += (s, e) => { if (this.IsModal()) DialogResult = true; OKClicked?.Invoke(); this.Close(); };
|
okButton.Click += (s, e) => { if (this.IsModal()) DialogResult = true; OKClicked?.Invoke(); this.Close(); };
|
||||||
cancelButton.Click += (s, e) => { if (this.IsModal()) DialogResult = false; CancelClicked?.Invoke(); this.Close(); };
|
cancelButton.Click += (s, e) => { if (this.IsModal()) DialogResult = false; CancelClicked?.Invoke(); this.Close(); };
|
||||||
addButton.Click += (s, e) => AddClicked?.Invoke();
|
addButton.Click += (s, e) => AddClicked?.Invoke();
|
||||||
|
this.Closing += Window_Closing;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -66,7 +66,7 @@
|
|||||||
<StartupObject>ENI2.App</StartupObject>
|
<StartupObject>ENI2.App</StartupObject>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SignAssembly>true</SignAssembly>
|
<SignAssembly>false</SignAssembly>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>bsmdKey.snk</AssemblyOriginatorKeyFile>
|
||||||
@ -87,7 +87,7 @@
|
|||||||
<ManifestCertificateThumbprint>DBA67DB331E10F18BBF1E67B125EC87AB5389EA4</ManifestCertificateThumbprint>
|
<ManifestCertificateThumbprint>DBA67DB331E10F18BBF1E67B125EC87AB5389EA4</ManifestCertificateThumbprint>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SignManifests>true</SignManifests>
|
<SignManifests>false</SignManifests>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManifestKeyFile>ENI2_3_TemporaryKey.pfx</ManifestKeyFile>
|
<ManifestKeyFile>ENI2_3_TemporaryKey.pfx</ManifestKeyFile>
|
||||||
@ -310,6 +310,9 @@
|
|||||||
<Compile Include="EditControls\MessageHistoryDialog.xaml.cs">
|
<Compile Include="EditControls\MessageHistoryDialog.xaml.cs">
|
||||||
<DependentUpon>MessageHistoryDialog.xaml</DependentUpon>
|
<DependentUpon>MessageHistoryDialog.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="EditControls\MessageSendStatusDialog.xaml.cs">
|
||||||
|
<DependentUpon>MessageSendStatusDialog.xaml</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="EditControls\NewWithIdDialog.xaml.cs">
|
<Compile Include="EditControls\NewWithIdDialog.xaml.cs">
|
||||||
<DependentUpon>NewWithIdDialog.xaml</DependentUpon>
|
<DependentUpon>NewWithIdDialog.xaml</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
@ -554,6 +557,10 @@
|
|||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
</Page>
|
</Page>
|
||||||
|
<Page Include="EditControls\MessageSendStatusDialog.xaml">
|
||||||
|
<SubType>Designer</SubType>
|
||||||
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
</Page>
|
||||||
<Page Include="EditControls\NewWithIdDialog.xaml">
|
<Page Include="EditControls\NewWithIdDialog.xaml">
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
<Generator>MSBuild:Compile</Generator>
|
<Generator>MSBuild:Compile</Generator>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
// Copyright (c) 2017 schick Informatik
|
// Copyright (c) 2017- schick Informatik
|
||||||
// Description: Übersicht Speicherreihenfolge zu diesem Objekt
|
// Description:
|
||||||
//
|
//
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|||||||
17
ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml
Normal file
17
ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<enictrl:StatusWindowBase x:Class="ENI2.EditControls.MessageSendStatusDialog"
|
||||||
|
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:local="clr-namespace:ENI2.EditControls"
|
||||||
|
xmlns:enictrl="clr-namespace:ENI2.Controls"
|
||||||
|
xmlns:p="clr-namespace:ENI2.Properties"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
Title="{x:Static p:Resources.textMessageStatus}" Height="450" Width="400" Loaded="StatusWindowBase_Loaded">
|
||||||
|
<Grid>
|
||||||
|
<ListView x:Name="listViewMessages">
|
||||||
|
|
||||||
|
</ListView>
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
</enictrl:StatusWindowBase>
|
||||||
57
ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml.cs
Normal file
57
ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml.cs
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
// Copyright (c) 2017- schick Informatik
|
||||||
|
// Description: Overview of messages currently in transmission
|
||||||
|
//
|
||||||
|
|
||||||
|
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;
|
||||||
|
using System.Timers;
|
||||||
|
using bsmd.database;
|
||||||
|
using ENI2.Controls;
|
||||||
|
using log4net;
|
||||||
|
|
||||||
|
namespace ENI2.EditControls
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Interaction logic for MessageSendStatusDialog.xaml
|
||||||
|
/// </summary>
|
||||||
|
public partial class MessageSendStatusDialog : StatusWindowBase
|
||||||
|
{
|
||||||
|
private readonly Timer bgTimer;
|
||||||
|
|
||||||
|
public MessageSendStatusDialog()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
this.bgTimer = new Timer();
|
||||||
|
|
||||||
|
this.bgTimer.Elapsed += BgTimer_Elapsed;
|
||||||
|
this.bgTimer.AutoReset = true;
|
||||||
|
this.bgTimer.Interval = Properties.Settings.Default.changeTimerTimeout;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Message> Messages { get; set; }
|
||||||
|
|
||||||
|
private void BgTimer_Elapsed(object sender, ElapsedEventArgs e)
|
||||||
|
{
|
||||||
|
// check if a message has changed its status
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StatusWindowBase_Loaded(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (!this.Messages.IsNullOrEmpty())
|
||||||
|
this.bgTimer.Start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
9
ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
generated
9
ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
generated
@ -3053,6 +3053,15 @@ namespace ENI2.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Message status.
|
||||||
|
/// </summary>
|
||||||
|
public static string textMessageStatus {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("textMessageStatus", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to MMSI number.
|
/// Looks up a localized string similar to MMSI number.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -1726,4 +1726,7 @@
|
|||||||
<data name="textWaitForId" xml:space="preserve">
|
<data name="textWaitForId" xml:space="preserve">
|
||||||
<value>Waiting for Id..</value>
|
<value>Waiting for Id..</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="textMessageStatus" xml:space="preserve">
|
||||||
|
<value>Message status</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
Loading…
Reference in New Issue
Block a user