Added a manual refresh button because.. well.. they asked for it
This commit is contained in:
parent
f0cc749026
commit
7147b92c75
@ -37,6 +37,7 @@
|
|||||||
<None Remove="Resources\lock.png" />
|
<None Remove="Resources\lock.png" />
|
||||||
<None Remove="Resources\lock_open.png" />
|
<None Remove="Resources\lock_open.png" />
|
||||||
<None Remove="Resources\logo_bremen_calling.png" />
|
<None Remove="Resources\logo_bremen_calling.png" />
|
||||||
|
<None Remove="Resources\nav_refresh_green.png" />
|
||||||
<None Remove="Resources\ship2.png" />
|
<None Remove="Resources\ship2.png" />
|
||||||
<None Remove="Resources\sign_warning.png" />
|
<None Remove="Resources\sign_warning.png" />
|
||||||
<None Remove="Resources\trafficlight_green.png" />
|
<None Remove="Resources\trafficlight_green.png" />
|
||||||
@ -92,6 +93,7 @@
|
|||||||
<Resource Include="Resources\lock.png" />
|
<Resource Include="Resources\lock.png" />
|
||||||
<Resource Include="Resources\lock_open.png" />
|
<Resource Include="Resources\lock_open.png" />
|
||||||
<Resource Include="Resources\logo_bremen_calling.png" />
|
<Resource Include="Resources\logo_bremen_calling.png" />
|
||||||
|
<Resource Include="Resources\nav_refresh_green.png" />
|
||||||
<Resource Include="Resources\ship2.png" />
|
<Resource Include="Resources\ship2.png" />
|
||||||
<Resource Include="Resources\sign_warning.png" />
|
<Resource Include="Resources\sign_warning.png" />
|
||||||
<Resource Include="Resources\StringResources.de.xaml">
|
<Resource Include="Resources\StringResources.de.xaml">
|
||||||
|
|||||||
@ -116,6 +116,7 @@
|
|||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
|
<ColumnDefinition Width="26" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
<ColumnDefinition Width="100" />
|
<ColumnDefinition Width="100" />
|
||||||
@ -150,10 +151,15 @@
|
|||||||
</StatusBarItem>
|
</StatusBarItem>
|
||||||
<Separator Grid.Column="11"/>
|
<Separator Grid.Column="11"/>
|
||||||
<StatusBarItem Grid.Column="12">
|
<StatusBarItem Grid.Column="12">
|
||||||
|
<Button x:Name="buttonManualRefresh" Width="20" Click="buttonManualRefresh_Click" ToolTip="{x:Static p:Resources.textTriggerManualRefresh}">
|
||||||
|
<Image Source="./Resources/nav_refresh_green.png"/>
|
||||||
|
</Button>
|
||||||
|
</StatusBarItem>
|
||||||
|
<StatusBarItem Grid.Column="13">
|
||||||
<TextBlock x:Name="labelLatestUpdate" />
|
<TextBlock x:Name="labelLatestUpdate" />
|
||||||
</StatusBarItem>
|
</StatusBarItem>
|
||||||
<Separator Grid.Column="13"/>
|
<Separator Grid.Column="14"/>
|
||||||
<StatusBarItem Grid.Column="14">
|
<StatusBarItem Grid.Column="15">
|
||||||
<ProgressBar Name="generalProgressStatus" Width="90" Height="16" Foreground="LightGray"/>
|
<ProgressBar Name="generalProgressStatus" Width="90" Height="16" Foreground="LightGray"/>
|
||||||
</StatusBarItem>
|
</StatusBarItem>
|
||||||
</StatusBar>
|
</StatusBar>
|
||||||
|
|||||||
@ -370,6 +370,12 @@ namespace BreCalClient
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void buttonManualRefresh_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
_refreshImmediately = true; // set flag to avoid timer loop termination
|
||||||
|
_tokenSource.Cancel(); // force timer loop end
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region network operations
|
#region network operations
|
||||||
@ -968,6 +974,6 @@ namespace BreCalClient
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
19
src/BreCalClient/Resources/Resources.Designer.cs
generated
19
src/BreCalClient/Resources/Resources.Designer.cs
generated
@ -240,6 +240,16 @@ namespace BreCalClient.Resources {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized resource of type System.Byte[].
|
||||||
|
/// </summary>
|
||||||
|
public static byte[] nav_refresh_green {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("nav_refresh_green", resourceCulture);
|
||||||
|
return ((byte[])(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Byte[].
|
/// Looks up a localized resource of type System.Byte[].
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -1079,6 +1089,15 @@ namespace BreCalClient.Resources {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Looks up a localized string similar to Trigger a manual refresh of all shipcalls.
|
||||||
|
/// </summary>
|
||||||
|
public static string textTriggerManualRefresh {
|
||||||
|
get {
|
||||||
|
return ResourceManager.GetString("textTriggerManualRefresh", resourceCulture);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Looks up a localized string similar to Tug.
|
/// Looks up a localized string similar to Tug.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -478,4 +478,7 @@
|
|||||||
<data name="textTooltipUnSetFixedOrder" xml:space="preserve">
|
<data name="textTooltipUnSetFixedOrder" xml:space="preserve">
|
||||||
<value>Feste Bestellung zurücknehmen</value>
|
<value>Feste Bestellung zurücknehmen</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="textTriggerManualRefresh" xml:space="preserve">
|
||||||
|
<value>Manuelle Aktualisierung der Anläufe auslösen</value>
|
||||||
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@ -169,6 +169,9 @@
|
|||||||
<data name="logo_bremen_calling" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="logo_bremen_calling" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>logo_bremen_calling.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>logo_bremen_calling.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="nav_refresh_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>nav_refresh_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</data>
|
||||||
<data name="ship2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="ship2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>ship2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>ship2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
@ -448,6 +451,9 @@
|
|||||||
<data name="textTooltipUnSetFixedOrder" xml:space="preserve">
|
<data name="textTooltipUnSetFixedOrder" xml:space="preserve">
|
||||||
<value>Unset as a a fixed order</value>
|
<value>Unset as a a fixed order</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="textTriggerManualRefresh" xml:space="preserve">
|
||||||
|
<value>Trigger a manual refresh of all shipcalls</value>
|
||||||
|
</data>
|
||||||
<data name="textTug" xml:space="preserve">
|
<data name="textTug" xml:space="preserve">
|
||||||
<value>Tug</value>
|
<value>Tug</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
BIN
src/BreCalClient/Resources/nav_refresh_green.png
Normal file
BIN
src/BreCalClient/Resources/nav_refresh_green.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Reference in New Issue
Block a user