From e7d23cc119a581e49e05ccb46b0e02452aa8678f Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 18:21:18 -0700 Subject: shiftoes easter egg --- ShiftOS.WinForms/Resources/shiftoes.png | Bin 0 -> 34065 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ShiftOS.WinForms/Resources/shiftoes.png (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Resources/shiftoes.png b/ShiftOS.WinForms/Resources/shiftoes.png new file mode 100644 index 0000000..db02b01 Binary files /dev/null and b/ShiftOS.WinForms/Resources/shiftoes.png differ -- cgit v1.2.3 From d497555bda7ca99925b96ae0f47ca1bf49a475b3 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 18:30:28 -0700 Subject: Revert "shiftoes easter egg" This reverts commit e7d23cc119a581e49e05ccb46b0e02452aa8678f. --- ShiftOS.WinForms/MainMenu/MainMenu.cs | 8 -------- ShiftOS.WinForms/Properties/Resources.Designer.cs | 10 ---------- ShiftOS.WinForms/Properties/Resources.resx | 3 --- ShiftOS.WinForms/Resources/shiftoes.png | Bin 34065 -> 0 bytes ShiftOS.WinForms/ShiftOS.WinForms.csproj | 1 - 5 files changed, 22 deletions(-) delete mode 100644 ShiftOS.WinForms/Resources/shiftoes.png (limited to 'ShiftOS.WinForms/Resources') 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 @@ -1122,16 +1122,6 @@ namespace ShiftOS.WinForms.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap shiftoes { - get { - object obj = ResourceManager.GetObject("shiftoes", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 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 @@ ..\Resources\austmicrotrends.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shiftoes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - \ 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 Binary files a/ShiftOS.WinForms/Resources/shiftoes.png and /dev/null 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 @@ - -- cgit v1.2.3 From c2620851d390ecb3ef2ddb57696b86b1bd755a15 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 19:24:31 -0700 Subject: Add missing strings --- ShiftOS.WinForms/Resources/strings_en.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Resources/strings_en.txt b/ShiftOS.WinForms/Resources/strings_en.txt index 9e17f11..0a5eb3b 100644 --- a/ShiftOS.WinForms/Resources/strings_en.txt +++ b/ShiftOS.WinForms/Resources/strings_en.txt @@ -54,6 +54,7 @@ "{ERR_HIGHERPERMS}": "That user has more rights than you!", "{ERR_PASSWD_MISMATCH}": "Passwords don't match!", "{ERR_SYNTAXERROR}": "Syntax error.", + "{ERR_COMMANDNOTFOUND}": "Command not found.", //Command results "{RES_ACLUPDATED}": "User permissions updated.", @@ -242,6 +243,28 @@ "{FORMATEDITOR_VALUE_LOWER}": "value", "{FORMATEDITOR_ENTERSYNTAX}": "Enter syntax here", + //Program commands + "{WO_ABOUT}": "about", + "{WO_ADRESSBOOK}": "adress_book", + "{WO_ARTPAD}": "artpad", + "{WO_AUDIOPLAYER}": "audio_player", + "{WO_CALCULATOR}": "calculator", + "{WO_DOWNLOADER}": "downloader", + "{WO_FILESKIMMER}": "file_skimmer", + "{WO_INSTALLER}": "installer", + "{WO_MINDBLOW}": "mindblow", + "{WO_NAMECHANGER}": "name_changer", + "{WO_PONG}": "pong", + "{WO_SHIFTER}": "shifter", + "{WO_SHIFTLETTERS}": "shiftletters", + "{WO_SHIFTLOTTO}": "shiftlotto", + "{WO_SHIFTNET}": "shiftnet", + "{WO_SHIFTORIUM}": "shiftorium", + "{WO_SHIFTSWEEPER}": "shiftsweeper", + "{WO_SIMPLESRC}": "simplesrc", + "{WO_TERMINAL}": "terminal", + "{WO_TEXTPAD}": "textpad", + //BIOS screen text "{MISC_BIOSCOPYRIGHT}": "AMIBIOS (C) %year Australian Microtrends, Plc", "{MISC_BIOSVERSION}": "Shiftsoft 480-L ACPI BIOS Revision 1002", -- cgit v1.2.3 From 8a0e5946048a660a8a490a82193d7dad4fba79d4 Mon Sep 17 00:00:00 2001 From: william341 Date: Sun, 18 Jun 2017 19:32:50 -0700 Subject: derp --- ShiftOS.WinForms/Resources/strings_en.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ShiftOS.WinForms/Resources') diff --git a/ShiftOS.WinForms/Resources/strings_en.txt b/ShiftOS.WinForms/Resources/strings_en.txt index 0a5eb3b..6fc2524 100644 --- a/ShiftOS.WinForms/Resources/strings_en.txt +++ b/ShiftOS.WinForms/Resources/strings_en.txt @@ -245,7 +245,7 @@ //Program commands "{WO_ABOUT}": "about", - "{WO_ADRESSBOOK}": "adress_book", + "{WO_ADDRESSBOOK}": "adress_book", "{WO_ARTPAD}": "artpad", "{WO_AUDIOPLAYER}": "audio_player", "{WO_CALCULATOR}": "calculator", -- cgit v1.2.3