diff --git a/misc/version.txt b/misc/version.txt index 25be1b0..600d680 100644 --- a/misc/version.txt +++ b/misc/version.txt @@ -1 +1 @@ -1.1.0.0 \ No newline at end of file +1.1.1.0 \ No newline at end of file diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index c86f39a..97e0e29 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -10,9 +10,6 @@ - - https://brecaldevel.bsmd-emswe.eu - #1D751F @@ -22,6 +19,9 @@ https://www.textbausteine.net/ + + https://brecaldevel.bsmd-emswe.eu + @@ -29,6 +29,54 @@ + + 800 + + + 450 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + \ No newline at end of file diff --git a/src/BreCalClient/App.xaml b/src/BreCalClient/App.xaml index 6702ce6..e74dc10 100644 --- a/src/BreCalClient/App.xaml +++ b/src/BreCalClient/App.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:BreCalClient" - StartupUri="MainWindow.xaml"> + StartupUri="MainWindow.xaml" Exit="Application_Exit"> diff --git a/src/BreCalClient/App.xaml.cs b/src/BreCalClient/App.xaml.cs index 6c98fd5..191a183 100644 --- a/src/BreCalClient/App.xaml.cs +++ b/src/BreCalClient/App.xaml.cs @@ -9,5 +9,10 @@ namespace BreCalClient public partial class App : Application { public static Participant Participant { get; set; } = new Participant(); + + private void Application_Exit(object sender, ExitEventArgs e) + { + BreCalClient.Properties.Settings.Default.Save(); + } } } diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 3ebb158..3d05079 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -8,8 +8,8 @@ True BreCalClient.App ..\..\misc\brecal.snk - 1.1.0.0 - 1.1.0.0 + 1.1.1.0 + 1.1.1.0 Bremen calling client A Windows WPF client for the Bremen calling API. containership.ico diff --git a/src/BreCalClient/BreCalLists.cs b/src/BreCalClient/BreCalLists.cs index 39746cd..3857e90 100644 --- a/src/BreCalClient/BreCalLists.cs +++ b/src/BreCalClient/BreCalLists.cs @@ -23,10 +23,10 @@ namespace BreCalClient private static readonly List _berths = new(); private static List _allBerths = new(); private static List _participants = new(); - private static readonly List _ships = new(); - private static List _allShips = new(); + private static readonly List _ships = new(); + private static readonly List _allShips = new(); - private readonly static ConcurrentDictionary _shipLookupDict = new(); + private readonly static ConcurrentDictionary _shipLookupDict = new(); private readonly static ConcurrentDictionary _berthLookupDict = new(); private readonly static Dictionary _participantLookupDict = new(); @@ -34,7 +34,7 @@ namespace BreCalClient #region Properties - public static ConcurrentDictionary ShipLookupDict { get { return _shipLookupDict; } } + public static ConcurrentDictionary ShipLookupDict { get { return _shipLookupDict; } } public static ConcurrentDictionary BerthLookupDict { get { return _berthLookupDict; } } @@ -76,19 +76,19 @@ namespace BreCalClient public static List Berths { get { return _berths; } } /// - /// All active berths + /// All berths including deleted berths /// public static List AllBerths { get { return _allBerths; } } /// /// All active ships /// - public static List Ships { get { return _ships; } } + public static List Ships { get { return _ships; } } /// - /// All active berths + /// All ships including deleted ships /// - public static List AllShips { get { return _allShips; } } + public static List AllShips { get { return _allShips; } } #endregion @@ -130,11 +130,12 @@ namespace BreCalClient { foreach (var ship in ships) { - _shipLookupDict[ship.Id] = ship; + ShipModel sm = new ShipModel(ship); + _shipLookupDict[ship.Id] = sm; if (!ship.Deleted) - _ships.Add(ship); - } - _allShips = ships; + _ships.Add(sm); + _allShips.Add(sm); + } } #endregion diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml index 7be23c1..6acfa9b 100644 --- a/src/BreCalClient/EditShipcallControl.xaml +++ b/src/BreCalClient/EditShipcallControl.xaml @@ -7,7 +7,7 @@ xmlns:p = "clr-namespace:BreCalClient.Resources" xmlns:db="clr-namespace:BreCalClient;assembly=BreCalClient" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" - mc:Ignorable="d" + mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}" Title="{x:Static p:Resources.textEditShipcall}" Height="242" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico"> @@ -30,22 +30,7 @@