From a9f1de2637c46e9e0624ba1e549b5f7ed6a96401 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 15 Jan 2024 18:13:04 +0100 Subject: [PATCH] Changes for (blue) release version --- misc/BreCalApi.cs | 6 +-- misc/BreCalApi.yaml | 2 +- src/BreCalClient/App.config | 6 +-- src/BreCalClient/BreCalClient.csproj | 2 +- .../PublishProfiles/ClickOnceProfile.pubxml | 2 +- .../Properties/Settings.Designer.cs | 36 +++++++++--------- src/BreCalClient/Properties/Settings.settings | 6 +-- src/BreCalClient/ShipcallControl.xaml | 28 +++++++------- src/BreCalClient/ShipcallControl.xaml.cs | 38 +++++++++---------- src/server/BreCal/__init__.py | 2 +- src/server/BreCal/local_db.py | 2 +- src/server/flaskapp.wsgi | 2 +- 12 files changed, 66 insertions(+), 66 deletions(-) diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs index 6cdda11..3e64937 100644 --- a/misc/BreCalApi.cs +++ b/misc/BreCalApi.cs @@ -3582,7 +3582,7 @@ namespace BreCalClient.misc.Client { Proxy = null; UserAgent = WebUtility.UrlEncode("OpenAPI-Generator/1.0.0/csharp"); - BasePath = "https://brecaltest.bsmd-emswe.eu"; + BasePath = "https://brecal.bsmd-emswe.eu"; DefaultHeaders = new ConcurrentDictionary(); ApiKey = new ConcurrentDictionary(); ApiKeyPrefix = new ConcurrentDictionary(); @@ -3590,7 +3590,7 @@ namespace BreCalClient.misc.Client { { new Dictionary { - {"url", "https://brecaltest.bsmd-emswe.eu"}, + {"url", "https://brecal.bsmd-emswe.eu"}, {"description", "Test server hosted on vcup"}, } } @@ -3609,7 +3609,7 @@ namespace BreCalClient.misc.Client IDictionary defaultHeaders, IDictionary apiKey, IDictionary apiKeyPrefix, - string basePath = "https://brecaldevel.bsmd-emswe.eu") : this() + string basePath = "https://brecal.bsmd-emswe.eu") : this() { if (string.IsNullOrWhiteSpace(basePath)) throw new ArgumentException("The provided basePath is invalid.", "basePath"); diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml index a3ccfc9..723f259 100644 --- a/misc/BreCalApi.yaml +++ b/misc/BreCalApi.yaml @@ -13,7 +13,7 @@ info: url: "https://www.bsmd.de/license" servers: - - url: "https://brecaltest.bsmd-emswe.eu/" + - url: "https://brecal.bsmd-emswe.eu/" description: "Test server hosted on vcup" paths: diff --git a/src/BreCalClient/App.config b/src/BreCalClient/App.config index cdfc501..fb460ce 100644 --- a/src/BreCalClient/App.config +++ b/src/BreCalClient/App.config @@ -11,16 +11,16 @@ - #751D1F + #203864 - !!Bremen calling Testversion!! + Bremen calling https://www.textbausteine.net/ - https://brecaltest.bsmd-emswe.eu + https://brecal.bsmd-emswe.eu diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 8db59b4..6070af2 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 - BreCalTestClient + BreCalClient diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceProfile.pubxml index 94aa26d..d1a9191 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. 0 - 6.0 + 1.1.5.* False Release True diff --git a/src/BreCalClient/Properties/Settings.Designer.cs b/src/BreCalClient/Properties/Settings.Designer.cs index 1bdf990..ef474a0 100644 --- a/src/BreCalClient/Properties/Settings.Designer.cs +++ b/src/BreCalClient/Properties/Settings.Designer.cs @@ -9,38 +9,38 @@ //------------------------------------------------------------------------------ namespace BreCalClient.Properties { - - + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - + public static Settings Default { get { return defaultInstance; } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("#751D1F")] + [global::System.Configuration.DefaultSettingValueAttribute("#203864")] public string BG_COLOR { get { return ((string)(this["BG_COLOR"])); } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("!!Bremen calling Testversion!!")] + [global::System.Configuration.DefaultSettingValueAttribute("Bremen calling")] public string APP_TITLE { get { return ((string)(this["APP_TITLE"])); } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("https://www.textbausteine.net/")] @@ -49,7 +49,7 @@ namespace BreCalClient.Properties { return ((string)(this["LOGO_IMAGE_URL"])); } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -61,16 +61,16 @@ namespace BreCalClient.Properties { this["FilterCriteria"] = value; } } - + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://brecaldevel.bsmd-emswe.eu")] + [global::System.Configuration.DefaultSettingValueAttribute("https://brecal.bsmd-emswe.eu")] public string API_URL { get { return ((string)(this["API_URL"])); } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("800")] @@ -82,7 +82,7 @@ namespace BreCalClient.Properties { this["Width"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("450")] @@ -94,7 +94,7 @@ namespace BreCalClient.Properties { this["Height"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0")] @@ -106,7 +106,7 @@ namespace BreCalClient.Properties { this["Left"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0")] @@ -118,7 +118,7 @@ namespace BreCalClient.Properties { this["Top"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0")] @@ -130,7 +130,7 @@ namespace BreCalClient.Properties { this["W1Left"] = value; } } - + [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0")] diff --git a/src/BreCalClient/Properties/Settings.settings b/src/BreCalClient/Properties/Settings.settings index 63f8bf6..6451f03 100644 --- a/src/BreCalClient/Properties/Settings.settings +++ b/src/BreCalClient/Properties/Settings.settings @@ -3,10 +3,10 @@ - #751D1F + #203864 - !!Bremen calling Testversion!! + Bremen calling https://www.textbausteine.net/ @@ -15,7 +15,7 @@ - https://brecaldevel.bsmd-emswe.eu + https://brecal.bsmd-emswe.eu 800 diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml index 1e642d4..7e230b4 100644 --- a/src/BreCalClient/ShipcallControl.xaml +++ b/src/BreCalClient/ShipcallControl.xaml @@ -1,12 +1,12 @@  @@ -45,7 +45,7 @@ - @@ -83,23 +83,23 @@ - + -