From fae040a4525e236d2f39f604e143a5f3aa304a12 Mon Sep 17 00:00:00 2001
From: Alexey Yagelo <Jagailo96@gmail.com>
Date: Mon, 9 Jul 2018 01:59:50 +0300
Subject: [PATCH] MessageBox style fix

---
 YAKD/MainWindow.xaml.cs |  5 +++++
 YAKD/YAKD.csproj        | 15 +++++++++++++--
 YAKD/app.manifest       | 31 -------------------------------
 3 files changed, 18 insertions(+), 33 deletions(-)
 delete mode 100644 YAKD/app.manifest

diff --git a/YAKD/MainWindow.xaml.cs b/YAKD/MainWindow.xaml.cs
index 7f57fca..499ad24 100644
--- a/YAKD/MainWindow.xaml.cs
+++ b/YAKD/MainWindow.xaml.cs
@@ -7,6 +7,10 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using YAKD.Utils;
+using MessageBox = System.Windows.Forms.MessageBox;
+using MessageBoxButton = System.Windows.Forms.MessageBoxButtons;
+using MessageBoxImage = System.Windows.Forms.MessageBoxIcon;
+using MessageBoxResult = System.Windows.Forms.DialogResult;
 
 namespace YAKD
 {
@@ -24,6 +28,7 @@ public MainWindow()
             comboBoxFill = false;
             InitializeComponent();
             comboBoxFill = true;
+            System.Windows.Forms.Application.EnableVisualStyles();
             InitializeMainWindow(settings);
             InitializeKeyDisplayerForm(settings);
             keyDisplayerForm.Show();
diff --git a/YAKD/YAKD.csproj b/YAKD/YAKD.csproj
index 23cb294..c56a573 100644
--- a/YAKD/YAKD.csproj
+++ b/YAKD/YAKD.csproj
@@ -27,6 +27,7 @@
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,8 +52,18 @@
   <PropertyGroup>
     <ApplicationIcon>icon48.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <ManifestCertificateThumbprint>5AFB2B472798AC40D3E0055C6695A769785659FF</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>YAKD_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -134,8 +145,8 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="YAKD_TemporaryKey.pfx" />
     <Resource Include="Fonts\Roboto-Regular.ttf" />
-    <None Include="app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/YAKD/app.manifest b/YAKD/app.manifest
deleted file mode 100644
index 4a065d7..0000000
--- a/YAKD/app.manifest
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="YAKD.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
-    </application>
-  </compatibility>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-</assembly>
\ No newline at end of file