#60 fix

MrReSc · Jan 15, 2020 · a268146 · a268146
1 parent 8fcca86
commit a268146
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/IEC Mate/IEC Mate.csproj b/IEC Mate/IEC Mate.csproj
@@ -28,7 +28,7 @@
     <PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
     <AssemblyFileVersionSettings>None.None.Increment.DateStamp</AssemblyFileVersionSettings>
     <AssemblyInfoVersionSettings>None.None.Increment.DateStamp</AssemblyInfoVersionSettings>
-    <AssemblyVersion>1.0.1522.20015</AssemblyVersion>
+    <AssemblyVersion>1.0.1545.20015</AssemblyVersion>
     <PublishUrl>C:\Users\r.scheidegger\Downloads\IEC Mate\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -42,7 +42,7 @@
     <ProductName>IEC-Mate</ProductName>
     <PublisherName>Remo Scheidegger</PublisherName>
     <ApplicationRevision>19222</ApplicationRevision>
-    <ApplicationVersion>1.0.1522.20015</ApplicationVersion>
+    <ApplicationVersion>1.0.1545.20015</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/IEC Mate/MainWindow.xaml b/IEC Mate/MainWindow.xaml
@@ -966,7 +966,8 @@
 
                                 <Grid.Resources>
                                     <Style TargetType="{x:Type Ellipse}">
-                                        <Setter Property="Stroke" Value="Silver"/>
+                                        <!--<Setter Property="Stroke" Value="Silver"/>-->
+                                        <Setter Property="Stroke" Value="{DynamicResource GrayBrush5}"/>
                                         <Setter Property="StrokeThickness" Value="2"/>
                                     </Style>
 

diff --git a/IEC Mate/MainWindow.xaml.cs b/IEC Mate/MainWindow.xaml.cs
@@ -2059,7 +2059,22 @@ private void Btn_decode_Click(object sender, RoutedEventArgs e)
         {
             try
             {
-                var bitset = text_decode_out1.Text;
+                var bitset = String.Empty;
+
+                if (text_decode_out1.Text.StartsWith("2#"))
+                {
+                    bitset = text_decode_out1.Text;
+                }
+
+                if (text_decode_out2.Text.StartsWith("2#"))
+                {
+                    bitset = text_decode_out2.Text;
+                }
+
+                if (text_decode.Text.StartsWith("2#"))
+                {
+                    bitset = text_decode.Text;
+                }
 
                 if (String.IsNullOrWhiteSpace(bitset))
                 {
@@ -2304,6 +2319,7 @@ private void ShowDecodeResult(List<char> list)
                 //Akzentfarbe von Theme
                 var accentColor = (Brush)converter.ConvertFromString(ThemeManager.GetResourceFromAppStyle(this, "AccentColor").ToString());
                 var accentColor2 = (Brush)converter.ConvertFromString(ThemeManager.GetResourceFromAppStyle(this, "AccentColor2").ToString());
+                var stroke = (Brush)App.Current.Resources["GrayBrush5"];
                 //Alle Objekte von Grid
                 var objects = grid_decoding.GetChildObjects();
 
@@ -2327,7 +2343,7 @@ private void ShowDecodeResult(List<char> list)
                                     {
                                         Ellipse el = it as Ellipse;
                                         el.Fill = Brushes.Transparent;
-                                        el.Stroke = Brushes.Silver;
+                                        el.Stroke = stroke;// Brushes.Silver;
                                     }
 
                                     //Schriftfarbe abhängig von Theme einstellen
@@ -2363,7 +2379,7 @@ private void ShowDecodeResult(List<char> list)
                                             else
                                             {
                                                 el.Fill = Brushes.Transparent;
-                                                el.Stroke = Brushes.Silver;
+                                                el.Stroke = stroke;//Brushes.Silver;
                                             }
                                         }
                                     }

diff --git a/IEC Mate/Properties/AssemblyInfo.cs b/IEC Mate/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1522.20015")]
-[assembly: AssemblyFileVersion("1.0.1522.20015")]
+[assembly: AssemblyVersion("1.0.1545.20015")]
+[assembly: AssemblyFileVersion("1.0.1545.20015")]