aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/Applications/Chat.cs1
-rw-r--r--ShiftOS.WinForms/Applications/Terminal.cs6
-rw-r--r--ShiftOS.WinForms/Resources/Shiftorium.txt5
-rw-r--r--ShiftOS.WinForms/Tools/ControlManager.cs139
-rw-r--r--ShiftOS.WinForms/WinformsDesktop.cs10
5 files changed, 68 insertions, 93 deletions
diff --git a/ShiftOS.WinForms/Applications/Chat.cs b/ShiftOS.WinForms/Applications/Chat.cs
index f9e601f..7a2de81 100644
--- a/ShiftOS.WinForms/Applications/Chat.cs
+++ b/ShiftOS.WinForms/Applications/Chat.cs
@@ -41,6 +41,7 @@ namespace ShiftOS.WinForms.Applications
[WinOpen("simplesrc")]
[Launcher("SimpleSRC Client", false, null, "Networking")]
[DefaultTitle("SimpleSRC Client")]
+ [AppscapeEntry("SimpleSRC", "A simple ShiftOS Relay Chat client that allows you to talk with other ShiftOS users from all over the world.", 300, 145, "file_skimmer", "Networking")]
public partial class Chat : UserControl, IShiftOSWindow
{
public Chat()
diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs
index bfc4425..3d17d35 100644
--- a/ShiftOS.WinForms/Applications/Terminal.cs
+++ b/ShiftOS.WinForms/Applications/Terminal.cs
@@ -504,11 +504,11 @@ namespace ShiftOS.WinForms.Applications
Thread.Sleep(2000);
Console.WriteLine("As you know, ShiftOS doesn't have very many features.");
Thread.Sleep(2000);
- Console.WriteLine("Using the applications you have, I need you to earn 50,000 Codepoints.");
+ Console.WriteLine("Using the applications you have, I need you to earn as many Codepoints as you can.");
Thread.Sleep(2000);
- Console.WriteLine("You can use the Codepoints you earn to buy new applications and features in the Shiftorium, to help earn Codepoints.");
+ Console.WriteLine("You can use the Codepoints you earn to buy new applications and features in the Shiftorium, to help earn even more Codepoints.");
Thread.Sleep(2000);
- Console.WriteLine("Start small, try to earn 500. Once you do, I'll contact you with more details.");
+ Console.WriteLine("Once you earn 1,000 Codepoints, I will check back with you and see how well you've done.");
Thread.Sleep(2000);
Console.WriteLine("I'll leave you to it, you've got the hang of it! One last thing, if ever you find yourself in another program, and want to exit, simply press CTRL+T to return to the Terminal.");
Thread.Sleep(2000);
diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt
index 41b50a7..0eac58e 100644
--- a/ShiftOS.WinForms/Resources/Shiftorium.txt
+++ b/ShiftOS.WinForms/Resources/Shiftorium.txt
@@ -283,7 +283,7 @@
Name: "AL Widget Manager",
Cost: 125,
Description: "Desktop Widgets are a huge advancement in ShiftOS technology, allowing access to system information, and quick control of your system, without even opening a window. However, we still need to be able to modify each widget. This upgrade adds an App Launcher entry for the Desktop Widget Manager.",
- Description: "app_launcher;desktop_widgets",
+ Dependencies: "app_launcher;desktop_widgets",
Category: "GUI"
},
{
@@ -704,7 +704,8 @@
Name: "Artpad",
Cost: 7500,
Category: "Applications",
- Description: "ArtPad is a very extensible tool that allows you to draw images within ShiftOS. Buy this upgrade to gain access to it through win.open{}!"
+ Description: "ArtPad is a very extensible tool that allows you to draw images within ShiftOS. Buy this upgrade to gain access to it through win.open{}!",
+ Dependencies: "color_depth_8_bits"
},
{
Name: "AL Artpad",
diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 1643b23..83ab7fe 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -1,3 +1,5 @@
+#define SLOW_LOCALIZATION
+
/*
* MIT License
*
@@ -144,77 +146,66 @@ namespace ShiftOS.WinForms.Tools
public static void SetupControl(Control ctrl)
{
-
- if (!(ctrl is MenuStrip) && !(ctrl is ToolStrip) && !(ctrl is StatusStrip) && !(ctrl is ContextMenuStrip))
+ Desktop.InvokeOnWorkerThread(() =>
{
- string tag = "";
-
- try
+ if (!(ctrl is MenuStrip) && !(ctrl is ToolStrip) && !(ctrl is StatusStrip) && !(ctrl is ContextMenuStrip))
{
- if(ctrl.Tag != null)
- tag = ctrl.Tag.ToString();
- }
- catch { }
+ string tag = "";
- if (!tag.Contains("keepbg"))
- {
- if (ctrl.BackColor != Control.DefaultBackColor)
+ try
{
- Desktop.InvokeOnWorkerThread(() =>
+ if (ctrl.Tag != null)
+ tag = ctrl.Tag.ToString();
+ }
+ catch { }
+
+ if (!tag.Contains("keepbg"))
+ {
+ if (ctrl.BackColor != Control.DefaultBackColor)
{
ctrl.BackColor = SkinEngine.LoadedSkin.ControlColor;
- });
+ }
}
- }
- if (!tag.Contains("keepfont"))
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (!tag.Contains("keepfont"))
{
ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
ctrl.Font = SkinEngine.LoadedSkin.MainFont;
- });
- if (tag.Contains("header1"))
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (tag.Contains("header1"))
{
- ctrl.Font = SkinEngine.LoadedSkin.HeaderFont;
- });
- }
+ Desktop.InvokeOnWorkerThread(() =>
+ {
+ ctrl.Font = SkinEngine.LoadedSkin.HeaderFont;
+ });
+ }
- if (tag.Contains("header2"))
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (tag.Contains("header2"))
{
ctrl.Font = SkinEngine.LoadedSkin.Header2Font;
- });
- }
+ }
- if (tag.Contains("header3"))
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (tag.Contains("header3"))
{
ctrl.Font = SkinEngine.LoadedSkin.Header3Font;
- });
+ }
}
- }
- try
- {
- string ctrlText = Localization.Parse(ctrl.Text);
- Desktop.InvokeOnWorkerThread(() =>
+ try
+ {
+#if !SLOW_LOCALIZATION
+ if (!string.IsNullOrWhiteSpace(ctrl.Text))
+ {
+ string ctrlText = Localization.Parse(ctrl.Text);
+ ctrl.Text = ctrlText;
+ }
+#endif
+ }
+ catch
{
- ctrl.Text = ctrlText;
- });
- }
- catch
- {
- }
+ }
- if(ctrl is Button)
- {
- Desktop.InvokeOnWorkerThread(() =>
+ if (ctrl is Button)
{
Button b = ctrl as Button;
if (!b.Tag.ToString().ToLower().Contains("keepbg"))
@@ -229,7 +220,7 @@ namespace ShiftOS.WinForms.Tools
b.FlatAppearance.BorderColor = SkinEngine.LoadedSkin.ButtonForegroundColor;
b.ForeColor = SkinEngine.LoadedSkin.ButtonForegroundColor;
}
- if(!b.Tag.ToString().ToLower().Contains("keepfont"))
+ if (!b.Tag.ToString().ToLower().Contains("keepfont"))
b.Font = SkinEngine.LoadedSkin.ButtonTextFont;
Color orig_bg = b.BackColor;
@@ -260,15 +251,12 @@ namespace ShiftOS.WinForms.Tools
b.BackgroundImageLayout = SkinEngine.GetImageLayout("buttonpressed");
};
- });
+ }
}
- if(ctrl is TextBox)
+ if (ctrl is TextBox)
{
- Desktop.InvokeOnWorkerThread(() =>
- {
- (ctrl as TextBox).BorderStyle = BorderStyle.FixedSingle;
- });
+ (ctrl as TextBox).BorderStyle = BorderStyle.FixedSingle;
}
ctrl.KeyDown += (o, a) =>
@@ -286,27 +274,19 @@ namespace ShiftOS.WinForms.Tools
};
if (ctrl is Button)
{
- Desktop.InvokeOnWorkerThread(() =>
- {
- (ctrl as Button).FlatStyle = FlatStyle.Flat;
- });
+ (ctrl as Button).FlatStyle = FlatStyle.Flat;
}
else if (ctrl is WindowBorder)
{
- Desktop.InvokeOnWorkerThread(() =>
- {
- (ctrl as WindowBorder).Setup();
- });
+ (ctrl as WindowBorder).Setup();
}
- }
- Desktop.InvokeOnWorkerThread(() =>
- {
-
MakeDoubleBuffered(ctrl);
+ ControlSetup?.Invoke(ctrl);
});
- ControlSetup?.Invoke(ctrl);
}
+
+
public static event Action<Control> ControlSetup;
public static void MakeDoubleBuffered(Control c)
@@ -330,27 +310,12 @@ namespace ShiftOS.WinForms.Tools
{
Desktop.HideAppLauncher();
};
- ThreadStart ts = () =>
- {
- var ctrls = frm.Controls.ToList();
- for (int i = 0; i < ctrls.Count(); i++)
- {
- SetupControls(ctrls[i]);
- }
- SetupControl(frm);
-
- };
-
- if (runInThread == true)
- {
- var t = new Thread(ts);
- t.IsBackground = true;
- t.Start();
- }
- else
+ var ctrls = frm.Controls.ToList();
+ for (int i = 0; i < ctrls.Count(); i++)
{
- ts?.Invoke();
+ SetupControls(ctrls[i]);
}
+ SetupControl(frm);
}
}
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 6ce8cc9..85eab55 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -202,13 +202,21 @@ namespace ShiftOS.WinForms
{
if (SaveSystem.CurrentSave.Codepoints != lastcp)
lastcp = SaveSystem.CurrentSave.Codepoints;
- if (lastcp >= 10000)
+ if (lastcp >= 2500)
{
if (!Shiftorium.UpgradeInstalled("victortran_shiftnet"))
{
Story.Start("victortran_shiftnet");
}
}
+ if(lastcp >= 5000)
+ {
+ if(Shiftorium.UpgradeInstalled("triwrite") && Shiftorium.UpgradeInstalled("simplesrc") && Shiftorium.UpgradeInstalled("victortran_shiftnet") && Shiftorium.UpgradeInstalled("story_hacker101_breakingthebonds"))
+ {
+ if (!Shiftorium.UpgradeInstalled("story_thefennfamily"))
+ Story.Start("story_thefennfamily");
+ }
+ }
}
} while (!SaveSystem.ShuttingDown);
});
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 11:25:29 +0000