From be08ad6a3a2897adaf4f93abb613075bf61c5d16 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 28 Apr 2025 15:43:31 +0200 Subject: [PATCH 1/5] Draft instead of callsign in BSMD cell --- src/BreCalClient/ShipcallControl.xaml | 25 ++++++++++++------------ src/BreCalClient/ShipcallControl.xaml.cs | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index 981dc77..cc55bdc 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -29,7 +29,6 @@ - @@ -64,32 +63,32 @@ - - - - - - - + - + - + - + - + - + + + + + + + diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index ca8bbbe..7c115ab 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -269,7 +269,7 @@ namespace BreCalClient this.imageEvaluation.ToolTip = null; this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null); - this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign; + this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1") : "-"; this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true); this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString(); From c3d8e901c4740d57db5758e1f0a041e0a062bfa7 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 29 Apr 2025 10:57:16 +0200 Subject: [PATCH 2/5] Version bump and updated setup project --- src/BreCalClient/BreCalClient.csproj | 4 ++-- .../PublishProfiles/ClickOnceProfile.pubxml | 4 ++-- src/Setup/Setup.vdproj | 24 +++++++++++++++---- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index af2d434..818c99a 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -8,8 +8,8 @@ True BreCalClient.App ..\..\misc\brecal.snk - 1.6.0.8 - 1.6.0.8 + 1.6.1.0 + 1.6.1.0 Bremen calling client A Windows WPF client for the Bremen calling API. containership.ico diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml index 2f05a6a..8a8a8cc 100644 --- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml +++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 8 - 1.6.0.8 + 1.6.1.0 False Release True @@ -40,7 +40,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. https://www.bsmd-emswe.eu/ win-x64 false - 1.6.0.8 + 1.6.1.0 diff --git a/src/Setup/Setup.vdproj b/src/Setup/Setup.vdproj index f1498e5..d302dce 100644 --- a/src/Setup/Setup.vdproj +++ b/src/Setup/Setup.vdproj @@ -43,6 +43,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } "Release" { @@ -59,6 +67,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } } "Deployable" @@ -166,15 +182,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Bremen calling" - "ProductCode" = "8:{6EF71F76-3E55-483B-A032-4B29FDAFE6A4}" - "PackageCode" = "8:{8E55F30F-A9C8-41E9-BCE8-431770A951ED}" + "ProductCode" = "8:{0AD2A791-5208-4D6F-8601-598EE8FE9BF7}" + "PackageCode" = "8:{FE992D07-0C79-4C5A-9D71-66C8F3EAFB55}" "UpgradeCode" = "8:{1C7FA3E4-BAB9-4911-9348-73094357FC7C}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.2.2" + "ProductVersion" = "8:1.6.1" "Manufacturer" = "8:Informatikbüro Daniel Schick" "ARPHELPTELEPHONE" = "8:+49 (0) 421 - 38 48 27" "ARPHELPLINK" = "8:https://www.bsmd.de/" @@ -716,7 +732,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3E48B6E716164CC1826E094025517B3F" { - "SourcePath" = "8:..\\BreCalClient\\obj\\Release\\net6.0-windows\\apphost.exe" + "SourcePath" = "8:..\\BreCalClient\\obj\\Debug\\net6.0-windows\\apphost.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7C8F7547CED64B3CAE7D0296A8BCE23F" From f7fed255d539419691056c779960f35d031b239f Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 13 May 2025 11:23:15 +0200 Subject: [PATCH 3/5] Added german satellite assemblies to setup project --- src/Setup/Setup.vdproj | 105 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/src/Setup/Setup.vdproj b/src/Setup/Setup.vdproj index d302dce..45f068e 100644 --- a/src/Setup/Setup.vdproj +++ b/src/Setup/Setup.vdproj @@ -13,6 +13,12 @@ "SccProvider" = "8:" "Hierarchy" { + "Entry" + { + "MsmKey" = "8:_1E7663DCE02A4D848349229A724E961A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } "Entry" { "MsmKey" = "8:_3E48B6E716164CC1826E094025517B3F" @@ -25,6 +31,24 @@ "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_CD20A468610C42B89F66B4D3367A5A6A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CD20A468610C42B89F66B4D3367A5A6A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_1E7663DCE02A4D848349229A724E961A" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -92,6 +116,14 @@ { "LaunchCondition" { + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_3415D375792A4611BF998D78F56CD22C" + { + "Name" = "8:.NET Framework" + "Message" = "8:[VSDNETMSG]" + "FrameworkVersion" = "8:.NETFramework,Version=v4.7.2" + "AllowLaterVersions" = "11:FALSE" + "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=863262" + } "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_7C5ED856EDF94532A041DBACD5D5C09E" { "Name" = "8:.NET Core" @@ -106,6 +138,37 @@ } "File" { + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1E7663DCE02A4D848349229A724E961A" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Xceed.Wpf.AvalonDock.resources, Version=4.6.0.0, Culture=de, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_1E7663DCE02A4D848349229A724E961A" + { + "Name" = "8:Xceed.Wpf.AvalonDock.resources.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\BreCalClient\\bin\\Debug\\net6.0-windows\\de\\Xceed.Wpf.AvalonDock.resources.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_F64284776BC0480CBF6C33B1FE00C374" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EE484EAA4A246CBBB283030A6054BC0" { "SourcePath" = "8:..\\BreCalClient\\Resources\\containership.ico" @@ -126,6 +189,37 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_CD20A468610C42B89F66B4D3367A5A6A" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:BreCalClient.resources, Version=1.6.2.0, Culture=de, PublicKeyToken=9ce7b6b354e08ac9, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_CD20A468610C42B89F66B4D3367A5A6A" + { + "Name" = "8:BreCalClient.resources.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:..\\BreCalClient\\bin\\Debug\\net6.0-windows\\de\\BreCalClient.resources.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_F64284776BC0480CBF6C33B1FE00C374" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } } "FileType" { @@ -153,6 +247,17 @@ "Property" = "8:TARGETDIR" "Folders" { + "{9EF0B969-E518-4E46-987F-47570745A589}:_F64284776BC0480CBF6C33B1FE00C374" + { + "Name" = "8:de" + "AlwaysCreate" = "11:FALSE" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Property" = "8:_319F0FD8E72443BFA3AE5E1F3F42523B" + "Folders" + { + } + } } } "{1525181F-901A-416C-8A58-119130FE478E}:_8BBC7FE2F38E4B41A71D26CCED7D0BCB" From 5459e1dd78c5624c176083bd276437eb2652de58 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 13 May 2025 11:48:29 +0200 Subject: [PATCH 4/5] Moved draft up and put unit behind the value --- .../Resources/Resources.Designer.cs | 18 ++++++++++ src/BreCalClient/Resources/Resources.de.resx | 3 ++ src/BreCalClient/Resources/Resources.resx | 6 ++++ src/BreCalClient/ShipcallControl.xaml | 33 +++++++++---------- src/BreCalClient/ShipcallControl.xaml.cs | 2 +- 5 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs index 7a002ab..fc437e3 100644 --- a/src/BreCalClient/Resources/Resources.Designer.cs +++ b/src/BreCalClient/Resources/Resources.Designer.cs @@ -596,6 +596,15 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized string similar to Draft. + /// + public static string textDraftNoUnit { + get { + return ResourceManager.GetString("textDraftNoUnit", resourceCulture); + } + } + /// /// Looks up a localized string similar to Edit. /// @@ -1064,6 +1073,15 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized string similar to Position. + /// + public static string textPosition { + get { + return ResourceManager.GetString("textPosition", resourceCulture); + } + } + /// /// Looks up a localized string similar to Rain sensitive cargo. /// diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx index c28930b..89a8857 100644 --- a/src/BreCalClient/Resources/Resources.de.resx +++ b/src/BreCalClient/Resources/Resources.de.resx @@ -235,6 +235,9 @@ Tiefgang (m) + + Tiefgang + Bearbeiten diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx index 0a0154d..0bd3666 100644 --- a/src/BreCalClient/Resources/Resources.resx +++ b/src/BreCalClient/Resources/Resources.resx @@ -604,4 +604,10 @@ No port assigned to this participant + + Position + + + Draft + \ No newline at end of file diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index cc55bdc..3bbd8b8 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -69,27 +69,26 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index 7c115ab..ddc31dd 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -269,7 +269,7 @@ namespace BreCalClient this.imageEvaluation.ToolTip = null; this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null); - this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1") : "-"; + this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? $"{this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1")} m" : "-"; this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true); this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString(); From 33dd7518efaba070e9b8c99545a7c3f35d03bb06 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 22 May 2025 07:40:34 +0200 Subject: [PATCH 5/5] =?UTF-8?q?Zwei=20Nachkommastellen=20f=C3=BCr=20den=20?= =?UTF-8?q?Tiefgang=20in=20der=20=C3=9Cbersicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BreCalClient/ShipcallControl.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index ddc31dd..0f43fb4 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -269,7 +269,7 @@ namespace BreCalClient this.imageEvaluation.ToolTip = null; this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null); - this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? $"{this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1")} m" : "-"; + this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? $"{this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N2")} m" : "-"; this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true); this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();