Compare commits
No commits in common. "03b434b801613703e7693aee447a58e63eba4e68" and "6610532c901dfb97cb3f7d811a00dd2a8deb15cf" have entirely different histories.
03b434b801
...
6610532c90
18
src/BreCalClient/Resources/Resources.Designer.cs
generated
18
src/BreCalClient/Resources/Resources.Designer.cs
generated
@ -624,15 +624,6 @@ namespace BreCalClient.Resources {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Looks up a localized string similar to Draft.
|
|
||||||
/// </summary>
|
|
||||||
public static string textDraftNoUnit {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("textDraftNoUnit", resourceCulture);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Edit.
|
/// Looks up a localized string similar to Edit.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -1155,15 +1146,6 @@ namespace BreCalClient.Resources {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Looks up a localized string similar to Position.
|
|
||||||
/// </summary>
|
|
||||||
public static string textPosition {
|
|
||||||
get {
|
|
||||||
return ResourceManager.GetString("textPosition", resourceCulture);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Rain sensitive cargo.
|
/// Looks up a localized string similar to Rain sensitive cargo.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -235,9 +235,6 @@
|
|||||||
<data name="textDraft" xml:space="preserve">
|
<data name="textDraft" xml:space="preserve">
|
||||||
<value>Tiefgang (m)</value>
|
<value>Tiefgang (m)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="textDraftNoUnit" xml:space="preserve">
|
|
||||||
<value>Tiefgang</value>
|
|
||||||
</data>
|
|
||||||
<data name="textEdit" xml:space="preserve">
|
<data name="textEdit" xml:space="preserve">
|
||||||
<value>Bearbeiten</value>
|
<value>Bearbeiten</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@ -649,10 +649,4 @@
|
|||||||
<data name="textNotifyOn" xml:space="preserve">
|
<data name="textNotifyOn" xml:space="preserve">
|
||||||
<value>Notify on</value>
|
<value>Notify on</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="textPosition" xml:space="preserve">
|
|
||||||
<value>Position</value>
|
|
||||||
</data>
|
|
||||||
<data name="textDraftNoUnit" xml:space="preserve">
|
|
||||||
<value>Draft</value>
|
|
||||||
</data>
|
|
||||||
</root>
|
</root>
|
||||||
@ -29,6 +29,7 @@
|
|||||||
<RowDefinition Height=".125*"/>
|
<RowDefinition Height=".125*"/>
|
||||||
<RowDefinition Height=".125*"/>
|
<RowDefinition Height=".125*"/>
|
||||||
<RowDefinition Height=".125*"/>
|
<RowDefinition Height=".125*"/>
|
||||||
|
|
||||||
<RowDefinition Height=".125*"/>
|
<RowDefinition Height=".125*"/>
|
||||||
<RowDefinition Height=".125*"/>
|
<RowDefinition Height=".125*"/>
|
||||||
<RowDefinition Height=".125*"/>
|
<RowDefinition Height=".125*"/>
|
||||||
@ -63,16 +64,16 @@
|
|||||||
<TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
|
<TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
|
||||||
</Viewbox>
|
</Viewbox>
|
||||||
<Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
|
<Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
|
||||||
<TextBlock Text="{x:Static p:Resources.textLengthWidth}" Padding="0" />
|
<TextBlock Text="{x:Static p:Resources.textCallsign}" />
|
||||||
</Viewbox>
|
</Viewbox>
|
||||||
<Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
|
<Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
|
||||||
<TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
|
<TextBlock x:Name="textBlockCallsign" Padding="0"/>
|
||||||
</Viewbox>
|
</Viewbox>
|
||||||
<Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
|
<Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
|
||||||
<TextBlock Text="{x:Static p:Resources.textDraftNoUnit}" />
|
<TextBlock Text="{x:Static p:Resources.textLengthWidth}" Padding="0" />
|
||||||
</Viewbox>
|
</Viewbox>
|
||||||
<Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
|
<Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
|
||||||
<TextBlock x:Name="textBlockDraft" Padding="0"/>
|
<TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
|
||||||
</Viewbox>
|
</Viewbox>
|
||||||
<Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
|
<Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
|
||||||
<TextBlock Text="ETA" x:Name="labelETA"/>
|
<TextBlock Text="ETA" x:Name="labelETA"/>
|
||||||
@ -89,6 +90,7 @@
|
|||||||
<Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
|
<Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
|
||||||
<TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
|
<TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
|
||||||
</Viewbox>
|
</Viewbox>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Row="0" Grid.Column="1">
|
<Grid Grid.Row="0" Grid.Column="1">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
|||||||
@ -269,7 +269,7 @@ namespace BreCalClient
|
|||||||
this.imageEvaluation.ToolTip = null;
|
this.imageEvaluation.ToolTip = null;
|
||||||
|
|
||||||
this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
|
this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
|
||||||
this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? $"{this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N2")} m" : "-";
|
this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
|
||||||
this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);
|
this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);
|
||||||
|
|
||||||
this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
|
this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
|
||||||
|
|||||||
@ -13,12 +13,6 @@
|
|||||||
"SccProvider" = "8:"
|
"SccProvider" = "8:"
|
||||||
"Hierarchy"
|
"Hierarchy"
|
||||||
{
|
{
|
||||||
"Entry"
|
|
||||||
{
|
|
||||||
"MsmKey" = "8:_1E7663DCE02A4D848349229A724E961A"
|
|
||||||
"OwnerKey" = "8:_UNDEFINED"
|
|
||||||
"MsmSig" = "8:_UNDEFINED"
|
|
||||||
}
|
|
||||||
"Entry"
|
"Entry"
|
||||||
{
|
{
|
||||||
"MsmKey" = "8:_3E48B6E716164CC1826E094025517B3F"
|
"MsmKey" = "8:_3E48B6E716164CC1826E094025517B3F"
|
||||||
@ -31,24 +25,6 @@
|
|||||||
"OwnerKey" = "8:_UNDEFINED"
|
"OwnerKey" = "8:_UNDEFINED"
|
||||||
"MsmSig" = "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"
|
"Configurations"
|
||||||
{
|
{
|
||||||
@ -100,14 +76,6 @@
|
|||||||
{
|
{
|
||||||
"LaunchCondition"
|
"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"
|
"{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_7C5ED856EDF94532A041DBACD5D5C09E"
|
||||||
{
|
{
|
||||||
"Name" = "8:.NET Core"
|
"Name" = "8:.NET Core"
|
||||||
@ -122,37 +90,6 @@
|
|||||||
}
|
}
|
||||||
"File"
|
"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"
|
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4EE484EAA4A246CBBB283030A6054BC0"
|
||||||
{
|
{
|
||||||
"SourcePath" = "8:..\\BreCalClient\\Resources\\containership.ico"
|
"SourcePath" = "8:..\\BreCalClient\\Resources\\containership.ico"
|
||||||
@ -173,37 +110,6 @@
|
|||||||
"IsDependency" = "11:FALSE"
|
"IsDependency" = "11:FALSE"
|
||||||
"IsolateTo" = "8:"
|
"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"
|
"FileType"
|
||||||
{
|
{
|
||||||
@ -231,17 +137,6 @@
|
|||||||
"Property" = "8:TARGETDIR"
|
"Property" = "8:TARGETDIR"
|
||||||
"Folders"
|
"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"
|
"{1525181F-901A-416C-8A58-119130FE478E}:_8BBC7FE2F38E4B41A71D26CCED7D0BCB"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user