Bugfix für gleichzeitiges Schließen / Ändern von Dialogen

..führt offenbar zu Placement Problemen (Timing). Für Error/Validation habe ich daher unterschiedliche Position genommen. Im Grunde ist das aber immer noch ein gräßlicher Häck der von der Tatsache ablenkt, dass jedes Fenster seinen Position separat gespeichert haben sollte.
Copied/Renamed for Release
2024-03-26 12:06:48 +01:00 · 2024-03-22 09:08:20 +01:00
19 changed files with 120 additions and 96 deletions
--- a/ENI2/App.config
+++ b/ENI2/App.config
@ -28,35 +28,20 @@
            <setting name="LockingServerAddress" serializeAs="String">
 				<value>http://192.168.2.24/LockingService/LockingService.svc</value>				
            </setting>
-            <setting name="ReportAuthor" serializeAs="String">
-                <value>BSMD ReportGenerator</value>
-            </setting>
            <setting name="ConnectionString" serializeAs="String">
-                <value>Initial Catalog=nswtest;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
+				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>				
            </setting>
        </ENI2.Properties.Settings>
    </applicationSettings>
    <userSettings>
        <ENI2.Properties.Settings>
            <setting name="MainWindowPlacement" serializeAs="String">
-                <value />
+                <value/>
            </setting>
-            <setting name="Width" serializeAs="String">
-                <value>825</value>
-            </setting>
-            <setting name="Height" serializeAs="String">
-                <value>450</value>
-            </setting>
-            <setting name="W1Left" serializeAs="String">
+            <setting name="W3Left" serializeAs="String">
                <value>0</value>
            </setting>
-            <setting name="W1Top" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="W2Left" serializeAs="String">
-                <value>0</value>
-            </setting>
-            <setting name="W2Top" serializeAs="String">
+            <setting name="W3Top" serializeAs="String">
                <value>0</value>
            </setting>
        </ENI2.Properties.Settings>
--- a/ENI2/Controls/StatusWindowBase.cs
+++ b/ENI2/Controls/StatusWindowBase.cs
@ -36,10 +36,19 @@ namespace ENI2.Controls
                closeButton.Click += (s, e) => { if (this.IsModal()) DialogResult = true; CloseClicked?.Invoke(); this.Close(); };
                refreshButton.Click += (s, e) => { RefreshClicked?.Invoke(); };

-                SettingBindingExtension stBinding = new SettingBindingExtension("W2Top");                
+                string topProperty = "W2Top";
+                string leftProperty = "W2Left";
+                if(this.GetType().Name == "ViolationListDialog")
+                {
+                    topProperty = "W3Top";
+                    leftProperty = "W3Left";
+                }
+
+
+                SettingBindingExtension stBinding = new SettingBindingExtension(topProperty);
                this.SetBinding(Window.TopProperty, stBinding);

-                SettingBindingExtension slBinding = new SettingBindingExtension("W2Left");
+                SettingBindingExtension slBinding = new SettingBindingExtension(leftProperty);
                this.SetBinding (Window.LeftProperty, slBinding);
            };
        }
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@ -8,7 +8,7 @@
    <OutputType>WinExe</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>ENI2</RootNamespace>
-    <AssemblyName>ENI2Test</AssemblyName>
+    <AssemblyName>ENI2</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@ -18,7 +18,7 @@
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
    <TargetFrameworkProfile />
-    <PublishUrl>eni_test\</PublishUrl>
+    <PublishUrl>eni2.publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Web</InstallFrom>
    <UpdateEnabled>true</UpdateEnabled>
@ -28,16 +28,16 @@
    <UpdatePeriodically>false</UpdatePeriodically>
    <UpdateRequired>false</UpdateRequired>
    <MapFileExtensions>true</MapFileExtensions>
-    <InstallUrl>http://192.168.2.24/eni_test/</InstallUrl>
+    <InstallUrl>http://192.168.2.24/eni2.publish/</InstallUrl>
    <SupportUrl>http://www.textbausteine.net/</SupportUrl>
