diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 62704fd..b6f78d7 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -37,6 +37,7 @@ + @@ -92,6 +93,7 @@ + diff --git a/src/BreCalClient/MainWindow.xaml b/src/BreCalClient/MainWindow.xaml index aa5d84c..b05c5e8 100644 --- a/src/BreCalClient/MainWindow.xaml +++ b/src/BreCalClient/MainWindow.xaml @@ -116,6 +116,7 @@ + @@ -150,10 +151,15 @@ + + + - - + + diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs index 3b9c00b..505c582 100644 --- a/src/BreCalClient/MainWindow.xaml.cs +++ b/src/BreCalClient/MainWindow.xaml.cs @@ -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 #region network operations @@ -968,6 +974,6 @@ namespace BreCalClient } #endregion - + } } diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs index 94ed88b..3e306de 100644 --- a/src/BreCalClient/Resources/Resources.Designer.cs +++ b/src/BreCalClient/Resources/Resources.Designer.cs @@ -240,6 +240,16 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] nav_refresh_green { + get { + object obj = ResourceManager.GetObject("nav_refresh_green", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -1079,6 +1089,15 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized string similar to Trigger a manual refresh of all shipcalls. + /// + public static string textTriggerManualRefresh { + get { + return ResourceManager.GetString("textTriggerManualRefresh", resourceCulture); + } + } + /// /// Looks up a localized string similar to Tug. /// diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx index 7a2cbcf..6e43a15 100644 --- a/src/BreCalClient/Resources/Resources.de.resx +++ b/src/BreCalClient/Resources/Resources.de.resx @@ -478,4 +478,7 @@ Feste Bestellung zurücknehmen + + Manuelle Aktualisierung der Anläufe auslösen + \ No newline at end of file diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx index dba2966..4172e4d 100644 --- a/src/BreCalClient/Resources/Resources.resx +++ b/src/BreCalClient/Resources/Resources.resx @@ -169,6 +169,9 @@ logo_bremen_calling.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + nav_refresh_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ship2.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -448,6 +451,9 @@ Unset as a a fixed order + + Trigger a manual refresh of all shipcalls + Tug diff --git a/src/BreCalClient/Resources/nav_refresh_green.png b/src/BreCalClient/Resources/nav_refresh_green.png new file mode 100644 index 0000000..0495c55 Binary files /dev/null and b/src/BreCalClient/Resources/nav_refresh_green.png differ