aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-02-17 08:34:33 -0500
committerMichael <[email protected]>2017-02-17 08:34:33 -0500
commit8448ee3479fe210cbf242b83f9e2cff1fd727bcc (patch)
treecf8342068b4c211629126eb98a5ce723161b5a52
parente255c7fd47c2f6e2e12befdc8808e9db8cc8f0d2 (diff)
downloadshiftos_thereturn-8448ee3479fe210cbf242b83f9e2cff1fd727bcc.tar.gz
shiftos_thereturn-8448ee3479fe210cbf242b83f9e2cff1fd727bcc.tar.bz2
shiftos_thereturn-8448ee3479fe210cbf242b83f9e2cff1fd727bcc.zip
No swears. xD
-rw-r--r--ShiftOS.WinForms/Applications/ExperienceShifter.cs5
-rw-r--r--ShiftOS_TheReturn/Commands.cs4
2 files changed, 6 insertions, 3 deletions
diff --git a/ShiftOS.WinForms/Applications/ExperienceShifter.cs b/ShiftOS.WinForms/Applications/ExperienceShifter.cs
index 82706e8..2623b88 100644
--- a/ShiftOS.WinForms/Applications/ExperienceShifter.cs
+++ b/ShiftOS.WinForms/Applications/ExperienceShifter.cs
@@ -42,7 +42,10 @@ namespace ShiftOS.WinForms.Applications
public void PopulateDesktops()
{
lbdesktops.Items.Clear();
- lbdesktops.Items.Add("ShiftOS Desktop");
+ foreach(var desk in Desktop.GetAllDesktops())
+ {
+ lbdesktops.Items.Add(desk.DesktopName);
+ }
}
public void PopulateLaunchers()
diff --git a/ShiftOS_TheReturn/Commands.cs b/ShiftOS_TheReturn/Commands.cs
index acbecce..401d1f3 100644
--- a/ShiftOS_TheReturn/Commands.cs
+++ b/ShiftOS_TheReturn/Commands.cs
@@ -232,7 +232,7 @@ namespace ShiftOS.Engine
#if DEVEL
internal class Rock : Exception
{
- internal Rock() : base("Someone threw a motherfucking rock at the window, and the Terminal fucking shattered.")
+ internal Rock() : base("Someone threw a rock at the window, and the Terminal shattered.")
{
}
@@ -244,7 +244,7 @@ namespace ShiftOS.Engine
[Command("rock", description = "A little surprise for unstable builds...")]
public static bool ThrowAFuckingRock()
{
- Infobox.Show("Fuck.", new Rock().Message);
+ Infobox.Show("He who lives in a glass house shouldn't throw stones...", new Rock().Message);
return false;
}