aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-05-12 19:17:47 -0400
committerMichael <[email protected]>2017-05-12 19:17:47 -0400
commitbded9d1250575e6b9824be9048ac7ac8669a303b (patch)
treea0ef631584332088d243bacf4c87f959a821f3a3 /ShiftOS.WinForms
parent2cede571ca23806b68344d9984c11eedaaea76e1 (diff)
downloadshiftos_thereturn-bded9d1250575e6b9824be9048ac7ac8669a303b.tar.gz
shiftos_thereturn-bded9d1250575e6b9824be9048ac7ac8669a303b.tar.bz2
shiftos_thereturn-bded9d1250575e6b9824be9048ac7ac8669a303b.zip
ShiftOS is a hydra.
You pop one bug off, 2,000 more grow in its place.
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/Applications/About.Designer.cs10
-rw-r--r--ShiftOS.WinForms/Applications/About.cs71
-rw-r--r--ShiftOS.WinForms/AudioManager.cs62
-rw-r--r--ShiftOS.WinForms/Program.cs13
-rw-r--r--ShiftOS.WinForms/Properties/Resources.Designer.cs110
-rw-r--r--ShiftOS.WinForms/Properties/Resources.resx39
-rw-r--r--ShiftOS.WinForms/Resources/Ambient1.mp3bin0 -> 5765139 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient2.mp3bin0 -> 5017165 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient3.mp3bin0 -> 6948747 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient4.mp3bin0 -> 6121813 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient5.mp3bin0 -> 6025921 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient6.mp3bin0 -> 5303077 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient7.mp3bin0 -> 8237719 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient8.mp3bin0 -> 8077862 bytes
-rw-r--r--ShiftOS.WinForms/Resources/Ambient9.mp3bin0 -> 3859193 bytes
-rw-r--r--ShiftOS.WinForms/ShiftOS.WinForms.csproj9
16 files changed, 283 insertions, 31 deletions
diff --git a/ShiftOS.WinForms/Applications/About.Designer.cs b/ShiftOS.WinForms/Applications/About.Designer.cs
index ab76eab..989d79b 100644
--- a/ShiftOS.WinForms/Applications/About.Designer.cs
+++ b/ShiftOS.WinForms/Applications/About.Designer.cs
@@ -55,7 +55,7 @@ namespace ShiftOS.WinForms.Applications
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label1 = new System.Windows.Forms.Label();
this.lbshiftit = new System.Windows.Forms.Label();
- this.lbaboutdesc = new System.Windows.Forms.Label();
+ this.lbaboutdesc = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
@@ -94,11 +94,11 @@ namespace ShiftOS.WinForms.Applications
this.lbaboutdesc.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.lbaboutdesc.Location = new System.Drawing.Point(14, 126);
+ this.lbaboutdesc.Location = new System.Drawing.Point(23, 158);
+ this.lbaboutdesc.Multiline = true;
this.lbaboutdesc.Name = "lbaboutdesc";
- this.lbaboutdesc.Size = new System.Drawing.Size(498, 328);
+ this.lbaboutdesc.Size = new System.Drawing.Size(492, 302);
this.lbaboutdesc.TabIndex = 3;
- this.lbaboutdesc.Text = "label2";
//
// About
//
@@ -121,6 +121,6 @@ namespace ShiftOS.WinForms.Applications
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label lbshiftit;
- private System.Windows.Forms.Label lbaboutdesc;
+ private System.Windows.Forms.TextBox lbaboutdesc;
}
}
diff --git a/ShiftOS.WinForms/Applications/About.cs b/ShiftOS.WinForms/Applications/About.cs
index f91e0cc..a27238d 100644
--- a/ShiftOS.WinForms/Applications/About.cs
+++ b/ShiftOS.WinForms/Applications/About.cs
@@ -53,18 +53,73 @@ namespace ShiftOS.WinForms.Applications
lbaboutdesc.Text = $@"ShiftOS
Copyright (c) 2015-{DateTime.Now.Year} Michael VanOverbeek and ShiftOS devs
-Engine version: Milestone 3, 1.0 Beta Series (Developer mode ON)
-Frontend version: 1.0 Beta 1.2
-Multi-user domain version: 1.0 Rolling-Release
-
-Music courtesy of Selulance. Listen to the Fractal Forest album here:
-https://www.youtube.com/watch?v=LB5jAYDL3VU&t=913s
+Engine version: Milestone 4, 1.0 Beta Series (Developer mode ON)
+Frontend version: 1.0 Beta 2.5
+Digital Society version: 1.0 Rolling-Release
+Project: Unite version: 1.0 Beta 1.7
Special thanks to Philip Adams, the original creator of ShiftOS for helping us grow our community of amazing Shifters by featuring us on the YouTube Millionaire series and advertising us throughout various other series ran by him.
Also, thanks to Rylan Arbour, Victor Tran and the other community moderators and administrators for helping us keep the community peaceful.
-Lastly, a huge special thanks to the community themselves - for testing, debugging, fixing, reporting bugs for, and enjoying our game even through its many failures, successes, revamps, etc. You guys are the reason we develop the game!";
+Lastly, a huge special thanks to the community themselves - for testing, debugging, fixing, reporting bugs for, and enjoying our game even through its many failures, successes, revamps, etc. You guys are the reason we develop the game!
+
+ === Licensing information
+
+ShiftOS is licensed under the MIT license.
+
+Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the ""Software""), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+ == Credit where credit is due
+
+ -- Development and staff team:
+ - Rylan Arbour (Lead community administrator)
+ - Victor Tran (Discord administrator)
+ - cjhannah (ShiftFS backend developer)
+ - AShifter (Project: Unite penetration tester)
+ - arencllc (ShiftLetters developer)
+ - Michael VanOverbeek (Lead developer, system administrator, the guy who wrote this text)
+ - fixylol, Nebble, TravisNC, Neptune (Community moderators)
+ - bandic00t_ (Skin Engine stresstesting)
+
+ -- System audio
+
+ - Default system event sounds (Infobox, Network Connecting, System Beeps) are from the original ShiftOS 0.0.x source code.
+ - Ambient music list courtesy of https://www.youtube.com/channel/UC56Qctnsu8wAyvzf4Yx6LIw (ArgoFox | Royalty Free Music)
+
+Tracklist:
+
+ Dylan Hardy - Strangely Unaffected
+Noxive - Home
+Dylan Hardy and Abraham Alberto - Slow Drift
+A Himitsu - Easier To Fade
+Noxive - Resilience
+Wanderflux - Visions
+Aerocity - Cold Weather Kids
+Aether - Wanderlust
+Aerocity - Love Lost
+
+
+Finally, special thanks to our Patreon supporters. Without you guys, our servers wouldn't be running, and you wouldn't be reading this.";
}
public string GetEngineVersion()
@@ -107,7 +162,7 @@ Lastly, a huge special thanks to the community themselves - for testing, debuggi
public bool OnUnload()
{
- return false;
+ return true;
}
public void OnUpgrade()
diff --git a/ShiftOS.WinForms/AudioManager.cs b/ShiftOS.WinForms/AudioManager.cs
index 5c43ac4..eb0e798 100644
--- a/ShiftOS.WinForms/AudioManager.cs
+++ b/ShiftOS.WinForms/AudioManager.cs
@@ -24,8 +24,10 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
namespace ShiftOS.WinForms
@@ -37,5 +39,65 @@ namespace ShiftOS.WinForms
{
}
+
+ internal static byte[] GetRandomSong()
+ {
+ var r = new Random().Next(1, 10);
+ switch (r)
+ {
+ case 1:
+ return Properties.Resources.Ambient1;
+ case 2:
+ return Properties.Resources.Ambient2;
+ case 3:
+ return Properties.Resources.Ambient3;
+ case 4:
+ return Properties.Resources.Ambient4;
+ case 5:
+ return Properties.Resources.Ambient5;
+ case 6:
+ return Properties.Resources.Ambient6;
+ case 7:
+ return Properties.Resources.Ambient7;
+ case 8:
+ return Properties.Resources.Ambient8;
+ default:
+ return Properties.Resources.Ambient9;
+
+ }
+ }
+
+ internal static void StartAmbientLoop()
+ {
+ var athread = new Thread(() =>
+ {
+ MemoryStream str = null;
+ NAudio.Wave.Mp3FileReader mp3 = null;
+ NAudio.Wave.WaveOut o = null;
+ while (!Engine.SaveSystem.ShuttingDown)
+ {
+ str = new MemoryStream(GetRandomSong());
+ mp3 = new NAudio.Wave.Mp3FileReader(str);
+ o = new NAudio.Wave.WaveOut();
+ o.Init(mp3);
+ bool c = false;
+ o.Play();
+ o.PlaybackStopped += (s, a) =>
+ {
+ c = true;
+ };
+ while (!c)
+ Thread.Sleep(10);
+ str.Dispose();
+ o.Dispose();
+ mp3.Dispose();
+ }
+ str?.Dispose();
+ o?.Dispose();
+ mp3?.Dispose();
+ });
+ athread.IsBackground = true;
+ athread.Start();
+ }
}
}
diff --git a/ShiftOS.WinForms/Program.cs b/ShiftOS.WinForms/Program.cs
index ad8fc83..256894d 100644
--- a/ShiftOS.WinForms/Program.cs
+++ b/ShiftOS.WinForms/Program.cs
@@ -49,6 +49,19 @@ namespace ShiftOS.WinForms
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
//if ANYONE puts code before those two winforms config lines they will be declared a drunky. - Michael
+ SaveSystem.PreDigitalSocietyConnection += () =>
+ {
+ Action completed = null;
+ completed = () =>
+ {
+ SaveSystem.Ready = true;
+ Engine.AudioManager.PlayCompleted -= completed;
+ AudioManager.StartAmbientLoop();
+ };
+ Engine.AudioManager.PlayCompleted += completed;
+ Engine.AudioManager.PlayStream(Properties.Resources.dial_up_modem_02);
+
+ };
LoginManager.Init(new GUILoginFrontend());
CrashHandler.SetGameMetadata(Assembly.GetExecutingAssembly());
SkinEngine.SetIconProber(new ShiftOSIconProvider());
diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs
index caaf503..0152be8 100644
--- a/ShiftOS.WinForms/Properties/Resources.Designer.cs
+++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs
@@ -70,6 +70,96 @@ namespace ShiftOS.WinForms.Properties {
}
/// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient1 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient1", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient2 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient2", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient3 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient3", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient4 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient4", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient5 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient5", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient6 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient6", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient7 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient7", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient8 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient8", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized resource of type System.Byte[].
+ /// </summary>
+ internal static byte[] Ambient9 {
+ get {
+ object obj = ResourceManager.GetObject("Ambient9", resourceCulture);
+ return ((byte[])(obj));
+ }
+ }
+
+ /// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ArtPadcirclerubber {
@@ -994,22 +1084,18 @@ namespace ShiftOS.WinForms.Properties {
/// <summary>
/// Looks up a localized string similar to [
- /// //TEMPORARY
- /// {
- /// Name: &quot;Desktop Widgets&quot;,
- /// Cost: 0,
- /// Description: &quot;Temporary upgrade. Will be replaced by either a Shiftnet app or a story element.&quot;,
- /// Dependencies: &quot;advanced_app_launcher;wm_free_placement&quot;,
- /// Category: &quot;Work-in-progress&quot;
- /// },
- ///
- ///
- ///
///// SCREENSAVER
/// {
/// Name: &quot;Screensavers&quot;,
/// Cost: 750,
- /// Description: &quot;Like to leave your PC idle for long periods of time? Save some energy and keep your screen from being tired by hiding the desktop behind a black screen with an image on it.&quot; [rest of string was truncated]&quot;;.
+ /// Description: &quot;Like to leave your PC idle for long periods of time? Save some energy and keep your screen from being tired by hiding the desktop behind a black screen with an image on it.&quot;,
+ /// Dependencies: &quot;desktop&quot;,
+ /// Category: &quot;Enhancements&quot;,
+ /// },
+ /// {
+ /// Name: &quot;GUI Based Login Screen&quot;,
+ /// Cost: 500,
+ /// Description: &quot;Tired of using the text-based login screen in ShiftOS? Well, we have a functioning window manager, and a functioning desktop, w [rest of string was truncated]&quot;;.
/// </summary>
internal static string Shiftorium {
get {
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx
index 688bcac..a90e69b 100644
--- a/ShiftOS.WinForms/Properties/Resources.resx
+++ b/ShiftOS.WinForms/Properties/Resources.resx
@@ -122,7 +122,7 @@
AAEAAAD/////AQAAAAAAAAAEAQAAABZTeXN0ZW0uSU8uTWVtb3J5U3RyZWFtCgAAAAdfYnVmZmVyB19v
cmlnaW4JX3Bvc2l0aW9uB19sZW5ndGgJX2NhcGFjaXR5C19leHBhbmRhYmxlCV93cml0YWJsZQpfZXhw
b3NhYmxlB19pc09wZW4dTWFyc2hhbEJ5UmVmT2JqZWN0K19faWRlbnRpdHkHAAAAAAAAAAACAggICAgB
- AQEBCQIAAAAAAAAAAAAAAJKjAACSowAAAAEAAQoPAgAAAJKjAAACUklGRoqjAABXQVZFZm10IBAAAAAB
+ AQEBCQIAAAAAAAAAkqMAAJKjAACSowAAAAEAAQoPAgAAAJKjAAACUklGRoqjAABXQVZFZm10IBAAAAAB
AAEARKwAAIhYAQACABAAZGF0YWajAAABAP7/AgD9/wMA/f8DAPz/BAD8/wQA/f8BAP//AAABAAAA//8C
AP3/BAD9/wIAAAD//wIA//8BAAAAAAABAP//AQAAAAEAAAACAP7/AQABAAAAAQAAAAEAAAACAP7/AwD+
/wIAAAD//wIA/v8DAP7/AwD9/wMA//8AAAIA/f8DAAAA//8BAAAA/v8CAP////8CAPz/BAD8/wMA/f8A
@@ -838,7 +838,7 @@
AAEAAAD/////AQAAAAAAAAAEAQAAABZTeXN0ZW0uSU8uTWVtb3J5U3RyZWFtCgAAAAdfYnVmZmVyB19v
cmlnaW4JX3Bvc2l0aW9uB19sZW5ndGgJX2NhcGFjaXR5C19leHBhbmRhYmxlCV93cml0YWJsZQpfZXhw
b3NhYmxlB19pc09wZW4dTWFyc2hhbEJ5UmVmT2JqZWN0K19faWRlbnRpdHkHAAAAAAAAAAACAggICAgB
- AQEBCQIAAAAAAAAAAAAAAEwYAABMGAAAAAEAAQoPAgAAAEwYAAACUklGRkQYAABXQVZFZm10IBAAAAAB
+ AQEBCQIAAAAAAAAATBgAAEwYAABMGAAAAAEAAQoPAgAAAEwYAAACUklGRkQYAABXQVZFZm10IBAAAAAB
AAEARKwAAIhYAQACABAAZGF0YSAYAAD/X5Vil2TRZUJmF2ZLZadjS2FqXt9aj1awUVtMc0b4PyQ57DFS
KmUiSxoDEo4JEQGO+Bzwweee35zX9c+pyK7BGLsYtZqvlqoipneiW5/YnBCbFZq3mfOZEJvknD6fSqIg
poaqcK/rtAq7i8FvyMrPgNdo347n7e9h+N8AXwnPERoaQSIlKrcx+zjmP0lGKUykUYJWs1pKXlJhpWMl
@@ -964,7 +964,7 @@
<value>..\Resources\SweeperNormalFace.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="strings_en" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\strings_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+ <value>..\Resources\strings_en.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
</data>
<data name="SweeperTile5" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SweeperTile5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -974,7 +974,7 @@
AAEAAAD/////AQAAAAAAAAAEAQAAABZTeXN0ZW0uSU8uTWVtb3J5U3RyZWFtCgAAAAdfYnVmZmVyB19v
cmlnaW4JX3Bvc2l0aW9uB19sZW5ndGgJX2NhcGFjaXR5C19leHBhbmRhYmxlCV93cml0YWJsZQpfZXhw
b3NhYmxlB19pc09wZW4dTWFyc2hhbEJ5UmVmT2JqZWN0K19faWRlbnRpdHkHAAAAAAAAAAACAggICAgB
- AQEBCQIAAAAAAAAAAAAAAPwBHgD8AR4AAAEAAQoPAgAAAPwBHgACUklGRvQBHgBXQVZFZm10IBAAAAAB
+ AQEBCQIAAAAAAAAA/AEeAPwBHgD8AR4AAAEAAQoPAgAAAPwBHgACUklGRvQBHgBXQVZFZm10IBAAAAAB
AAIAgLsAAADuAgAEABAATElTVBQAAABJTkZPSUFSVAgAAABQaGlsaXAAAGRhdGG0AR4A//8CAAwA5v8a
APT/8P8sAMf/OADX/xoA5v8bAPL/8/8aAOb/DQAOANb/KgDk/w4AAQDh/zwAt/9HAMj/GwACAPH/DgDy
/w0AAQDy/xwA1f8sAO//5v84ALn/OQDk//7/AwD+/xAA4v8dANX/LADw//T/GgDl/w4AAADx/x4A4f8R
@@ -33831,7 +33831,7 @@
AAEAAAD/////AQAAAAAAAAAEAQAAABZTeXN0ZW0uSU8uTWVtb3J5U3RyZWFtCgAAAAdfYnVmZmVyB19v
cmlnaW4JX3Bvc2l0aW9uB19sZW5ndGgJX2NhcGFjaXR5C19leHBhbmRhYmxlCV93cml0YWJsZQpfZXhw
b3NhYmxlB19pc09wZW4dTWFyc2hhbEJ5UmVmT2JqZWN0K19faWRlbnRpdHkHAAAAAAAAAAACAggICAgB
- AQEBCQIAAAAAAAAAAAAAAPBWAADwVgAAAAEAAQoPAgAAAPBWAAACUklGRuhWAABXQVZFZm10IBAAAAAB
+ AQEBCQIAAAAAAAAA8FYAAPBWAADwVgAAAAEAAQoPAgAAAPBWAAACUklGRuhWAABXQVZFZm10IBAAAAAB
AAEARKwAAIhYAQACABAAZGF0YcRWAAAAAGQL6gtkDL8MEA3kDLUMaAwUDKULKwuYCvcJQAl4CJ0Hrwaw
BaAEfgNQAg4Bwf9p/v/8mfsn+rD4OPe59T/0wPJH8dPvYu7+7JzrTeoG6dLnreaX5Z/kruPl4jHinOEk
4cTgh+Bl4GLgguDC4B7hpeFC4g3j7uP35B/mZufO6FXq9eu67ZHviPGT87L15/cr+oL84f5QAcMDPwa9
@@ -34456,7 +34456,7 @@
AAEAAAD/////AQAAAAAAAAAEAQAAABZTeXN0ZW0uSU8uTWVtb3J5U3RyZWFtCgAAAAdfYnVmZmVyB19v
cmlnaW4JX3Bvc2l0aW9uB19sZW5ndGgJX2NhcGFjaXR5C19leHBhbmRhYmxlCV93cml0YWJsZQpfZXhw
b3NhYmxlB19pc09wZW4dTWFyc2hhbEJ5UmVmT2JqZWN0K19faWRlbnRpdHkHAAAAAAAAAAACAggICAgB
- AQEBCQIAAAAAAAAAAAAAAIwWAACMFgAAAAEAAQoPAgAAAIwWAAACUklGRoQWAABXQVZFZm10IBAAAAAB
+ AQEBCQIAAAAAAAAAjBYAAIwWAACMFgAAAAEAAQoPAgAAAIwWAAACUklGRoQWAABXQVZFZm10IBAAAAAB
AAEARKwAAIhYAQACABAAZGF0YWAWAAAAAKYLIxdYIhQtQjexQFBJ81CUVwddTmFLZP9lXmZqZSRjl1/J
WtFUu02mRao84jJzKHsdJRKPBub6TO/q4+XYZM6FxG67ObMCrOel8aA9ncuar5nimWybQZ5eoq+nKa6t
tTC+hcec0U3cbefr8on+MQq6FfQgxSsFNo8/R0gRUMpWblzSYAFk2WVlZpxlfmMbYHJboVWsTrdG1D0l
@@ -34573,4 +34573,31 @@
<data name="SuperDesk screenshot" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\SuperDesk screenshot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="Ambient1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient1.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient2.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient3.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient4.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient5.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient6.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient7" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient7.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient8" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient8.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="Ambient9" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Ambient9.mp3;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
</root> \ No newline at end of file
diff --git a/ShiftOS.WinForms/Resources/Ambient1.mp3 b/ShiftOS.WinForms/Resources/Ambient1.mp3
new file mode 100644
index 0000000..d623b29
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient1.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient2.mp3 b/ShiftOS.WinForms/Resources/Ambient2.mp3
new file mode 100644
index 0000000..b16e72f
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient2.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient3.mp3 b/ShiftOS.WinForms/Resources/Ambient3.mp3
new file mode 100644
index 0000000..cf06069
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient3.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient4.mp3 b/ShiftOS.WinForms/Resources/Ambient4.mp3
new file mode 100644
index 0000000..7813b4f
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient4.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient5.mp3 b/ShiftOS.WinForms/Resources/Ambient5.mp3
new file mode 100644
index 0000000..521330e
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient5.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient6.mp3 b/ShiftOS.WinForms/Resources/Ambient6.mp3
new file mode 100644
index 0000000..86cb4a4
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient6.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient7.mp3 b/ShiftOS.WinForms/Resources/Ambient7.mp3
new file mode 100644
index 0000000..9c5047a
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient7.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient8.mp3 b/ShiftOS.WinForms/Resources/Ambient8.mp3
new file mode 100644
index 0000000..ac908b6
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient8.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/Resources/Ambient9.mp3 b/ShiftOS.WinForms/Resources/Ambient9.mp3
new file mode 100644
index 0000000..46cb670
--- /dev/null
+++ b/ShiftOS.WinForms/Resources/Ambient9.mp3
Binary files differ
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index 411d701..1079203 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -757,6 +757,15 @@
<None Include="Resources\ShiftnetServices.txt" />
<None Include="Resources\3beepvirus.wav" />
<None Include="Resources\dial-up-modem-02.wav" />
+ <None Include="Resources\Ambient1.mp3" />
+ <None Include="Resources\Ambient2.mp3" />
+ <None Include="Resources\Ambient3.mp3" />
+ <None Include="Resources\Ambient4.mp3" />
+ <None Include="Resources\Ambient5.mp3" />
+ <None Include="Resources\Ambient6.mp3" />
+ <None Include="Resources\Ambient7.mp3" />
+ <None Include="Resources\Ambient8.mp3" />
+ <None Include="Resources\Ambient9.mp3" />
<Content Include="Resources\fileiconcf.bmp" />
<None Include="Resources\infobox.wav" />
<None Include="Resources\typesound.wav" />