From 281382f120dcaba79b082d010771e193d7a6e9cc Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 11:52:38 -0500 Subject: ShiftSweeper basics --- ShiftOS.WinForms/Applications/ShiftSweeper.cs | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 ShiftOS.WinForms/Applications/ShiftSweeper.cs (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs new file mode 100644 index 0000000..c61f3eb --- /dev/null +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using ShiftOS.Engine; + +namespace ShiftOS.WinForms.Applications +{ + [Launcher("ShiftSweeper", false, null, "Games")] + [RequiresUpgrade("shiftsweeper")] + [WinOpen("shiftsweeper")] + [DefaultIcon("iconShiftSweeper")] + public partial class ShiftSweeper : UserControl, IShiftOSWindow + { + private bool gameplayed = false; + + public ShiftSweeper() + { + InitializeComponent(); + } + + public void OnLoad() + { + + } + + public void OnSkinLoad() { } + + public bool OnUnload() { return true; } + + public void OnUpgrade() + { + + } + } +} -- cgit v1.2.3 From 4fba2d86af9c960fb78b1c0a912b6371f21b487d Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 13:36:01 -0500 Subject: setting up minefield --- .../Applications/ShiftSweeper.Designer.cs | 64 ++++++++++++++++------ ShiftOS.WinForms/Applications/ShiftSweeper.cs | 27 ++++++++- ShiftOS.WinForms/Resources/Shiftorium.txt | 6 ++ ShiftOS.WinForms/ShiftOS.WinForms.csproj | 27 +++++++-- 4 files changed, 98 insertions(+), 26 deletions(-) (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index 1b75d75..f5d7ddd 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -29,10 +29,11 @@ private void InitializeComponent() { this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.minefieldPanel = new System.Windows.Forms.TableLayoutPanel(); this.buttonE = new System.Windows.Forms.Button(); this.buttonM = new System.Windows.Forms.Button(); this.buttonH = new System.Windows.Forms.Button(); + this.lblmines = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -40,24 +41,38 @@ // this.pictureBox1.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace; this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pictureBox1.Location = new System.Drawing.Point(110, 3); + this.pictureBox1.Location = new System.Drawing.Point(150, 3); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(32, 32); this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // - // tableLayoutPanel1 + // minefieldPanel // - this.tableLayoutPanel1.ColumnCount = 2; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 39); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(244, 215); - this.tableLayoutPanel1.TabIndex = 1; + this.minefieldPanel.ColumnCount = 9; + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.Location = new System.Drawing.Point(4, 40); + this.minefieldPanel.Name = "minefieldPanel"; + this.minefieldPanel.RowCount = 9; + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.minefieldPanel.Size = new System.Drawing.Size(329, 215); + this.minefieldPanel.TabIndex = 1; // // buttonE // @@ -67,10 +82,11 @@ this.buttonE.TabIndex = 2; this.buttonE.Text = "Easy"; this.buttonE.UseVisualStyleBackColor = true; + this.buttonE.Click += new System.EventHandler(this.buttonE_Click); // // buttonM // - this.buttonM.Location = new System.Drawing.Point(86, 261); + this.buttonM.Location = new System.Drawing.Point(129, 261); this.buttonM.Name = "buttonM"; this.buttonM.Size = new System.Drawing.Size(75, 23); this.buttonM.TabIndex = 3; @@ -79,35 +95,47 @@ // // buttonH // - this.buttonH.Location = new System.Drawing.Point(168, 261); + this.buttonH.Location = new System.Drawing.Point(258, 261); this.buttonH.Name = "buttonH"; this.buttonH.Size = new System.Drawing.Size(75, 23); this.buttonH.TabIndex = 4; this.buttonH.Text = "Hard"; this.buttonH.UseVisualStyleBackColor = true; // + // lblmines + // + this.lblmines.AutoSize = true; + this.lblmines.Location = new System.Drawing.Point(188, 3); + this.lblmines.Name = "lblmines"; + this.lblmines.Size = new System.Drawing.Size(47, 13); + this.lblmines.TabIndex = 5; + this.lblmines.Text = "Mines: 0"; + // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblmines); this.Controls.Add(this.buttonH); this.Controls.Add(this.buttonM); this.Controls.Add(this.buttonE); - this.Controls.Add(this.tableLayoutPanel1); + this.Controls.Add(this.minefieldPanel); this.Controls.Add(this.pictureBox1); this.Name = "ShiftSweeper"; - this.Size = new System.Drawing.Size(275, 333); + this.Size = new System.Drawing.Size(366, 328); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.TableLayoutPanel minefieldPanel; private System.Windows.Forms.Button buttonE; private System.Windows.Forms.Button buttonM; private System.Windows.Forms.Button buttonH; + private System.Windows.Forms.Label lblmines; } } diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index c61f3eb..d7c22b4 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -11,13 +11,14 @@ using ShiftOS.Engine; namespace ShiftOS.WinForms.Applications { - [Launcher("ShiftSweeper", false, null, "Games")] + [Launcher("ShiftSweeper", true, "shiftsweeper", "Games")] [RequiresUpgrade("shiftsweeper")] [WinOpen("shiftsweeper")] [DefaultIcon("iconShiftSweeper")] public partial class ShiftSweeper : UserControl, IShiftOSWindow { private bool gameplayed = false; + private int mineCount = 0; public ShiftSweeper() { @@ -26,7 +27,9 @@ namespace ShiftOS.WinForms.Applications public void OnLoad() { - + buttonE.Visible = true; + buttonM.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_medium"); + buttonH.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_hard"); } public void OnSkinLoad() { } @@ -37,5 +40,25 @@ namespace ShiftOS.WinForms.Applications { } + + private void buttonE_Click(object sender, EventArgs e) + { + startGame(0); + } + + private void startGame(int d) + { + switch (d) + { + case 0: + mineCount = 10; + minefieldPanel.ColumnCount = 9; + minefieldPanel.RowCount = 9; + break; + + default: + throw new NullReferenceException(); + } + } } } diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 1c8ca17..dccbd9d 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -794,4 +794,10 @@ Dependencies: "shiftsweeper", Description: "ShiftSweeper getting too easy? Obviously, since you can only play Easy difficulty! However, with this Medium button, you can get a better challenge, and more codepoints!" }, + { + Name: "ShiftSweeper Hard", + Cost: 900, + Dependencies: "shiftsweeper_medium", + Description: "Is ShiftSweeper still too easy for you? Buy the Hard difficulty and you can try to find 99 mines! It may be extremely difficult, but the reward is massive!" + }, ] \ No newline at end of file diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index e458704..1802675 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -178,6 +178,12 @@ ShiftoriumFrontend.cs + + UserControl + + + ShiftSweeper.cs + UserControl @@ -239,6 +245,11 @@ Oobe.cs + + True + True + Resources.resx + @@ -322,6 +333,9 @@ ShiftoriumFrontend.cs + + ShiftSweeper.cs + ShopItemCreator.cs @@ -345,14 +359,9 @@ ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - WindowBorder.cs @@ -528,6 +537,10 @@ + + + + @@ -551,8 +564,10 @@ + + -- cgit v1.2.3 From c49c7ac9c68a1815910a80afc45b43e05009137f Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 15:02:40 -0500 Subject: more shiftsweeper stuffs --- ShiftOS.WinForms/Applications/ShiftSweeper.cs | 53 ++++++++++ ShiftOS.WinForms/Properties/Resources.Designer.cs | 120 ++++++++++++++++++++++ ShiftOS.WinForms/Properties/Resources.resx | 36 +++++++ ShiftOS.WinForms/Resources/SweeperTile0.png | Bin 0 -> 259 bytes ShiftOS.WinForms/Resources/SweeperTile1.png | Bin 0 -> 285 bytes ShiftOS.WinForms/Resources/SweeperTile2.png | Bin 0 -> 286 bytes ShiftOS.WinForms/Resources/SweeperTile3.png | Bin 0 -> 284 bytes ShiftOS.WinForms/Resources/SweeperTile4.png | Bin 0 -> 285 bytes ShiftOS.WinForms/Resources/SweeperTile5.png | Bin 0 -> 287 bytes ShiftOS.WinForms/Resources/SweeperTile6.png | Bin 0 -> 292 bytes ShiftOS.WinForms/Resources/SweeperTile7.png | Bin 0 -> 282 bytes ShiftOS.WinForms/Resources/SweeperTile8.png | Bin 0 -> 293 bytes ShiftOS.WinForms/Resources/SweeperTileBlock.png | Bin 0 -> 185 bytes ShiftOS.WinForms/Resources/SweeperTileBomb.png | Bin 0 -> 284 bytes ShiftOS.WinForms/Resources/SweeperTileFlag.png | Bin 0 -> 243 bytes 15 files changed, 209 insertions(+) create mode 100644 ShiftOS.WinForms/Resources/SweeperTile0.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile1.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile2.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile3.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile4.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile5.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile6.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile7.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTile8.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTileBlock.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTileBomb.png create mode 100644 ShiftOS.WinForms/Resources/SweeperTileFlag.png (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index d7c22b4..70c69d7 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -19,6 +19,7 @@ namespace ShiftOS.WinForms.Applications { private bool gameplayed = false; private int mineCount = 0; + private int[,] minemap; public ShiftSweeper() { @@ -59,6 +60,58 @@ namespace ShiftOS.WinForms.Applications default: throw new NullReferenceException(); } + makegrid(); + } + + private void makegrid() + { + Random rnd1 = new Random(); + minemap = new int[minefieldPanel.ColumnCount, minefieldPanel.RowCount]; + + for (int x = 0; x < minefieldPanel.ColumnCount; x++) + { + for (int y = 0; y < minefieldPanel.RowCount; y++) + { + minemap[x, y] = 0; + minefieldPanel.Controls.Add(makeButton(x, y), x, y); + } + } + } + + private Button makeButton(int col, int row) + { + Button bttn = new Button(); + + bttn.Text = ""; + bttn.Name = col.ToString() + " " + row.ToString(); + Controls.AddRange(new System.Windows.Forms.Control[] { bttn, }); + bttn.Click += new System.EventHandler(bttnOnclick); + bttn.MouseDown += new MouseEventHandler(mouseDwn); + bttn.MouseUp += new MouseEventHandler(mauseUp); + bttn.MouseHover += new EventHandler(mauseHov); + bttn.BackgroundImage = Properties.Resources.SweeperTileBlock; + + return bttn; + } + + private void mauseHov(object sender, EventArgs e) + { + pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; + } + + private void mauseUp(object sender, MouseEventArgs e) + { + pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; + } + + private void mouseDwn(object sender, EventArgs e) + { + pictureBox1.BackgroundImage = Properties.Resources.SweeperClickFace; + } + + private void bttnOnclick(object sender, EventArgs e) + { + } } } diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index 05c6c07..beef6ff 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -1026,6 +1026,126 @@ namespace ShiftOS.WinForms.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile0 { + get { + object obj = ResourceManager.GetObject("SweeperTile0", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile1 { + get { + object obj = ResourceManager.GetObject("SweeperTile1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile2 { + get { + object obj = ResourceManager.GetObject("SweeperTile2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile3 { + get { + object obj = ResourceManager.GetObject("SweeperTile3", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile4 { + get { + object obj = ResourceManager.GetObject("SweeperTile4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile5 { + get { + object obj = ResourceManager.GetObject("SweeperTile5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile6 { + get { + object obj = ResourceManager.GetObject("SweeperTile6", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile7 { + get { + object obj = ResourceManager.GetObject("SweeperTile7", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTile8 { + get { + object obj = ResourceManager.GetObject("SweeperTile8", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTileBlock { + get { + object obj = ResourceManager.GetObject("SweeperTileBlock", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTileBomb { + get { + object obj = ResourceManager.GetObject("SweeperTileBomb", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap SweeperTileFlag { + get { + object obj = ResourceManager.GetObject("SweeperTileFlag", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShiftOS.WinForms/Properties/Resources.resx b/ShiftOS.WinForms/Properties/Resources.resx index aad84ee..8c4b52b 100644 --- a/ShiftOS.WinForms/Properties/Resources.resx +++ b/ShiftOS.WinForms/Properties/Resources.resx @@ -403,4 +403,40 @@ ..\SystemIcons\iconshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SweeperTile0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTile8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTileBlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTileBomb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SweeperTileFlag.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/SweeperTile0.png b/ShiftOS.WinForms/Resources/SweeperTile0.png new file mode 100644 index 0000000..c48c377 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile0.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile1.png b/ShiftOS.WinForms/Resources/SweeperTile1.png new file mode 100644 index 0000000..06819d0 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile1.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile2.png b/ShiftOS.WinForms/Resources/SweeperTile2.png new file mode 100644 index 0000000..eec00e9 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile2.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile3.png b/ShiftOS.WinForms/Resources/SweeperTile3.png new file mode 100644 index 0000000..acc7530 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile3.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile4.png b/ShiftOS.WinForms/Resources/SweeperTile4.png new file mode 100644 index 0000000..f8c3d2b Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile4.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile5.png b/ShiftOS.WinForms/Resources/SweeperTile5.png new file mode 100644 index 0000000..2b2e4fd Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile5.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile6.png b/ShiftOS.WinForms/Resources/SweeperTile6.png new file mode 100644 index 0000000..d8698d0 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile6.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile7.png b/ShiftOS.WinForms/Resources/SweeperTile7.png new file mode 100644 index 0000000..ff02afd Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile7.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile8.png b/ShiftOS.WinForms/Resources/SweeperTile8.png new file mode 100644 index 0000000..9703491 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTile8.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTileBlock.png b/ShiftOS.WinForms/Resources/SweeperTileBlock.png new file mode 100644 index 0000000..dc664a9 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTileBlock.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTileBomb.png b/ShiftOS.WinForms/Resources/SweeperTileBomb.png new file mode 100644 index 0000000..c03a4a3 Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTileBomb.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTileFlag.png b/ShiftOS.WinForms/Resources/SweeperTileFlag.png new file mode 100644 index 0000000..11cedbe Binary files /dev/null and b/ShiftOS.WinForms/Resources/SweeperTileFlag.png differ -- cgit v1.2.3 From 077e0e527106a6d6ab27b31dc07cfd980198d757 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 17:31:19 -0500 Subject: working so hard --- .../Applications/ShiftSweeper.Designer.cs | 14 ++ ShiftOS.WinForms/Applications/ShiftSweeper.cs | 174 +++++++++++++++++++-- ShiftOS.WinForms/Resources/SweeperTile1.png | Bin 285 -> 273 bytes ShiftOS.WinForms/Resources/SweeperTile2.png | Bin 286 -> 275 bytes 4 files changed, 174 insertions(+), 14 deletions(-) (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index f5d7ddd..729bc95 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -34,6 +34,7 @@ this.buttonM = new System.Windows.Forms.Button(); this.buttonH = new System.Windows.Forms.Button(); this.lblmines = new System.Windows.Forms.Label(); + this.lbltime = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -92,6 +93,7 @@ this.buttonM.TabIndex = 3; this.buttonM.Text = "Medium"; this.buttonM.UseVisualStyleBackColor = true; + this.buttonM.Click += new System.EventHandler(this.buttonM_Click); // // buttonH // @@ -101,6 +103,7 @@ this.buttonH.TabIndex = 4; this.buttonH.Text = "Hard"; this.buttonH.UseVisualStyleBackColor = true; + this.buttonH.Click += new System.EventHandler(this.buttonH_Click); // // lblmines // @@ -111,10 +114,20 @@ this.lblmines.TabIndex = 5; this.lblmines.Text = "Mines: 0"; // + // lbltime + // + this.lbltime.AutoSize = true; + this.lbltime.Location = new System.Drawing.Point(188, 22); + this.lbltime.Name = "lbltime"; + this.lbltime.Size = new System.Drawing.Size(42, 13); + this.lbltime.TabIndex = 6; + this.lbltime.Text = "Time: 0"; + // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lbltime); this.Controls.Add(this.lblmines); this.Controls.Add(this.buttonH); this.Controls.Add(this.buttonM); @@ -137,5 +150,6 @@ private System.Windows.Forms.Button buttonM; private System.Windows.Forms.Button buttonH; private System.Windows.Forms.Label lblmines; + private System.Windows.Forms.Label lbltime; } } diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index 70c69d7..360ef16 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -19,36 +19,33 @@ namespace ShiftOS.WinForms.Applications { private bool gameplayed = false; private int mineCount = 0; - private int[,] minemap; + private int[,] minemap; //Represents status of tiles. 0-8 = how many mines surrounding. -1 = mine. -2 = flagged mine. -3 to -11 = flagged safe. + private Timer ticking = new Timer(); + private int minetimer; - public ShiftSweeper() - { - InitializeComponent(); - } + public ShiftSweeper() { InitializeComponent(); } public void OnLoad() { buttonE.Visible = true; buttonM.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_medium"); buttonH.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_hard"); + ticking.Interval = 1000; } public void OnSkinLoad() { } public bool OnUnload() { return true; } - public void OnUpgrade() - { - - } + public void OnUpgrade() { } - private void buttonE_Click(object sender, EventArgs e) - { - startGame(0); - } + private void buttonE_Click(object sender, EventArgs e) { startGame(0); } private void startGame(int d) { + lbltime.Text = "Time: 0"; + minetimer = 0; + ticking.Start(); switch (d) { case 0: @@ -57,9 +54,26 @@ namespace ShiftOS.WinForms.Applications minefieldPanel.RowCount = 9; break; + case 1: + mineCount = 40; + minefieldPanel.ColumnCount = 16; + minefieldPanel.RowCount = 16; + break; + + case 2: + mineCount = 99; + minefieldPanel.ColumnCount = 30; + minefieldPanel.RowCount = 16; + break; + default: throw new NullReferenceException(); } + lblmines.Text = "Mines: " + mineCount.ToString(); + buttonE.Enabled = false; + buttonM.Enabled = false; + buttonH.Enabled = false; + gameplayed = true; makegrid(); } @@ -68,6 +82,7 @@ namespace ShiftOS.WinForms.Applications Random rnd1 = new Random(); minemap = new int[minefieldPanel.ColumnCount, minefieldPanel.RowCount]; + // Makes the minefield full of buttons for (int x = 0; x < minefieldPanel.ColumnCount; x++) { for (int y = 0; y < minefieldPanel.RowCount; y++) @@ -76,6 +91,43 @@ namespace ShiftOS.WinForms.Applications minefieldPanel.Controls.Add(makeButton(x, y), x, y); } } + + // Placing the mines + int currminecount = mineCount; + while (currminecount > 0) + { + int mineX = rnd1.Next(minefieldPanel.ColumnCount); + int mineY = rnd1.Next(minefieldPanel.RowCount); + + if (minemap[mineX, mineY] == 0) + { + minemap[mineX, mineY] = -1; + currminecount--; + } + } + + // Setting the numbers + for (int x = 0; x < minefieldPanel.ColumnCount; x++) + { + for (int y = 0; y < minefieldPanel.RowCount; y++) + { + if (minemap[x, y] != -1) + { + int numMines = 0; + for (int xx = -1; xx < 2; xx++) + { + for (int yy = -1; yy < 2; yy++) + { + if (x + xx >= 0 && y + yy >= 0 && x + xx < minefieldPanel.ColumnCount && y + yy < minefieldPanel.RowCount) + { + if (minemap[x + xx, y + yy] == -1) numMines++; + } + } + } + minemap[x, y] = numMines; + } + } + } } private Button makeButton(int col, int row) @@ -85,15 +137,28 @@ namespace ShiftOS.WinForms.Applications bttn.Text = ""; bttn.Name = col.ToString() + " " + row.ToString(); Controls.AddRange(new System.Windows.Forms.Control[] { bttn, }); + bttn.Size = new System.Drawing.Size(minefieldPanel.Width / minefieldPanel.ColumnCount, minefieldPanel.Height / minefieldPanel.RowCount); bttn.Click += new System.EventHandler(bttnOnclick); bttn.MouseDown += new MouseEventHandler(mouseDwn); bttn.MouseUp += new MouseEventHandler(mauseUp); bttn.MouseHover += new EventHandler(mauseHov); bttn.BackgroundImage = Properties.Resources.SweeperTileBlock; + bttn.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bttnOnRightClick); return bttn; } + private void bttnOnRightClick(object sender, MouseEventArgs e) + { + if (!ticking.Enabled) return; + + Button bttnClick = sender as Button; + + if (bttnClick == null) return; + + if (e.Button == MouseButtons.Left | e.Button == MouseButtons.Middle) return; + } + private void mauseHov(object sender, EventArgs e) { pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; @@ -111,7 +176,88 @@ namespace ShiftOS.WinForms.Applications private void bttnOnclick(object sender, EventArgs e) { - + if (!ticking.Enabled) return; + + Button bttnClick = sender as Button; + + if (bttnClick == null) return; //not a button. + + string[] split = bttnClick.Name.Split(new Char[] { ' ' }); + + int x = System.Convert.ToInt32(split[0]); + int y = System.Convert.ToInt32(split[1]); + + + + if (minemap[x, y] == -1) + { + ticking.Enabled = false; + + buttonE.Enabled = true; + buttonM.Enabled = true; + buttonH.Enabled = true; + + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) + { + for (int yy = 0; yy < minefieldPanel.RowCount; yy++) + { + minefieldPanel.GetControlFromPosition(xx, yy).Enabled = false; + if (minemap[xx, yy] == -1) + { + minefieldPanel.GetControlFromPosition(xx, yy).BackgroundImage = Properties.Resources.SweeperTileBomb; + } + + } + } + } + else if (minemap[x, y] < -1) return; + else removeBlank(x, y); + } + + private void removeBlank(int x, int y) + { + if (!minefieldPanel.GetControlFromPosition(x, y).Enabled) return; + else + { + minefieldPanel.GetControlFromPosition(x, y).Enabled = false; + trueform(x, y); + for (int xx = -1; xx < 2; xx++) + { + for (int yy = -1; yy < 2; yy++) + { + if (x + xx >= 0 && y + yy >= 0 && x + xx < minefieldPanel.ColumnCount && y + yy < minefieldPanel.RowCount) + { + if (minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled && minemap[x+xx,y+yy] != -1 && minemap[x + xx, y + yy] != -2) + { + minefieldPanel.GetControlFromPosition(x, y).Enabled = false; + if (minemap[x, y] == 0) + { + removeBlank(x + xx, y + yy); + } + } + + } + } + } + } + } + + private void trueform(int x, int y) + { + Button bttn = (Button)minefieldPanel.GetControlFromPosition(x, y); + if (minemap[x,y] == 0) bttn.BackgroundImage = Properties.Resources.SweeperTile0; + else if (minemap[x, y] == 1) bttn.BackgroundImage = Properties.Resources.SweeperTile1; + else if (minemap[x, y] == 2) bttn.BackgroundImage = Properties.Resources.SweeperTile2; + else if (minemap[x, y] == 3) bttn.BackgroundImage = Properties.Resources.SweeperTile3; + else if (minemap[x, y] == 4) bttn.BackgroundImage = Properties.Resources.SweeperTile4; + else if (minemap[x, y] == 5) bttn.BackgroundImage = Properties.Resources.SweeperTile5; + else if (minemap[x, y] == 6) bttn.BackgroundImage = Properties.Resources.SweeperTile6; + else if (minemap[x, y] == 7) bttn.BackgroundImage = Properties.Resources.SweeperTile7; + else if (minemap[x, y] == 8) bttn.BackgroundImage = Properties.Resources.SweeperTile8; } + + private void buttonM_Click(object sender, EventArgs e) { startGame(1); } + + private void buttonH_Click(object sender, EventArgs e) { startGame(2); } } } diff --git a/ShiftOS.WinForms/Resources/SweeperTile1.png b/ShiftOS.WinForms/Resources/SweeperTile1.png index 06819d0..5fc6871 100644 Binary files a/ShiftOS.WinForms/Resources/SweeperTile1.png and b/ShiftOS.WinForms/Resources/SweeperTile1.png differ diff --git a/ShiftOS.WinForms/Resources/SweeperTile2.png b/ShiftOS.WinForms/Resources/SweeperTile2.png index eec00e9..22c5f02 100644 Binary files a/ShiftOS.WinForms/Resources/SweeperTile2.png and b/ShiftOS.WinForms/Resources/SweeperTile2.png differ -- cgit v1.2.3 From dd65c54eda491ce8ac6c035b983e52ec096ec74c Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 18:41:41 -0500 Subject: by george, i think ive finished it! --- .../Applications/ShiftSweeper.Designer.cs | 24 ++++++ ShiftOS.WinForms/Applications/ShiftSweeper.cs | 93 ++++++++++++++++++++-- 2 files changed, 111 insertions(+), 6 deletions(-) (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index 729bc95..b5cc13f 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -35,6 +35,8 @@ this.buttonH = new System.Windows.Forms.Button(); this.lblmines = new System.Windows.Forms.Label(); this.lbltime = new System.Windows.Forms.Label(); + this.lblinfo = new System.Windows.Forms.Label(); + this.lblinfo2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -123,10 +125,30 @@ this.lbltime.TabIndex = 6; this.lbltime.Text = "Time: 0"; // + // lblinfo + // + this.lblinfo.AutoSize = true; + this.lblinfo.Location = new System.Drawing.Point(4, 4); + this.lblinfo.Name = "lblinfo"; + this.lblinfo.Size = new System.Drawing.Size(129, 13); + this.lblinfo.TabIndex = 7; + this.lblinfo.Text = "Left Click to uncover tiles."; + // + // lblinfo2 + // + this.lblinfo2.AutoSize = true; + this.lblinfo2.Location = new System.Drawing.Point(4, 22); + this.lblinfo2.Name = "lblinfo2"; + this.lblinfo2.Size = new System.Drawing.Size(114, 13); + this.lblinfo2.TabIndex = 8; + this.lblinfo2.Text = "Right Click to flag tiles."; + // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblinfo2); + this.Controls.Add(this.lblinfo); this.Controls.Add(this.lbltime); this.Controls.Add(this.lblmines); this.Controls.Add(this.buttonH); @@ -151,5 +173,7 @@ private System.Windows.Forms.Button buttonH; private System.Windows.Forms.Label lblmines; private System.Windows.Forms.Label lbltime; + private System.Windows.Forms.Label lblinfo; + private System.Windows.Forms.Label lblinfo2; } } diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index 360ef16..0f9c700 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -19,6 +19,7 @@ namespace ShiftOS.WinForms.Applications { private bool gameplayed = false; private int mineCount = 0; + private int origminecount; private int[,] minemap; //Represents status of tiles. 0-8 = how many mines surrounding. -1 = mine. -2 = flagged mine. -3 to -11 = flagged safe. private Timer ticking = new Timer(); private int minetimer; @@ -41,8 +42,26 @@ namespace ShiftOS.WinForms.Applications private void buttonE_Click(object sender, EventArgs e) { startGame(0); } + private void clearPreviousGame() + { + if (minemap != null) for (int x = 0; x < minefieldPanel.ColumnCount; x++) + { + for (int y = 0; y < minefieldPanel.RowCount; y++) + { + minemap[x, y] = 0; + + if (minefieldPanel.GetControlFromPosition(x,y) != null) + { + minefieldPanel.Controls.Remove(minefieldPanel.GetControlFromPosition(x, y)); + } + } + } + + } + private void startGame(int d) { + clearPreviousGame(); lbltime.Text = "Time: 0"; minetimer = 0; ticking.Start(); @@ -69,6 +88,7 @@ namespace ShiftOS.WinForms.Applications default: throw new NullReferenceException(); } + origminecount = mineCount; lblmines.Text = "Mines: " + mineCount.ToString(); buttonE.Enabled = false; buttonM.Enabled = false; @@ -155,23 +175,82 @@ namespace ShiftOS.WinForms.Applications Button bttnClick = sender as Button; if (bttnClick == null) return; - if (e.Button == MouseButtons.Left | e.Button == MouseButtons.Middle) return; + if (!bttnClick.Enabled) return; + + string[] split = bttnClick.Name.Split(new Char[] { ' ' }); + + int x = System.Convert.ToInt32(split[0]); + int y = System.Convert.ToInt32(split[1]); + + if (minemap[x,y] < -1) + { + minemap[x, y] = (minemap[x, y] * -1) - 3; + bttnClick.BackgroundImage = Properties.Resources.SweeperTileBlock; + mineCount++; + } + else + { + minemap[x, y] = (minemap[x, y] * -1) - 3; + bttnClick.BackgroundImage = Properties.Resources.SweeperTileFlag; + mineCount--; + } + + bool wrongflags = false; + if (mineCount == 0) + { + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) + { + if (wrongflags) break; + for (int yy = 0; yy < minefieldPanel.RowCount; yy++) + { + if (wrongflags) break; + if (minemap[xx,yy] == -1 | minemap[xx,yy] == -2) wrongflags = true; + } + } + if (!wrongflags) + { + ticking.Enabled = false; + + buttonE.Enabled = true; + buttonM.Enabled = true; + buttonH.Enabled = true; + + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) + { + for (int yy = 0; yy < minefieldPanel.RowCount; yy++) + { + minefieldPanel.GetControlFromPosition(xx, yy).Enabled = false; + } + } + + Int32 cp = 0; + origminecount = origminecount * 10; + if (minetimer < 31) cp = (origminecount * 3); + if (minetimer < 61) cp = (Int32)(origminecount * 2.5); + if (minetimer < 91) cp = (origminecount * 2); + if (minetimer < 121) cp = (Int32)(origminecount * 1.5); + if (minetimer > 120) cp = (origminecount * 1); + SaveSystem.TransferCodepointsFrom("shiftsweeper", cp); + pictureBox1.BackgroundImage = Properties.Resources.SweeperWinFace; + //TODO add win + } + } } private void mauseHov(object sender, EventArgs e) { - pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; + if (ticking.Enabled) pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; } private void mauseUp(object sender, MouseEventArgs e) { - pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; + if (!ticking.Enabled) pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; } private void mouseDwn(object sender, EventArgs e) { - pictureBox1.BackgroundImage = Properties.Resources.SweeperClickFace; + if (!ticking.Enabled) pictureBox1.BackgroundImage = Properties.Resources.SweeperClickFace; } private void bttnOnclick(object sender, EventArgs e) @@ -197,6 +276,8 @@ namespace ShiftOS.WinForms.Applications buttonM.Enabled = true; buttonH.Enabled = true; + pictureBox1.BackgroundImage = Properties.Resources.SweeperLoseFace; + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) { for (int yy = 0; yy < minefieldPanel.RowCount; yy++) @@ -229,8 +310,8 @@ namespace ShiftOS.WinForms.Applications { if (minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled && minemap[x+xx,y+yy] != -1 && minemap[x + xx, y + yy] != -2) { - minefieldPanel.GetControlFromPosition(x, y).Enabled = false; - if (minemap[x, y] == 0) + minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled = false; + if (minemap[x + xx, y + yy] == 0) { removeBlank(x + xx, y + yy); } -- cgit v1.2.3 From c37f4a7874416ff68e2e75f50f1c6802c9e3bb20 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 20:36:01 -0500 Subject: almost there --- .../Applications/ShiftSweeper.Designer.cs | 40 ++-- ShiftOS.WinForms/Applications/ShiftSweeper.cs | 203 ++++++++++----------- ShiftOS.WinForms/ShiftOS.WinForms.csproj | 12 ++ 3 files changed, 138 insertions(+), 117 deletions(-) (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index b5cc13f..691bdb4 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -37,14 +37,17 @@ this.lbltime = new System.Windows.Forms.Label(); this.lblinfo = new System.Windows.Forms.Label(); this.lblinfo2 = new System.Windows.Forms.Label(); + this.flagButton = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.flagButton)).BeginInit(); this.SuspendLayout(); // // pictureBox1 // this.pictureBox1.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace; this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pictureBox1.Location = new System.Drawing.Point(150, 3); + this.pictureBox1.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace; + this.pictureBox1.Location = new System.Drawing.Point(222, 3); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(32, 32); this.pictureBox1.TabIndex = 0; @@ -74,12 +77,12 @@ this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.Size = new System.Drawing.Size(329, 215); + this.minefieldPanel.Size = new System.Drawing.Size(471, 241); this.minefieldPanel.TabIndex = 1; // // buttonE // - this.buttonE.Location = new System.Drawing.Point(4, 261); + this.buttonE.Location = new System.Drawing.Point(4, 287); this.buttonE.Name = "buttonE"; this.buttonE.Size = new System.Drawing.Size(75, 23); this.buttonE.TabIndex = 2; @@ -89,7 +92,7 @@ // // buttonM // - this.buttonM.Location = new System.Drawing.Point(129, 261); + this.buttonM.Location = new System.Drawing.Point(201, 287); this.buttonM.Name = "buttonM"; this.buttonM.Size = new System.Drawing.Size(75, 23); this.buttonM.TabIndex = 3; @@ -99,7 +102,7 @@ // // buttonH // - this.buttonH.Location = new System.Drawing.Point(258, 261); + this.buttonH.Location = new System.Drawing.Point(400, 287); this.buttonH.Name = "buttonH"; this.buttonH.Size = new System.Drawing.Size(75, 23); this.buttonH.TabIndex = 4; @@ -110,7 +113,7 @@ // lblmines // this.lblmines.AutoSize = true; - this.lblmines.Location = new System.Drawing.Point(188, 3); + this.lblmines.Location = new System.Drawing.Point(272, 4); this.lblmines.Name = "lblmines"; this.lblmines.Size = new System.Drawing.Size(47, 13); this.lblmines.TabIndex = 5; @@ -119,7 +122,7 @@ // lbltime // this.lbltime.AutoSize = true; - this.lbltime.Location = new System.Drawing.Point(188, 22); + this.lbltime.Location = new System.Drawing.Point(272, 22); this.lbltime.Name = "lbltime"; this.lbltime.Size = new System.Drawing.Size(42, 13); this.lbltime.TabIndex = 6; @@ -130,23 +133,34 @@ this.lblinfo.AutoSize = true; this.lblinfo.Location = new System.Drawing.Point(4, 4); this.lblinfo.Name = "lblinfo"; - this.lblinfo.Size = new System.Drawing.Size(129, 13); + this.lblinfo.Size = new System.Drawing.Size(108, 13); this.lblinfo.TabIndex = 7; - this.lblinfo.Text = "Left Click to uncover tiles."; + this.lblinfo.Text = "Click to uncover tiles."; // // lblinfo2 // this.lblinfo2.AutoSize = true; this.lblinfo2.Location = new System.Drawing.Point(4, 22); this.lblinfo2.Name = "lblinfo2"; - this.lblinfo2.Size = new System.Drawing.Size(114, 13); + this.lblinfo2.Size = new System.Drawing.Size(128, 13); this.lblinfo2.TabIndex = 8; - this.lblinfo2.Text = "Right Click to flag tiles."; + this.lblinfo2.Text = "Right Button: Toggle Flag"; + // + // flagButton + // + this.flagButton.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperTileBlock; + this.flagButton.Location = new System.Drawing.Point(455, 15); + this.flagButton.Name = "flagButton"; + this.flagButton.Size = new System.Drawing.Size(20, 20); + this.flagButton.TabIndex = 9; + this.flagButton.TabStop = false; + this.flagButton.Click += new System.EventHandler(this.flagButton_Click); // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.flagButton); this.Controls.Add(this.lblinfo2); this.Controls.Add(this.lblinfo); this.Controls.Add(this.lbltime); @@ -157,8 +171,9 @@ this.Controls.Add(this.minefieldPanel); this.Controls.Add(this.pictureBox1); this.Name = "ShiftSweeper"; - this.Size = new System.Drawing.Size(366, 328); + this.Size = new System.Drawing.Size(536, 358); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.flagButton)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -175,5 +190,6 @@ private System.Windows.Forms.Label lbltime; private System.Windows.Forms.Label lblinfo; private System.Windows.Forms.Label lblinfo2; + private System.Windows.Forms.PictureBox flagButton; } } diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index 0f9c700..4b83b3f 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -18,6 +18,7 @@ namespace ShiftOS.WinForms.Applications public partial class ShiftSweeper : UserControl, IShiftOSWindow { private bool gameplayed = false; + private bool flagtime = false; private int mineCount = 0; private int origminecount; private int[,] minemap; //Represents status of tiles. 0-8 = how many mines surrounding. -1 = mine. -2 = flagged mine. -3 to -11 = flagged safe. @@ -32,6 +33,13 @@ namespace ShiftOS.WinForms.Applications buttonM.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_medium"); buttonH.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_hard"); ticking.Interval = 1000; + ticking.Tick += Ticking_Tick; + } + + private void Ticking_Tick(object sender, EventArgs e) + { + minetimer++; + lbltime.Text = "Time: " + minetimer.ToString(); } public void OnSkinLoad() { } @@ -61,6 +69,7 @@ namespace ShiftOS.WinForms.Applications private void startGame(int d) { + pictureBox1.Image = Properties.Resources.SweeperNormalFace; clearPreviousGame(); lbltime.Text = "Time: 0"; minetimer = 0; @@ -157,58 +166,31 @@ namespace ShiftOS.WinForms.Applications bttn.Text = ""; bttn.Name = col.ToString() + " " + row.ToString(); Controls.AddRange(new System.Windows.Forms.Control[] { bttn, }); - bttn.Size = new System.Drawing.Size(minefieldPanel.Width / minefieldPanel.ColumnCount, minefieldPanel.Height / minefieldPanel.RowCount); + bttn.Size = new System.Drawing.Size(minefieldPanel.Width / minefieldPanel.ColumnCount, (minefieldPanel.Height / minefieldPanel.RowCount) + 10); bttn.Click += new System.EventHandler(bttnOnclick); - bttn.MouseDown += new MouseEventHandler(mouseDwn); - bttn.MouseUp += new MouseEventHandler(mauseUp); - bttn.MouseHover += new EventHandler(mauseHov); bttn.BackgroundImage = Properties.Resources.SweeperTileBlock; - bttn.MouseClick += new System.Windows.Forms.MouseEventHandler(this.bttnOnRightClick); + bttn.BackgroundImageLayout = ImageLayout.Stretch; return bttn; } - private void bttnOnRightClick(object sender, MouseEventArgs e) + private void bttnOnclick(object sender, EventArgs e) { if (!ticking.Enabled) return; Button bttnClick = sender as Button; - if (bttnClick == null) return; - if (e.Button == MouseButtons.Left | e.Button == MouseButtons.Middle) return; - if (!bttnClick.Enabled) return; + if (bttnClick == null) return; //not a button. string[] split = bttnClick.Name.Split(new Char[] { ' ' }); int x = System.Convert.ToInt32(split[0]); int y = System.Convert.ToInt32(split[1]); - if (minemap[x,y] < -1) - { - minemap[x, y] = (minemap[x, y] * -1) - 3; - bttnClick.BackgroundImage = Properties.Resources.SweeperTileBlock; - mineCount++; - } - else - { - minemap[x, y] = (minemap[x, y] * -1) - 3; - bttnClick.BackgroundImage = Properties.Resources.SweeperTileFlag; - mineCount--; - } - bool wrongflags = false; - if (mineCount == 0) + if (!flagtime) { - for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) - { - if (wrongflags) break; - for (int yy = 0; yy < minefieldPanel.RowCount; yy++) - { - if (wrongflags) break; - if (minemap[xx,yy] == -1 | minemap[xx,yy] == -2) wrongflags = true; - } - } - if (!wrongflags) + if (minemap[x, y] == -1) { ticking.Enabled = false; @@ -216,107 +198,104 @@ namespace ShiftOS.WinForms.Applications buttonM.Enabled = true; buttonH.Enabled = true; + pictureBox1.BackgroundImage = Properties.Resources.SweeperLoseFace; + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) { for (int yy = 0; yy < minefieldPanel.RowCount; yy++) { + pictureBox1.BackgroundImage = Properties.Resources.SweeperLoseFace; minefieldPanel.GetControlFromPosition(xx, yy).Enabled = false; + if (minemap[xx, yy] == -1) + { + minefieldPanel.GetControlFromPosition(xx, yy).BackgroundImage = Properties.Resources.SweeperTileBomb; + } + } } - - Int32 cp = 0; - origminecount = origminecount * 10; - if (minetimer < 31) cp = (origminecount * 3); - if (minetimer < 61) cp = (Int32)(origminecount * 2.5); - if (minetimer < 91) cp = (origminecount * 2); - if (minetimer < 121) cp = (Int32)(origminecount * 1.5); - if (minetimer > 120) cp = (origminecount * 1); - SaveSystem.TransferCodepointsFrom("shiftsweeper", cp); - pictureBox1.BackgroundImage = Properties.Resources.SweeperWinFace; - //TODO add win + pictureBox1.Image = Properties.Resources.SweeperLoseFace; } + else if (minemap[x, y] < -1) return; + else removeBlank(x, y); } - } - - private void mauseHov(object sender, EventArgs e) - { - if (ticking.Enabled) pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; - } - - private void mauseUp(object sender, MouseEventArgs e) - { - if (!ticking.Enabled) pictureBox1.BackgroundImage = Properties.Resources.SweeperNormalFace; - } - - private void mouseDwn(object sender, EventArgs e) - { - if (!ticking.Enabled) pictureBox1.BackgroundImage = Properties.Resources.SweeperClickFace; - } - - private void bttnOnclick(object sender, EventArgs e) - { - if (!ticking.Enabled) return; - - Button bttnClick = sender as Button; - - if (bttnClick == null) return; //not a button. - - string[] split = bttnClick.Name.Split(new Char[] { ' ' }); - - int x = System.Convert.ToInt32(split[0]); - int y = System.Convert.ToInt32(split[1]); - - - - if (minemap[x, y] == -1) + else { - ticking.Enabled = false; - - buttonE.Enabled = true; - buttonM.Enabled = true; - buttonH.Enabled = true; + if (!bttnClick.Enabled) return; - pictureBox1.BackgroundImage = Properties.Resources.SweeperLoseFace; - - for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) + if (minemap[x, y] < -1) + { + minemap[x, y] = (minemap[x, y] * -1) - 3; + bttnClick.BackgroundImage = Properties.Resources.SweeperTileBlock; + mineCount++; + } + else + { + minemap[x, y] = (minemap[x, y] * -1) - 3; + bttnClick.BackgroundImage = Properties.Resources.SweeperTileFlag; + mineCount--; + } + lblmines.Text = "Mines: " + mineCount.ToString(); + bool wrongflags = false; + if (mineCount == 0) { - for (int yy = 0; yy < minefieldPanel.RowCount; yy++) + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) + { + if (wrongflags) break; + for (int yy = 0; yy < minefieldPanel.RowCount; yy++) + { + if (wrongflags) break; + if (minemap[xx, yy] < -2) wrongflags = true; + } + } + if (!wrongflags) { - minefieldPanel.GetControlFromPosition(xx, yy).Enabled = false; - if (minemap[xx, yy] == -1) + ticking.Enabled = false; + + buttonE.Enabled = true; + buttonM.Enabled = true; + buttonH.Enabled = true; + + for (int xx = 0; xx < minefieldPanel.ColumnCount; xx++) { - minefieldPanel.GetControlFromPosition(xx, yy).BackgroundImage = Properties.Resources.SweeperTileBomb; + for (int yy = 0; yy < minefieldPanel.RowCount; yy++) + { + minefieldPanel.GetControlFromPosition(xx, yy).Enabled = false; + } } + Int32 cp = 0; + origminecount = origminecount * 10; + if (minetimer < 31) cp = (origminecount * 3); + if (minetimer < 61) cp = (Int32)(origminecount * 2.5); + if (minetimer < 91) cp = (origminecount * 2); + if (minetimer < 121) cp = (Int32)(origminecount * 1.5); + if (minetimer > 120) cp = (origminecount * 1); + SaveSystem.TransferCodepointsFrom("shiftsweeper", cp); + pictureBox1.Image = Properties.Resources.SweeperWinFace; } } } - else if (minemap[x, y] < -1) return; - else removeBlank(x, y); } private void removeBlank(int x, int y) { - if (!minefieldPanel.GetControlFromPosition(x, y).Enabled) return; - else + minefieldPanel.GetControlFromPosition(x, y).Enabled = false; + trueform(x, y); + if (minemap[x, y] != 0) return; + for (int xx = -1; xx < 2; xx++) { - minefieldPanel.GetControlFromPosition(x, y).Enabled = false; - trueform(x, y); - for (int xx = -1; xx < 2; xx++) + for (int yy = -1; yy < 2; yy++) { - for (int yy = -1; yy < 2; yy++) + if (x + xx >= 0 && y + yy >= 0 && x + xx < minefieldPanel.ColumnCount && y + yy < minefieldPanel.RowCount) { - if (x + xx >= 0 && y + yy >= 0 && x + xx < minefieldPanel.ColumnCount && y + yy < minefieldPanel.RowCount) + if (minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled && minemap[x+xx,y+yy] != -1 && minemap[x + xx, y + yy] != -2) { - if (minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled && minemap[x+xx,y+yy] != -1 && minemap[x + xx, y + yy] != -2) + minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled = false; + trueform(x + xx, y + yy); + if (minemap[x + xx, y + yy] == 0) { - minefieldPanel.GetControlFromPosition(x + xx, y + yy).Enabled = false; - if (minemap[x + xx, y + yy] == 0) - { - removeBlank(x + xx, y + yy); - } + removeBlank(x + xx, y + yy); } - } } } @@ -340,5 +319,19 @@ namespace ShiftOS.WinForms.Applications private void buttonM_Click(object sender, EventArgs e) { startGame(1); } private void buttonH_Click(object sender, EventArgs e) { startGame(2); } + + private void flagButton_Click(object sender, EventArgs e) + { + if (flagtime) + { + flagButton.Image = Properties.Resources.SweeperTileBlock; + flagtime = false; + } + else + { + flagButton.Image = Properties.Resources.SweeperTileFlag; + flagtime = true; + } + } } } diff --git a/ShiftOS.WinForms/ShiftOS.WinForms.csproj b/ShiftOS.WinForms/ShiftOS.WinForms.csproj index 1802675..e061f82 100644 --- a/ShiftOS.WinForms/ShiftOS.WinForms.csproj +++ b/ShiftOS.WinForms/ShiftOS.WinForms.csproj @@ -541,6 +541,18 @@ + + + + + + + + + + + + -- cgit v1.2.3 From e1ddab3900172890bf38e1e2998a469dc77e1630 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 21:37:06 -0500 Subject: finished shiftsweeper --- .../Applications/ShiftSweeper.Designer.cs | 179 ++++++++++++++++----- ShiftOS.WinForms/Applications/ShiftSweeper.cs | 9 ++ 2 files changed, 151 insertions(+), 37 deletions(-) (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index 691bdb4..3d6ab6e 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.minefieldPanel = new System.Windows.Forms.TableLayoutPanel(); + this.easyPanel = new System.Windows.Forms.TableLayoutPanel(); this.buttonE = new System.Windows.Forms.Button(); this.buttonM = new System.Windows.Forms.Button(); this.buttonH = new System.Windows.Forms.Button(); @@ -38,6 +38,8 @@ this.lblinfo = new System.Windows.Forms.Label(); this.lblinfo2 = new System.Windows.Forms.Label(); this.flagButton = new System.Windows.Forms.PictureBox(); + this.mediumPanel = new System.Windows.Forms.TableLayoutPanel(); + this.hardPanel = new System.Windows.Forms.TableLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.flagButton)).BeginInit(); this.SuspendLayout(); @@ -47,42 +49,43 @@ this.pictureBox1.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace; this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.pictureBox1.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperNormalFace; - this.pictureBox1.Location = new System.Drawing.Point(222, 3); + this.pictureBox1.Location = new System.Drawing.Point(264, 3); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(32, 32); this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; // - // minefieldPanel - // - this.minefieldPanel.ColumnCount = 9; - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.Location = new System.Drawing.Point(4, 40); - this.minefieldPanel.Name = "minefieldPanel"; - this.minefieldPanel.RowCount = 9; - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); - this.minefieldPanel.Size = new System.Drawing.Size(471, 241); - this.minefieldPanel.TabIndex = 1; + // easyPanel + // + this.easyPanel.ColumnCount = 9; + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 11.11111F)); + this.easyPanel.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize; + this.easyPanel.Location = new System.Drawing.Point(4, 40); + this.easyPanel.Name = "easyPanel"; + this.easyPanel.RowCount = 9; + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11136F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11025F)); + this.easyPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 11.11025F)); + this.easyPanel.Size = new System.Drawing.Size(553, 308); + this.easyPanel.TabIndex = 1; // // buttonE // - this.buttonE.Location = new System.Drawing.Point(4, 287); + this.buttonE.Location = new System.Drawing.Point(4, 354); this.buttonE.Name = "buttonE"; this.buttonE.Size = new System.Drawing.Size(75, 23); this.buttonE.TabIndex = 2; @@ -92,7 +95,7 @@ // // buttonM // - this.buttonM.Location = new System.Drawing.Point(201, 287); + this.buttonM.Location = new System.Drawing.Point(244, 354); this.buttonM.Name = "buttonM"; this.buttonM.Size = new System.Drawing.Size(75, 23); this.buttonM.TabIndex = 3; @@ -102,7 +105,7 @@ // // buttonH // - this.buttonH.Location = new System.Drawing.Point(400, 287); + this.buttonH.Location = new System.Drawing.Point(482, 354); this.buttonH.Name = "buttonH"; this.buttonH.Size = new System.Drawing.Size(75, 23); this.buttonH.TabIndex = 4; @@ -113,7 +116,7 @@ // lblmines // this.lblmines.AutoSize = true; - this.lblmines.Location = new System.Drawing.Point(272, 4); + this.lblmines.Location = new System.Drawing.Point(317, 4); this.lblmines.Name = "lblmines"; this.lblmines.Size = new System.Drawing.Size(47, 13); this.lblmines.TabIndex = 5; @@ -122,7 +125,7 @@ // lbltime // this.lbltime.AutoSize = true; - this.lbltime.Location = new System.Drawing.Point(272, 22); + this.lbltime.Location = new System.Drawing.Point(317, 22); this.lbltime.Name = "lbltime"; this.lbltime.Size = new System.Drawing.Size(42, 13); this.lbltime.TabIndex = 6; @@ -149,17 +152,117 @@ // flagButton // this.flagButton.Image = global::ShiftOS.WinForms.Properties.Resources.SweeperTileBlock; - this.flagButton.Location = new System.Drawing.Point(455, 15); + this.flagButton.Location = new System.Drawing.Point(537, 14); this.flagButton.Name = "flagButton"; this.flagButton.Size = new System.Drawing.Size(20, 20); this.flagButton.TabIndex = 9; this.flagButton.TabStop = false; this.flagButton.Click += new System.EventHandler(this.flagButton_Click); // + // mediumPanel + // + this.mediumPanel.ColumnCount = 16; + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249042F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize; + this.mediumPanel.Location = new System.Drawing.Point(4, 41); + this.mediumPanel.Name = "mediumPanel"; + this.mediumPanel.RowCount = 16; + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249183F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.mediumPanel.Size = new System.Drawing.Size(553, 307); + this.mediumPanel.TabIndex = 2; + // + // hardPanel + // + this.hardPanel.ColumnCount = 30; + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249042F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.249044F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.hardPanel.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize; + this.hardPanel.Location = new System.Drawing.Point(4, 40); + this.hardPanel.Name = "hardPanel"; + this.hardPanel.RowCount = 16; + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249183F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.249182F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.248558F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.251231F)); + this.hardPanel.Size = new System.Drawing.Size(553, 308); + this.hardPanel.TabIndex = 3; + // // ShiftSweeper // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.hardPanel); + this.Controls.Add(this.mediumPanel); this.Controls.Add(this.flagButton); this.Controls.Add(this.lblinfo2); this.Controls.Add(this.lblinfo); @@ -168,10 +271,10 @@ this.Controls.Add(this.buttonH); this.Controls.Add(this.buttonM); this.Controls.Add(this.buttonE); - this.Controls.Add(this.minefieldPanel); + this.Controls.Add(this.easyPanel); this.Controls.Add(this.pictureBox1); this.Name = "ShiftSweeper"; - this.Size = new System.Drawing.Size(536, 358); + this.Size = new System.Drawing.Size(624, 426); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.flagButton)).EndInit(); this.ResumeLayout(false); @@ -182,7 +285,7 @@ #endregion private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.TableLayoutPanel minefieldPanel; + private System.Windows.Forms.TableLayoutPanel easyPanel; private System.Windows.Forms.Button buttonE; private System.Windows.Forms.Button buttonM; private System.Windows.Forms.Button buttonH; @@ -191,5 +294,7 @@ private System.Windows.Forms.Label lblinfo; private System.Windows.Forms.Label lblinfo2; private System.Windows.Forms.PictureBox flagButton; + private System.Windows.Forms.TableLayoutPanel mediumPanel; + private System.Windows.Forms.TableLayoutPanel hardPanel; } } diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index 4b83b3f..0aac2c1 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -24,6 +24,7 @@ namespace ShiftOS.WinForms.Applications private int[,] minemap; //Represents status of tiles. 0-8 = how many mines surrounding. -1 = mine. -2 = flagged mine. -3 to -11 = flagged safe. private Timer ticking = new Timer(); private int minetimer; + private TableLayoutPanel minefieldPanel; public ShiftSweeper() { InitializeComponent(); } @@ -34,6 +35,9 @@ namespace ShiftOS.WinForms.Applications buttonH.Visible = ShiftoriumFrontend.UpgradeInstalled("shiftsweeper_hard"); ticking.Interval = 1000; ticking.Tick += Ticking_Tick; + easyPanel.Visible = false; + mediumPanel.Visible = false; + hardPanel.Visible = false; } private void Ticking_Tick(object sender, EventArgs e) @@ -74,21 +78,25 @@ namespace ShiftOS.WinForms.Applications lbltime.Text = "Time: 0"; minetimer = 0; ticking.Start(); + if (minefieldPanel != null) minefieldPanel.Visible = false; switch (d) { case 0: + minefieldPanel = easyPanel; mineCount = 10; minefieldPanel.ColumnCount = 9; minefieldPanel.RowCount = 9; break; case 1: + minefieldPanel = mediumPanel; mineCount = 40; minefieldPanel.ColumnCount = 16; minefieldPanel.RowCount = 16; break; case 2: + minefieldPanel = hardPanel; mineCount = 99; minefieldPanel.ColumnCount = 30; minefieldPanel.RowCount = 16; @@ -97,6 +105,7 @@ namespace ShiftOS.WinForms.Applications default: throw new NullReferenceException(); } + minefieldPanel.Visible = true; origminecount = mineCount; lblmines.Text = "Mines: " + mineCount.ToString(); buttonE.Enabled = false; -- cgit v1.2.3 From ba1519e3ce1c9710befcb4b36e0a2da21005ef31 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 26 Feb 2017 21:54:41 -0500 Subject: LIcenses --- ShiftOS.WinForms/Applications/About.Designer.cs | 26 +++++++++++++++++++++- ShiftOS.WinForms/Applications/About.cs | 26 +++++++++++++++++++++- .../Applications/AudioPlayer.Designer.cs | 26 +++++++++++++++++++++- ShiftOS.WinForms/Applications/AudioPlayer.cs | 26 +++++++++++++++++++++- .../Applications/Notifications.Designer.cs | 26 +++++++++++++++++++++- ShiftOS.WinForms/Applications/Notifications.cs | 26 +++++++++++++++++++++- .../Applications/ShiftSweeper.Designer.cs | 26 +++++++++++++++++++++- ShiftOS.WinForms/Applications/ShiftSweeper.cs | 26 +++++++++++++++++++++- ShiftOS.WinForms/Properties/Resources.Designer.cs | 26 +++++++++++++++++++++- ShiftOS_TheReturn/NotificationDaemon.cs | 26 +++++++++++++++++++++- 10 files changed, 250 insertions(+), 10 deletions(-) (limited to 'ShiftOS.WinForms/Applications/ShiftSweeper.cs') diff --git a/ShiftOS.WinForms/Applications/About.Designer.cs b/ShiftOS.WinForms/Applications/About.Designer.cs index e44b29e..ab76eab 100644 --- a/ShiftOS.WinForms/Applications/About.Designer.cs +++ b/ShiftOS.WinForms/Applications/About.Designer.cs @@ -1,4 +1,28 @@ -namespace ShiftOS.WinForms.Applications +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +namespace ShiftOS.WinForms.Applications { partial class About { diff --git a/ShiftOS.WinForms/Applications/About.cs b/ShiftOS.WinForms/Applications/About.cs index cd95296..f91e0cc 100644 --- a/ShiftOS.WinForms/Applications/About.cs +++ b/ShiftOS.WinForms/Applications/About.cs @@ -1,4 +1,28 @@ -using System; +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; diff --git a/ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs b/ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs index 3cc88df..83f41d2 100644 --- a/ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs +++ b/ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs @@ -1,4 +1,28 @@ -namespace ShiftOS.WinForms.Applications +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +namespace ShiftOS.WinForms.Applications { partial class AudioPlayer { diff --git a/ShiftOS.WinForms/Applications/AudioPlayer.cs b/ShiftOS.WinForms/Applications/AudioPlayer.cs index b7dc9ee..b8be6af 100644 --- a/ShiftOS.WinForms/Applications/AudioPlayer.cs +++ b/ShiftOS.WinForms/Applications/AudioPlayer.cs @@ -1,4 +1,28 @@ -using System; +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; diff --git a/ShiftOS.WinForms/Applications/Notifications.Designer.cs b/ShiftOS.WinForms/Applications/Notifications.Designer.cs index d88c25b..861795a 100644 --- a/ShiftOS.WinForms/Applications/Notifications.Designer.cs +++ b/ShiftOS.WinForms/Applications/Notifications.Designer.cs @@ -1,4 +1,28 @@ -namespace ShiftOS.WinForms.Applications +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +namespace ShiftOS.WinForms.Applications { partial class Notifications { diff --git a/ShiftOS.WinForms/Applications/Notifications.cs b/ShiftOS.WinForms/Applications/Notifications.cs index 9ed3587..30aec3d 100644 --- a/ShiftOS.WinForms/Applications/Notifications.cs +++ b/ShiftOS.WinForms/Applications/Notifications.cs @@ -1,4 +1,28 @@ -using System; +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs index 3d6ab6e..17b01b7 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs @@ -1,4 +1,28 @@ -namespace ShiftOS.WinForms.Applications +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +namespace ShiftOS.WinForms.Applications { partial class ShiftSweeper { diff --git a/ShiftOS.WinForms/Applications/ShiftSweeper.cs b/ShiftOS.WinForms/Applications/ShiftSweeper.cs index 0aac2c1..529a7e8 100644 --- a/ShiftOS.WinForms/Applications/ShiftSweeper.cs +++ b/ShiftOS.WinForms/Applications/ShiftSweeper.cs @@ -1,4 +1,28 @@ -using System; +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +using System; using System.Collections.Generic; using System.ComponentModel; using System.Drawing; diff --git a/ShiftOS.WinForms/Properties/Resources.Designer.cs b/ShiftOS.WinForms/Properties/Resources.Designer.cs index beef6ff..43b445c 100644 --- a/ShiftOS.WinForms/Properties/Resources.Designer.cs +++ b/ShiftOS.WinForms/Properties/Resources.Designer.cs @@ -1,4 +1,28 @@ -//------------------------------------------------------------------------------ +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 diff --git a/ShiftOS_TheReturn/NotificationDaemon.cs b/ShiftOS_TheReturn/NotificationDaemon.cs index 6eb0b7b..77a31fc 100644 --- a/ShiftOS_TheReturn/NotificationDaemon.cs +++ b/ShiftOS_TheReturn/NotificationDaemon.cs @@ -1,4 +1,28 @@ -using System; +/* + * MIT License + * + * Copyright (c) 2017 Michael VanOverbeek and ShiftOS devs + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +using System; using System.Collections.Generic; using System.Linq; using System.Text; -- cgit v1.2.3