Merge pull request #2

Merge dev into master
ojemineh · Jun 9, 2021 · 5626790 · 5626790
2 parents 5031962 + c822e39
commit 5626790
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/DayZLootEdit/App.config b/DayZLootEdit/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
 </configuration>
diff --git a/DayZLootEdit/DayZLootEdit.csproj b/DayZLootEdit/DayZLootEdit.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>DayZLootEdit</RootNamespace>
     <AssemblyName>DayZLootEdit</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>0.3.12.%2a</ApplicationVersion>
+    <ApplicationVersion>0.3.13.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/DayZLootEdit/InfoWindow.xaml.cs b/DayZLootEdit/InfoWindow.xaml.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.IO;
+using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Windows;

diff --git a/DayZLootEdit/MainWindow.xaml b/DayZLootEdit/MainWindow.xaml
@@ -258,20 +258,20 @@
             </DockPanel>
         </GroupBox>
 
-        <DataGrid x:Name="LootList" Margin="1,0,1,1" ItemsSource="{Binding LootTable.Loot}" IsEnabled="False" SelectionChanged="LootList_SelectionChanged" Grid.Row="2" HorizontalGridLinesBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" VerticalGridLinesBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" MaxColumnWidth="Infinity" MinColumnWidth="20" AutoGenerateColumns="False">
+        <DataGrid x:Name="LootList" Margin="1,0,1,1" ItemsSource="{Binding LootTable.Loot}" IsEnabled="False" SelectionChanged="LootList_SelectionChanged" Grid.Row="2" HorizontalGridLinesBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" VerticalGridLinesBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" MaxColumnWidth="Infinity" MinColumnWidth="20" AutoGenerateColumns="False" TextOptions.TextFormattingMode="Display">
             <DataGrid.Resources>
                 <Style x:Key="CenterTextStyle" TargetType="TextBlock">
                     <Setter Property="HorizontalAlignment" Value="Center"/>
                 </Style>
             </DataGrid.Resources>
            <DataGrid.Columns>
-                <DataGridTextColumn Binding="{Binding Name}" Header="Classname" Width="260">
+                <DataGridTextColumn Binding="{Binding Name}" Header="Classname" Width="260" IsReadOnly="True">
                     <DataGridTextColumn.HeaderStyle>
                         <Style TargetType="DataGridColumnHeader">
                             <Setter Property="FontWeight" Value="Bold"/>
                             <Setter Property="HorizontalContentAlignment" Value="Left"/>
                             <Setter Property="VerticalContentAlignment" Value="Center"/>
-                            <Setter Property="ToolTipService.ToolTip" Value="Classname of an item."/>
+                            <Setter Property="ToolTipService.ToolTip" Value="Item classname.&#x0a;(ReadOnly)"/>
                             <Setter Property="ToolTipService.ShowDuration" Value="10000"/>
                         </Style>
                     </DataGridTextColumn.HeaderStyle>

diff --git a/DayZLootEdit/Properties/AssemblyInfo.cs b/DayZLootEdit/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("0.3.12.2")]
-[assembly: AssemblyFileVersion("0.3.12.2")]
+[assembly: AssemblyVersion("0.3.13.2")]
+[assembly: AssemblyFileVersion("0.3.13.2")]
diff --git a/DayZLootEdit/Properties/Settings.Designer.cs b/DayZLootEdit/Properties/Settings.Designer.cs