diff --git a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
index 0ed4811b..a434934c 100644
--- a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
+++ b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs
@@ -45,6 +45,7 @@ namespace ENI2.Controls
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(); };
addButton.Click += (s, e) => AddClicked?.Invoke();
+ this.Closing += Window_Closing;
};
}
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 35055bb4..db2704b3 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -66,7 +66,7 @@
ENI2.App
- true
+ false
bsmdKey.snk
@@ -87,7 +87,7 @@
DBA67DB331E10F18BBF1E67B125EC87AB5389EA4
- true
+ false
ENI2_3_TemporaryKey.pfx
@@ -310,6 +310,9 @@
MessageHistoryDialog.xaml
+
+ MessageSendStatusDialog.xaml
+
NewWithIdDialog.xaml
@@ -554,6 +557,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
diff --git a/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs
index 2a4a176d..973c02e7 100644
--- a/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs
+++ b/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs
@@ -1,5 +1,5 @@
-// Copyright (c) 2017 schick Informatik
-// Description: Übersicht Speicherreihenfolge zu diesem Objekt
+// Copyright (c) 2017- schick Informatik
+// Description:
//
using System;
diff --git a/ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml
new file mode 100644
index 00000000..d595b9ae
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
diff --git a/ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml.cs
new file mode 100644
index 00000000..1f5a80d2
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml.cs
@@ -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
+{
+ ///
+ /// Interaction logic for MessageSendStatusDialog.xaml
+ ///
+ 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 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();
+ }
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
index d4bad6bb..9935d79f 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
@@ -3053,6 +3053,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to Message status.
+ ///
+ public static string textMessageStatus {
+ get {
+ return ResourceManager.GetString("textMessageStatus", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to MMSI number.
///
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx
index 53cd7cf8..3359d5ce 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.resx
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx
@@ -1726,4 +1726,7 @@
Waiting for Id..
+
+ Message status
+
\ No newline at end of file