-    <ProductName>ENI Testversion</ProductName>
+    <ProductName>ENI</ProductName>
    <PublisherName>Informatikbüro Daniel Schick</PublisherName>
    <SuiteName>NSW</SuiteName>
    <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
    <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
    <WebPage>publish.html</WebPage>
-    <ApplicationRevision>8</ApplicationRevision>
-    <ApplicationVersion>7.2.2.8</ApplicationVersion>
+    <ApplicationRevision>9</ApplicationRevision>
+    <ApplicationVersion>7.2.2.9</ApplicationVersion>
    <UseApplicationTrust>false</UseApplicationTrust>
    <CreateDesktopShortcut>true</CreateDesktopShortcut>
    <PublishWizardCompleted>true</PublishWizardCompleted>
@ -90,7 +90,8 @@
    <SignManifests>true</SignManifests>
  </PropertyGroup>
  <PropertyGroup>
-    <ManifestKeyFile>ENI2_6_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 64|AnyCPU'">
    <DebugSymbols>true</DebugSymbols>
--- a/ENI2/EditControls/CompareExcelDialog.xaml
+++ b/ENI2/EditControls/CompareExcelDialog.xaml
@ -8,7 +8,7 @@
        xmlns:p="clr-namespace:ENI2.Properties"
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico">
+        Title="{x:Static p:Resources.textCompareExcel}" Height="260" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="32" />
--- a/ENI2/EditControls/CopyDeclarationDialog.xaml
+++ b/ENI2/EditControls/CopyDeclarationDialog.xaml
@ -8,7 +8,7 @@
        xmlns:p="clr-namespace:ENI2.Properties"
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_cards.ico">
+        Title="{x:Static p:Resources.textCopyDeclaration}" Height="326" Width="440" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_cards.ico">
    <Grid Margin="5">
        <Grid.RowDefinitions>
            <RowDefinition Height="28" />
@ -78,4 +78,3 @@
        </StackPanel>
    </Grid>
 </enictrl:EditWindowBase>
-    
--- a/ENI2/EditControls/CoreStatusInfoDialog.xaml
+++ b/ENI2/EditControls/CoreStatusInfoDialog.xaml
@ -8,7 +8,7 @@
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        xmlns:p="clr-namespace:ENI2.Properties"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_grey.ico" >
+        Title="{x:Static p:Resources.textCoreStatus}" Height="436" Width="600" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_grey.ico" >
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="0.3*"/>
--- a/ENI2/EditControls/EditRulesDialog.xaml
+++ b/ENI2/EditControls/EditRulesDialog.xaml
@ -9,7 +9,7 @@
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        xmlns:p="clr-namespace:ENI2.Properties"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2Test;component/Resources/mail_forward.png"> 
+        Title="{x:Static p:Resources.textEditRules}" Height="402" Width="800" WindowStyle="SingleBorderWindow" Background="AliceBlue" Icon="/ENI2;component/Resources/mail_forward.png">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="32" />
--- a/ENI2/EditControls/ErrorListDialog.xaml
+++ b/ENI2/EditControls/ErrorListDialog.xaml
@ -8,7 +8,7 @@
        xmlns:p="clr-namespace:ENI2.Properties"
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_red.ico" Topmost="False">
+        Title="{x:Static p:Resources.textErrors}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_red.ico" Topmost="False">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="*" />
--- a/ENI2/EditControls/MessageHistoryDialog.xaml
+++ b/ENI2/EditControls/MessageHistoryDialog.xaml
@ -7,7 +7,7 @@
        xmlns:enictrl="clr-namespace:ENI2.Controls"
        xmlns:p="clr-namespace:ENI2.Properties"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/ENI2Test;component/Resources/clock_history.ico">
+        Title="{x:Static p:Resources.textMessageHistory}" Height="450" Width="800" Background="AliceBlue" Icon="/ENI2;component/Resources/clock_history.ico">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="*" />
--- a/ENI2/EditControls/NewDGItemDialog.xaml
+++ b/ENI2/EditControls/NewDGItemDialog.xaml
@ -9,7 +9,7 @@
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
        Title="{x:Static p:Resources.textNewDGItem}" Height="350" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize"
