From 92eaecfbe3cf5376c7bcec6772ae8cdf5427ae8c Mon Sep 17 00:00:00 2001 From: puls200 Date: Tue, 7 Nov 2023 08:22:36 +0100 Subject: [PATCH] changed settings for test version via copytest.sh script --- src/BreCalClient/App.config | 2 +- src/BreCalClient/BreCalClient.csproj | 2 +- src/BreCalClient/Properties/Settings.Designer.cs | 2 +- src/BreCalClient/Properties/Settings.settings | 2 +- src/BreCalClient/ShipcallControl.xaml | 2 +- src/BreCalClient/ShipcallControl.xaml.cs | 12 ++++++------ src/server/BreCal/local_db.py | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index c86f39a..4ddf274 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -14,7 +14,7 @@ https://brecaldevel.bsmd-emswe.eu - #1D751F + #751D1F !!Bremen calling Testversion!! diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 4d27982..33a6ffe 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -13,7 +13,7 @@ Bremen calling client A Windows WPF client for the Bremen calling API. containership.ico - BreCalDevelClient + BreCalTestClient diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs index 8e2d2d1..6f08fee 100644 --- a/src/BreCalClient/Properties/Settings.Designer.cs +++ b/src/BreCalClient/Properties/Settings.Designer.cs @@ -34,7 +34,7 @@ namespace BreCalClient.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("#1D751F")] + [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")] public string BG_COLOR { get { return ((string)(this["BG_COLOR"])); diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings index fdf2294..4833674 100644 --- a/src/BreCalClient/Properties/Settings.settings +++ b/src/BreCalClient/Properties/Settings.settings @@ -6,7 +6,7 @@ https://brecal.bsmd-emswe.eu - #1D751F + #751D1F !!Bremen calling Testversion!! diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index c3b9155..eb07fe8 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:p = "clr-namespace:BreCalClient.Resources" xmlns:sets="clr-namespace:BreCalClient.Properties" - xmlns:db="clr-namespace:BreCalClient;assembly=BreCalDevelClient" + xmlns:db="clr-namespace:BreCalClient;assembly=BreCalTestClient" mc:Ignorable="d" d:DesignHeight="120" d:DesignWidth="800" Loaded="UserControl_Loaded"> diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs index eb74cc7..9fb914e 100644 --- a/src/BreCalClient/ShipcallControl.xaml.cs +++ b/src/BreCalClient/ShipcallControl.xaml.cs @@ -139,13 +139,13 @@ namespace BreCalClient switch (this.ShipcallControlModel?.Shipcall?.Type) { case 1: // incoming - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_down_red.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_down_red.png")); break; case 2: // outgoing - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_up_blue.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_up_blue.png")); break; case 3: // shifting - this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/arrow_right_green.png")); + this.imageShipcallType.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/arrow_right_green.png")); break; default: break; @@ -154,13 +154,13 @@ namespace BreCalClient switch(this.ShipcallControlModel?.LightMode) { case ShipcallControlModel.TrafficLightMode.GREEN: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/check.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/check.png")); break; case ShipcallControlModel.TrafficLightMode.YELLOW: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/sign_warning.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/sign_warning.png")); break; case ShipcallControlModel.TrafficLightMode.RED: - this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalDevelClient;component/Resources/delete2.png")); + this.imageEvaluation.Source = new BitmapImage(new Uri("pack://application:,,,/BreCalTestClient;component/Resources/delete2.png")); break; default: break; diff --git a/src/server/BreCal/local_db.py b/src/server/BreCal/local_db.py index 1619ff3..4afd51b 100644 --- a/src/server/BreCal/local_db.py +++ b/src/server/BreCal/local_db.py @@ -10,7 +10,7 @@ def initPool(instancePath): try: global config_path if(config_path == None): - config_path = os.path.join(instancePath,'../../../secure/connection_data_devel.json'); + config_path = os.path.join(instancePath,'../../../secure/connection_data_test.json'); print (config_path)