Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge dev into master #2

Merged
merged 4 commits into from
Jun 9, 2021
Merged

Merge dev into master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c8f33c
Changed to .NET Framework 4.7.2
ojemineh Jun 9, 2021
25028c2
update AssemblyInfo.cs
ojemineh Jun 9, 2021
06219e3
change classname in datagrid to readonly
ojemineh Jun 9, 2021
c822e39
unnecessary using directives deleted
ojemineh Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DayZLootEdit/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 2 additions & 2 deletions DayZLootEdit/DayZLootEdit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions DayZLootEdit/InfoWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Diagnostics;
using System.IO;
using System.IO;
using System.Reflection;
using System.Text;
using System.Windows;
Expand Down
6 changes: 3 additions & 3 deletions DayZLootEdit/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions DayZLootEdit/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
2 changes: 1 addition & 1 deletion DayZLootEdit/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.