1.8.7

[Bug fixes] - UWP app selection was broken
Codectory · Dec 25, 2021 · d286298 · d286298
1 parent 43660d8
commit d286298
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/Source/AutoHDR/Properties/AssemblyInfo.cs b/Source/AutoHDR/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.6.0")]
-[assembly: AssemblyFileVersion("1.8.6.0")]
+[assembly: AssemblyVersion("1.8.7.0")]
+[assembly: AssemblyFileVersion("1.8.7.0")]
diff --git a/Source/AutoHDR/UWP/UWPApp.cs b/Source/AutoHDR/UWP/UWPApp.cs
@@ -71,7 +71,6 @@ private void ReadAppxManifest(Package package)
                 {
                     XmlSerializer serializer = new XmlSerializer(typeof(AppxManifest));
                     AppxManifest appxManifest = (AppxManifest)serializer.Deserialize(reader);
-                    if (appxManifest.Applications==null)
                     Name = ((XmlNode[])appxManifest.Properties.DisplayName)[0].Value;
                     if (Name.Contains("ms-resource:"))
                     {

diff --git a/Source/AutoHDR/Views/ApplicationAdderView.xaml b/Source/AutoHDR/Views/ApplicationAdderView.xaml
@@ -24,12 +24,16 @@
         </Grid.ColumnDefinitions>
         <Label Grid.Column="0" Grid.Row="0" Content="{x:Static pres:ProjectLocales.DisplayName}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Top" FontSize="15"/>
         <Label Grid.Column="0" Grid.Row="1" Content="{x:Static pres:ProjectLocales.FilePath}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Top" />
-        <Label Grid.Column="0" Grid.Row="2" Content="{x:Static pres:ProjectLocales.Icon}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Top" />
+        <Label Grid.Column="0" Grid.Row="2" Content="{x:Static pres:ProjectLocales.Icon}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Center" />
 
         <TextBox Grid.Column="1" Grid.Row="0" Height="Auto" Margin="5" TextWrapping="Wrap" Text="{Binding DisplayName, Mode=TwoWay }" VerticalAlignment="Top"/>
         <Label  Grid.Column="1" Grid.Row="1" Content="{Binding FilePath}" Margin="5" Height="Auto" VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
-        <Image Grid.Column="1" Grid.Row="2" Margin="5"  Height="40" Width="40" Source="{Binding ApplicationItem.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Stretch="Uniform"/>
-
+        <Border Grid.Column="1" Grid.Row="2" Height="70" Width="70" Margin="5"  CornerRadius="{StaticResource CornerRadius}" Background="#FF747474" HorizontalAlignment="Left"/>
+        <Border Grid.Column="1" Grid.Row="2" Margin="5" Height="70" Width="70" CornerRadius="{StaticResource CornerRadius}" HorizontalAlignment="Left">
+            <Border.Background>
+                <ImageBrush Stretch="Fill" ImageSource="{Binding ApplicationItem.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>
+            </Border.Background>
+        </Border>
         <Grid Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"  >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />

diff --git a/Source/AutoHDR/Views/AutoHDRMainView.xaml b/Source/AutoHDR/Views/AutoHDRMainView.xaml
@@ -147,13 +147,14 @@
                         <TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left"  Text="{x:Static pres:ProjectLocales.CurrentProfile}"  Width="Auto" FontWeight="Bold"  Height="Auto" FontSize="25" VerticalAlignment="Center" Margin="5"  />
                         <TextBlock Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left"  Text="{x:Static pres:ProjectLocales.LastActions}"  Width="Auto" FontWeight="Bold"  Height="Auto" FontSize="25" VerticalAlignment="Top" Margin="5"  />
 
-                        <Border Grid.Row="2" Grid.Column="3" BorderThickness="1" BorderBrush="LightGray" Style="{StaticResource DefaultBorder}"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="5" Padding="0">
-                            <Rectangle RadiusX="3" RadiusY="3" Width="40" Height="40" Margin="2  ">
-                                <Rectangle.Fill>
-                                    <ImageBrush ImageSource="{Binding CurrentApplication.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}" Stretch="Fill" />
-                                </Rectangle.Fill>
-                            </Rectangle>
+
+                        <Border Grid.Row="2" Grid.Column="3"  Height="70" Width="70" Margin="5"  CornerRadius="{StaticResource CornerRadius}" Background="#FF747474" HorizontalAlignment="Left"/>
+                        <Border Grid.Row="2" Grid.Column="3"  Margin="5" Height="70" Width="70" CornerRadius="{StaticResource CornerRadius}" HorizontalAlignment="Left">
+                            <Border.Background>
+                                <ImageBrush Stretch="Fill" ImageSource="{Binding CurrentApplication.Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>
+                            </Border.Background>
                         </Border>
+
                         <TextBlock Grid.Row="2" Grid.Column="4" Text="{Binding CurrentApplication.DisplayName , FallbackValue={x:Static pres:ProjectLocales.NoApplication}}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
                         <TextBlock Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" Margin="5" Text="{Binding CurrentProfile.Name , FallbackValue={x:Static pres:ProjectLocales.NoProfile}}" TextAlignment="left" Width="Auto" VerticalAlignment="Center" FontSize="15" />
                         <Border  Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="2"  Style="{StaticResource DefaultBorder}"  >

diff --git a/Source/AutoHDR/Views/UWPApplicationDialogView.xaml b/Source/AutoHDR/Views/UWPApplicationDialogView.xaml
@@ -14,14 +14,18 @@
             <StackPanel/>
         </ItemsPanelTemplate>
         <DataTemplate x:Key="ApplicationItemTemplate" DataType="ApplicationItem">
-            <Grid >
+            <Grid  Margin="5">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <Border  CornerRadius="{StaticResource CornerRadius}" Background="#FF747474">
-                    <Image Grid.Column="0" Source="{Binding Icon, Converter={StaticResource BitmapToBitmapImageConverter}}" Width="40" Height="40" Margin="5" Stretch="Fill"></Image>
+                <Border Grid.Column="0"  Height="70" Width="70" Margin="5"  CornerRadius="{StaticResource CornerRadius}" Background="#FF747474" HorizontalAlignment="Left"/>
+                <Border Grid.Column="0"  Margin="5" Height="70" Width="70" CornerRadius="{StaticResource CornerRadius}" HorizontalAlignment="Left">
+                    <Border.Background>
+                        <ImageBrush Stretch="Fill" ImageSource="{Binding Icon, Converter={StaticResource BitmapToBitmapImageConverter}}"/>
+                    </Border.Background>
                 </Border>
+
                 <TextBlock Grid.Column="1" Text="{Binding DisplayName}" Margin="5" FontSize="15"  VerticalAlignment="Center" HorizontalAlignment="Left" />
             </Grid>
         </DataTemplate>
@@ -33,7 +37,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <ListBox  Grid.Row="0" x:Name="ApplicationList" SelectedItem="{Binding ApplicationItem}" HorizontalContentAlignment="Stretch" ItemsPanel="{StaticResource StackListViewTemplate}"  ItemTemplate="{StaticResource ApplicationItemTemplate}" ItemsSource="{Binding UWPApplications}" ScrollViewer.VerticalScrollBarVisibility="Auto"   BorderThickness="0" Margin="0,0,0,5"/>
+        <ListBox  Grid.Row="0" x:Name="ApplicationList" SelectedItem="{Binding ApplicationItem}" ItemContainerStyle="{StaticResource ListBoxItemStyle}" HorizontalContentAlignment="Stretch" ItemsPanel="{StaticResource StackListViewTemplate}"  ItemTemplate="{StaticResource ApplicationItemTemplate}" ItemsSource="{Binding UWPApplications}" ScrollViewer.VerticalScrollBarVisibility="Auto"   BorderThickness="0" Margin="0,0,0,5"/>
 
         <Grid Grid.Row="1" Height="Auto">
             <Grid.ColumnDefinitions>