mirror of
https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git
synced 2025-01-22 18:02:16 +00:00
more beta 1.2 stuff
This commit is contained in:
parent
8d72f2c4d4
commit
78a5a4281c
7 changed files with 5 additions and 21 deletions
|
@ -1049,7 +1049,6 @@ namespace ShiftOS.WinForms.Applications
|
|||
case 1:
|
||||
pnlpink1.BackColor = Color.HotPink;
|
||||
pnlpink1.Show();
|
||||
break;
|
||||
pnlpink1.BackColor = Color.DeepPink;
|
||||
pnlpink1.Show();
|
||||
pnlpink2.BackColor = Color.HotPink;
|
||||
|
|
|
@ -243,8 +243,7 @@ namespace ShiftOS.WinForms.Applications
|
|||
}
|
||||
|
||||
private Shop editingShop = null;
|
||||
private string editingShopOldName = "";
|
||||
|
||||
|
||||
public void ShowCreateShop()
|
||||
{
|
||||
this.Invoke(new Action(() =>
|
||||
|
|
|
@ -177,6 +177,7 @@ namespace ShiftOS.WinForms.Applications
|
|||
if (ShiftoriumFrontend.UpgradeInstalled("sl_contributors_wordlist")) comboBox1.Items.Add("Contributors");
|
||||
if (Shiftorium.UpgradeInstalled("sl_operating_systems_wordlist")) comboBox1.Items.Add("Operating Systems");
|
||||
btnrestart.Visible = true;
|
||||
lblword.Left = (this.Width - lblword.Width) / 2;
|
||||
}
|
||||
|
||||
public void OnUpgrade()
|
||||
|
@ -191,7 +192,7 @@ namespace ShiftOS.WinForms.Applications
|
|||
|
||||
public void OnSkinLoad()
|
||||
{
|
||||
|
||||
lblword.Left = (this.Width - lblword.Width) / 2;
|
||||
}
|
||||
|
||||
string lastword = "";
|
||||
|
|
|
@ -187,7 +187,6 @@ namespace ShiftOS.WinForms.Applications
|
|||
|
||||
|
||||
public static event TextSentEventHandler TextSent;
|
||||
public event EventHandler OnComplete;
|
||||
|
||||
public void ResetAllKeywords()
|
||||
{
|
||||
|
|
|
@ -54,15 +54,10 @@ namespace ShiftOS.WinForms
|
|||
string rtext;
|
||||
string gtexttotype;
|
||||
int charcount;
|
||||
int currentletter;
|
||||
int slashcount;
|
||||
int conversationcount = 0;
|
||||
Label textgeninput;
|
||||
bool needtoclose = false;
|
||||
public bool upgraded = false;
|
||||
int hackeffect;
|
||||
int percentcount;
|
||||
|
||||
|
||||
private bool typing = false;
|
||||
|
||||
public void TextType(string texttotype)
|
||||
|
@ -74,7 +69,6 @@ namespace ShiftOS.WinForms
|
|||
|
||||
charcount = texttotype.Length;
|
||||
gtexttotype = texttotype;
|
||||
currentletter = 0;
|
||||
slashcount = 1;
|
||||
foreach (var c in gtexttotype)
|
||||
{
|
||||
|
|
|
@ -194,10 +194,7 @@ namespace ShiftOS.WinForms.Tools
|
|||
}
|
||||
}
|
||||
|
||||
Image dithered = null;
|
||||
|
||||
|
||||
ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
|
||||
ctrl.ForeColor = SkinEngine.LoadedSkin.ControlTextColor;
|
||||
|
||||
ctrl.Font = SkinEngine.LoadedSkin.MainFont;
|
||||
|
||||
|
|
|
@ -48,11 +48,6 @@ namespace ShiftOS.WinForms
|
|||
/// </summary>
|
||||
public partial class WinformsDesktop : Form, IDesktop
|
||||
{
|
||||
/// <summary>
|
||||
/// Occurs when window added.
|
||||
/// </summary>
|
||||
private static event Action<WindowBorder> windowAdded;
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="ShiftOS.WinForms.WinformsDesktop"/> class.
|
||||
/// </summary>
|
||||
|
|
Loading…
Reference in a new issue