aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Engine
diff options
context:
space:
mode:
authorAlex-TIMEHACK <[email protected]>2017-05-20 09:46:20 +0100
committerGitHub <[email protected]>2017-05-20 09:46:20 +0100
commitb9857d7aa6ed8d9b04e43e1ccf1342a62ca25a52 (patch)
treebbae7eed32ad4c2d1bbbd05ed127611d27dc0fb5 /TimeHACK.Engine
parentd9fa6d11aa4889ba4538b00ef56d03da78664025 (diff)
parentca9d46fea66dd3a0878fb11469156ab1c57c0fb0 (diff)
downloadhistacom2-b9857d7aa6ed8d9b04e43e1ccf1342a62ca25a52.tar.gz
histacom2-b9857d7aa6ed8d9b04e43e1ccf1342a62ca25a52.tar.bz2
histacom2-b9857d7aa6ed8d9b04e43e1ccf1342a62ca25a52.zip
Merge pull request #72 from Alex-TIMEHACK/master
Added my Address Book!
Diffstat (limited to 'TimeHACK.Engine')
-rw-r--r--TimeHACK.Engine/WindowManager.cs8
-rw-r--r--TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dllbin188928 -> 188928 bytes
-rw-r--r--TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdbbin58880 -> 58880 bytes
-rw-r--r--TimeHACK.Engine/bin/Release/TimeHACK.Engine.dllbin187392 -> 187392 bytes
-rw-r--r--TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdbbin54784 -> 54784 bytes
-rw-r--r--TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache2
-rw-r--r--TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cachebin9194 -> 9506 bytes
-rw-r--r--TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dllbin5632 -> 5632 bytes
-rw-r--r--TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt35
-rw-r--r--TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cachebin2531 -> 2245 bytes
-rw-r--r--TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cachebin10649 -> 17085 bytes
-rw-r--r--TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dllbin188928 -> 188928 bytes
-rw-r--r--TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdbbin58880 -> 58880 bytes
-rw-r--r--TimeHACK.Engine/obj/Release/CoreCompileInputs.cache2
-rw-r--r--TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cachebin868 -> 0 bytes
-rw-r--r--TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cachebin9198 -> 0 bytes
-rw-r--r--TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cachebin2531 -> 2245 bytes
-rw-r--r--TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cachebin36355 -> 10673 bytes
-rw-r--r--TimeHACK.Engine/obj/Release/TimeHACK.Engine.dllbin187392 -> 187392 bytes
-rw-r--r--TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdbbin54784 -> 54784 bytes
20 files changed, 17 insertions, 30 deletions
diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs
index 6bb7cc5..2d5ef8a 100644
--- a/TimeHACK.Engine/WindowManager.cs
+++ b/TimeHACK.Engine/WindowManager.cs
@@ -10,7 +10,7 @@ namespace TimeHACK.Engine
{
public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection();
- public WinClassic startWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton)
+ public WinClassic startWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton, Boolean ShowApplicationAsDialog = false)
{
// Setup Window
WinClassic app = new WinClassic();
@@ -64,13 +64,11 @@ namespace TimeHACK.Engine
// Set some values (for the taskbar)
app.Tag = TaskBarController.AvalibleApplicationID;
- app.Text = title;
+ app.Text = title;
// Show the app
- app.Show();
- app.BringToFront();
app.TopMost = true;
-
+ if (ShowApplicationAsDialog == false) { app.Show(); } else { app.ShowDialog(); }
return app;
}
diff --git a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll
index 6e0ba56..a041063 100644
--- a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll
+++ b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll
Binary files differ
diff --git a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb
index aae1682..7d98108 100644
--- a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb
+++ b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb
Binary files differ
diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll
index 98fd3ab..86d9598 100644
--- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll
+++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll
Binary files differ
diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb
index 6ce7cf7..10716d1 100644
--- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb
+++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb
Binary files differ
diff --git a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
index 96fd122..fc241b3 100644
--- a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
+++ b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache
@@ -1 +1 @@
-3f61991ca0a199db0f3858a95c8b02e5ed247a5c
+34172df9cedd638ac7a23f9204409797a1d64c7b
diff --git a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 4360763..c2faf9c 100644
--- a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
index fc9ddba..3b060b6 100644
--- a/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
+++ b/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
Binary files differ
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt
index 7769ac5..4854434 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt
@@ -1,23 +1,12 @@
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\Newtonsoft.Json.dll
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Win9XBSOD.resources
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.AboutBox95.resources
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Infobox95.resources
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
-C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\Newtonsoft.Json.dll
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csprojResolveAssemblyReference.cache
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Win9XBSOD.resources
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.AboutBox95.resources
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Infobox95.resources
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
-C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\bin\Debug\Newtonsoft.Json.dll
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csprojResolveAssemblyReference.cache
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Win9XBSOD.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.AboutBox95.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Infobox95.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll
+I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache
index ced1d07..c63151a 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache
Binary files differ
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
index 7bb033a..97183e6 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache
Binary files differ
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
index 6e0ba56..a041063 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll
Binary files differ
diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
index aae1682..7d98108 100644
--- a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
+++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb
Binary files differ
diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
index 96fd122..fc241b3 100644
--- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
+++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
@@ -1 +1 @@
-3f61991ca0a199db0f3858a95c8b02e5ed247a5c
+34172df9cedd638ac7a23f9204409797a1d64c7b
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
deleted file mode 100644
index 53f448c..0000000
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache
+++ /dev/null
Binary files differ
diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 8c43f58..0000000
--- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
index 920378c..c63151a 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
Binary files differ
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
index bcddc18..138bee0 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
Binary files differ
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
index 98fd3ab..86d9598 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
Binary files differ
diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
index 6ce7cf7..10716d1 100644
--- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
+++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
Binary files differ