Improved window labels and and layout

ENI2/Controls/EasyPeasyControl.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:ENI2.Controls"
              mc:Ignorable="d" 
-             d:DesignHeight="650" d:DesignWidth="800" Loaded="UserControl_Loaded" Unloaded="UserControl_Unloaded">
+             d:DesignHeight="650" d:DesignWidth="1024" Loaded="UserControl_Loaded" Unloaded="UserControl_Unloaded">
 
 
     <DockPanel>
@@ -21,59 +21,60 @@
         <ScrollViewer VerticalScrollBarVisibility="Auto">
             <StackPanel Margin="12" Orientation="Vertical" >
                 <!-- Top-level fields -->
-                <UniformGrid Columns="4" Rows="3" Margin="0,0,0,12">
-                    <TextBlock Text="DelegateIdentificationType" />
-                    <TextBox Text="{Binding DelegateIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
-                    <TextBlock Text="TraderIdentificationType" />
-                    <TextBox Text="{Binding TraderIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                <UniformGrid Columns="4" Rows="3" Margin="0,0,0,12" Height="84">
+                    <TextBlock Text="Art der Identification (Vertreter)"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
+                    <TextBox Text="{Binding DelegateIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
+                    <TextBlock Text="Art der Identifikation (Kunde)" VerticalAlignment="Center"  Margin="0,0,4,0" TextAlignment="Right" />
+                    <TextBox Text="{Binding TraderIdentificationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
 
-                    <TextBlock Text="LRN" />
-                    <TextBox Text="{Binding LRN, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
-                    <TextBlock Text="TraderIdentificationNumber" />
-                    <TextBox Text="{Binding TraderIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                    <TextBlock Text="LRN" TextAlignment="Right"  Margin="0,0,4,0" VerticalAlignment="Center"/>
+                    <TextBox Text="{Binding LRN, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
+                    <TextBlock Text="Identifikationsnummer (Kunde)"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right" />
+                    <TextBox Text="{Binding TraderIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
 
-                    <TextBlock Text="Country" />
-                    <TextBox Text="{Binding Country, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
-                    <TextBlock Text="DelegateIdentificationNumber" />
-                    <TextBox Text="{Binding DelegateIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                    <TextBlock Text="Land" TextAlignment="Right" Margin="0,0,4,0"  VerticalAlignment="Center"/>
+                    <TextBox Text="{Binding Country, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
+                    <TextBlock Text="Identifikationsnummer (Vertreter)"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
+                    <TextBox Text="{Binding DelegateIdentificationNumber, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
                 </UniformGrid>
 
                 <!-- ProofInformation -->
-                <GroupBox Header="ProofInformationT2LT2LF">
+                <GroupBox Header="Kennung des Antrags auf Nachweis TZ2L(F)">
                     <StackPanel Margin="8">
-                        <UniformGrid Columns="4" Rows="4" Margin="0,0,0,12">
-                            <TextBlock Text="CompetentCustomsOffice"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.CompetentCustomsOffice, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
-                            <TextBlock Text="DeclarationType"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                        <UniformGrid Columns="4" Rows="4" Margin="0,0,0,12" >
+                            <TextBlock Text="Zuständige Zollstelle"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.CompetentCustomsOffice, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
+                            <TextBlock Text="Art der Anmeldung"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
 
-                            <TextBlock Text="DeclarationDate (yyyy-MM-ddTHH:mm:ss)"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationDate, StringFormat={}{0:yyyy-MM-ddTHH:mm:ss}, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
-                            <TextBlock Text="TotalGrossMassKg"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.TotalGrossMassKg, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                            <TextBlock TextWrapping="Wrap" Text="Datum Anmeldung
+                                       (yyyy-MM-ddTHH:mm:ss)"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.DeclarationDate, StringFormat={}{0:yyyy-MM-ddTHH:mm:ss}, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center" />
+                            <TextBlock Text="Gesamtrohmasse (kg)"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.TotalGrossMassKg, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
 