-                        Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded">
+                        Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Loaded="EditWindowBase_Loaded">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="28" />
--- a/ENI2/EditControls/NewWithIdDialog.xaml
+++ b/ENI2/EditControls/NewWithIdDialog.xaml
@ -8,7 +8,7 @@
        xmlns:p="clr-namespace:ENI2.Properties"
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_add.ico">
+        Title="{x:Static p:Resources.textNewWithId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_card_add.ico">

        <Grid Margin="4">
        <Grid.RowDefinitions>
--- a/ENI2/EditControls/SelectPortAreaDialog.xaml
+++ b/ENI2/EditControls/SelectPortAreaDialog.xaml
@ -8,7 +8,7 @@
        xmlns:local="clr-namespace:ENI2.EditControls"
        xmlns:p="clr-namespace:ENI2.Properties"
        mc:Ignorable="d"
-        Title="Search port area" Height="400" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Loaded="Window_Loaded">
+        Title="Search port area" Height="400" Width="600"  WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="CanResize" Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Loaded="Window_Loaded">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="28" />
--- a/ENI2/EditControls/ViolationListDialog.xaml
+++ b/ENI2/EditControls/ViolationListDialog.xaml
@ -8,7 +8,7 @@
        xmlns:p="clr-namespace:ENI2.Properties"
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2Test;component/Resources/bullet_ball_yellow.ico" Topmost="False">
+        Title="{x:Static p:Resources.textViolations}" Height="300" Width="600" Background="AliceBlue" Icon="/ENI2;component/Resources/bullet_ball_yellow.ico" Topmost="False">
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="*" />
--- a/ENI2/EditControls/VisitIdDialog.xaml
+++ b/ENI2/EditControls/VisitIdDialog.xaml
@ -8,7 +8,7 @@
        xmlns:p="clr-namespace:ENI2.Properties"
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
        mc:Ignorable="d"
-        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2Test;component/Resources/id_card_new.ico">
+        Title="{x:Static p:Resources.textNewVisitTransitId}" Height="220" Width="350" WindowStyle="SingleBorderWindow"  Background="AliceBlue" ResizeMode="NoResize" Icon="/ENI2;component/Resources/id_card_new.ico">
    <Grid Margin="4">
        <Grid.RowDefinitions>
            <RowDefinition Height="28" />
--- a/ENI2/MainWindow.xaml
+++ b/ENI2/MainWindow.xaml
@ -10,7 +10,7 @@
        xmlns:util="clr-namespace:ENI2.Util"
        xmlns:local="clr-namespace:ENI2"
        mc:Ignorable="d"
-        Title="ENI 2 Testversion" 
+        Title="ENI 2"
        Height="{util:SettingBinding Height}" Width="{util:SettingBinding Width}"
        Icon="Resources/logo_schwarz.ico" Loaded="Window_Loaded" Closing="Window_Closing"
        SourceInitialized="Window_SourceInitialized">
--- a/ENI2/Properties/Settings.Designer.cs
+++ b/ENI2/Properties/Settings.Designer.cs
@ -12,7 +12,7 @@ namespace ENI2.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")]
+    [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())));
@ -161,5 +161,29 @@ namespace ENI2.Properties {
                this["W2Top"] = value;
            }
        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public string W3Left {
+            get {
+                return ((string)(this["W3Left"]));
+            }
+            set {
+                this["W3Left"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public string W3Top {
+            get {
+                return ((string)(this["W3Top"]));
+            }
+            set {
+                this["W3Top"] = value;
+            }
+        }
    }
 }
--- a/ENI2/Properties/Settings.settings
+++ b/ENI2/Properties/Settings.settings
@ -41,5 +41,11 @@
    <Setting Name="W2Top" Type="System.String" Scope="User">
      <Value Profile="(Default)">0</Value>
    </Setting>
+    <Setting Name="W3Left" Type="System.String" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="W3Top" Type="System.String" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
  </Settings>
 </SettingsFile>
--- a/ENI2/Resources/EUREPORT.png
+++ b/ENI2/Resources/EUREPORT.png
--- a/bsmd.LockingService/bsmd.LockingService.csproj.user
+++ b/bsmd.LockingService/bsmd.LockingService.csproj.user
@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
    <IISExpressAnonymousAuthentication />