Merge pull request #4

Merge dev into master
ojemineh · Jun 9, 2021 · d42db10 · d42db10
2 parents 2026421 + 3b2b920
commit d42db10
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/DayZLootEdit/InfoWindow.xaml b/DayZLootEdit/InfoWindow.xaml
@@ -12,6 +12,6 @@
         <Label Content="Loot Editor" Margin="0,70,0,0" VerticalAlignment="Top" HorizontalContentAlignment="Center" FontSize="22" FontWeight="Bold" VerticalContentAlignment="Center"/>
         <Label x:Name="lblVersion" Content="Version" Margin="0,110,0,0" VerticalAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
         <Label x:Name="lblCopyright" Content="Copyright" Margin="0,130,0,0" VerticalAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
-        <RichTextBox x:Name="rtbCredits" Height="215" Margin="10,175,10,0" VerticalAlignment="Top" Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" AllowDrop="False" IsReadOnly="True" IsUndoEnabled="False" VerticalScrollBarVisibility="Visible" AutoWordSelection="False" TextOptions.TextFormattingMode="Display" AcceptsReturn="False"/>
+        <RichTextBox x:Name="rtbCredits" Height="210" Margin="10,170,10,0" VerticalAlignment="Top" Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" AllowDrop="False" IsReadOnly="True" IsUndoEnabled="False" VerticalScrollBarVisibility="Visible" AutoWordSelection="False" TextOptions.TextFormattingMode="Display" AcceptsReturn="False"/>
     </Grid>
 </Window>
diff --git a/DayZLootEdit/MainWindow.xaml b/DayZLootEdit/MainWindow.xaml
@@ -176,6 +176,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem x:Name="MnuHelp" Header="_?" VerticalAlignment="Top" HorizontalAlignment="Left">
+                <MenuItem x:Name="MnuHelpWiki" Header="_Wiki" Click="MnuHelpWiki_Click"/>
                 <MenuItem x:Name="MnuHelpGitHub" Header="_GitHub" Click="MnuHelpGitHub_Click"/>
                 <Separator/>
                 <MenuItem x:Name="MnuHelpInfo" Header="_Info" HorizontalAlignment="Left" Width="140" Click="MnuHelpInfo_Click"/>

diff --git a/DayZLootEdit/MainWindow.xaml.cs b/DayZLootEdit/MainWindow.xaml.cs
@@ -673,6 +673,12 @@ private void MnuEditClearValue_Click(object sender, RoutedEventArgs e)
 
         // MENU HELP
 
+        private void MnuHelpWiki_Click(object sender, RoutedEventArgs e)
+        {
+            string uriQuery = "https://github.com/ojemineh/DayZLootEdit/wiki";
+            Process.Start(uriQuery);
+        }
+
         private void MnuHelpGitHub_Click(object sender, RoutedEventArgs e)
         {
             string uriQuery = "https://github.com/ojemineh/DayZLootEdit";