-                            <TextBlock Text="RequestedValidityOfTheProof.NumberOfDays"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestedValidityOfTheProof.NumberOfDays, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
-                            <TextBlock Text="RequestType"/>
-                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestType, UpdateSourceTrigger=PropertyChanged}" Margin="2" />
+                            <TextBlock TextWrapping="Wrap" Text="Antrag auf Gültigkeitsdauer des Nachweises (in Tagen)"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestedValidityOfTheProof.NumberOfDays, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
+                            <TextBlock Text="Art des Antrags"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                            <TextBox Text="{Binding ProofInformationT2LT2LF.RequestType, UpdateSourceTrigger=PropertyChanged}" Margin="2" VerticalContentAlignment="Center"/>
                         </UniformGrid>
 
-                        <GroupBox Header="LocationOfGoods">
-                            <UniformGrid Columns="6" Margin="8">
-                                <TextBlock Text="TypeOfLocation"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.TypeOfLocation}" Margin="2" />
-                                <TextBlock Text="QualifierOfIdentification"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.QualifierOfIdentification}" Margin="2" />
-                                <TextBlock Text="UNLocode"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.UNLocode}" Margin="2" />
+                        <GroupBox Header="Warenort">
+                            <UniformGrid Columns="6" Margin="8" Height="28">
+                                <TextBlock Text="Art des Ortes"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.TypeOfLocation}" Margin="2" VerticalContentAlignment="Center"/>
+                                <TextBlock Text="Art der Ortsbestimmung"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.QualifierOfIdentification}" Margin="2" VerticalContentAlignment="Center"/>
+                                <TextBlock Text="UNLocode"  TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,4,0"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.LocationOfGoods.UNLocode}" Margin="2" VerticalContentAlignment="Center"/>
                             </UniformGrid>
                         </GroupBox>
 
-                        <CheckBox Content="ContainerIndication"
+                        <CheckBox Content="In Containern beförderte Waren" Margin="8"
                                   IsChecked="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.ContainerIndication}"/>
 
                         <!-- Goods Items grid (paste target) -->
-                        <TextBlock Text="GoodsItemsForT2LT2LF (Paste tab/CSV with columns: HS, Item#, Description, Gross, Net, Pkgs, Type, Marks)" Margin="0,12,0,4"/>
+                        <TextBlock Text="Warenpositionen (Paste tab/CSV with columns: HS, Item#, Description, Gross, Net, Pkgs, Type, Marks)" Margin="4,12,0,4"/>
                         <DataGrid ItemsSource="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.GoodsItemsForT2LT2LF}"
                                   AutoGenerateColumns="False" CanUserAddRows="True"
                                   PreviewKeyDown="DataGrid_PreviewKeyDown" >
@@ -89,12 +90,12 @@
                             </DataGrid.Columns>
                         </DataGrid>
 
-                        <GroupBox Header="TransportDocuments" Margin="0,12,0,0">
-                            <UniformGrid Columns="4" Margin="8">
-                                <TextBlock Text="Type"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.Type}" Margin="2" />
-                                <TextBlock Text="ReferenceNumber"/>
-                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.ReferenceNumber}" Margin="2" />
+                        <GroupBox Header="Dokumente" Margin="0,12,0,0">
+                            <UniformGrid Columns="4" Margin="8" Height="28">
+                                <TextBlock Text="Art des Dokuments"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.Type}" Margin="2" VerticalContentAlignment="Center"/>
+                                <TextBlock Text="Referenznummer"  Margin="0,0,4,0" VerticalAlignment="Center" TextAlignment="Right"/>
+                                <TextBox Text="{Binding ProofInformationT2LT2LF.GoodsShipmentForT2LT2LF.TransportDocuments.ReferenceNumber}" Margin="2" VerticalContentAlignment="Center" />
                             </UniformGrid>
                         </GroupBox>
                     </StackPanel>

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>8</ApplicationRevision>
-    <ApplicationVersion>7.2.12.0</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>7.2.12.1</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>