aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorwilliam341 <[email protected]>2017-06-18 18:30:28 -0700
committerwilliam341 <[email protected]>2017-06-18 18:30:28 -0700
commitd497555bda7ca99925b96ae0f47ca1bf49a475b3 (patch)
tree207ce8214522b3e596516d96b2fc638c1fec61b8 /ShiftOS.WinForms
parente7d23cc119a581e49e05ccb46b0e02452aa8678f (diff)
downloadshiftos_thereturn-d497555bda7ca99925b96ae0f47ca1bf49a475b3.tar.gz
shiftos_thereturn-d497555bda7ca99925b96ae0f47ca1bf49a475b3.tar.bz2
shiftos_thereturn-d497555bda7ca99925b96ae0f47ca1bf49a475b3.zip
Revert "shiftoes easter egg"
This reverts commit e7d23cc119a581e49e05ccb46b0e02452aa8678f.
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/MainMenu/MainMenu.cs8
-rw-r--r--ShiftOS.WinForms/Properties/Resources.Designer.cs10
-rw-r--r--ShiftOS.WinForms/Properties/Resources.resx3
-rw-r--r--ShiftOS.WinForms/Resources/shiftoes.pngbin34065 -> 0 bytes
-rw-r--r--ShiftOS.WinForms/ShiftOS.WinForms.csproj1
5 files changed, 0 insertions, 22 deletions
diff --git a/ShiftOS.WinForms/MainMenu/MainMenu.cs b/ShiftOS.WinForms/MainMenu/MainMenu.cs
index 043de0f..f6bc833 100644
--- a/ShiftOS.WinForms/MainMenu/MainMenu.cs
+++ b/ShiftOS.WinForms/MainMenu/MainMenu.cs
@@ -110,14 +110,6 @@ namespace ShiftOS.WinForms.MainMenu
currentMenu = flmenu;
CategoryText = Localization.Parse("{MAINMENU_TITLE}");
- //ShiftOeS easter egg
- Random rnd = new Random();
- int RandomNum = rnd.Next(1,100);
- if (RandomNum == 42) //if we find the answer to life, universe and everything than set the logo to shiftoes
- {
- shiftos.Image = Properties.Resources.shiftoes;
- }
-
}
private Random rnd = new Random();
diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs
index cbc60b3..f56285a 100644
--- a/ShiftOS.WinForms/Properties/Resources.Designer.cs
+++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs
@@ -1123,16 +1123,6 @@ namespace ShiftOS.WinForms.Properties {
}
/// <summary>
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- /// </summary>
- internal static System.Drawing.Bitmap shiftoes {
- get {
- object obj = ResourceManager.GetObject("shiftoes", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to [
///// SCREENSAVER
/// {
diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx
index f9b3f4a..5e5555b 100644
--- a/ShiftOS.WinForms/Properties/Resources.resx
+++ b/ShiftOS.WinForms/Properties/Resources.resx
@@ -34615,7 +34615,4 @@
<data name="austmicrotrends" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\austmicrotrends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="shiftoes" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\shiftoes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
</root> \ No newline at end of file
diff --git a/ShiftOS.WinForms/Resources/shiftoes.png b/ShiftOS.WinForms/Resources/shiftoes.png
deleted file mode 100644
index db02b01..0000000
--- a/ShiftOS.WinForms/Resources/shiftoes.png
+++ /dev/null
Binary files differ
diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
index e91bdcc..32594bb 100644
--- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj
+++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj
@@ -900,7 +900,6 @@
<None Include="Resources\ShiftOSFull.png" />
<Content Include="Resources\GuessTheNumber.py" />
<None Include="Resources\mindblow.png" />
- <None Include="Resources\shiftoes.png" />
<Content Include="SystemIcons\iconArtpad.png" />
<Content Include="SystemIcons\iconAudioPlayer.png" />
<Content Include="SystemIcons\iconBitnoteDigger.png" />