aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorwilliam341 <[email protected]>2017-02-25 16:03:07 -0700
committerGitHub <[email protected]>2017-02-25 16:03:07 -0700
commit0b3873bb9413d91fee3484c9dc2aea9729e61500 (patch)
treeb44462682d64b91e941c0b3f20134a365964ed40 /ShiftOS.WinForms
parent8a60eba70b4875c7e382b933d1c835f6f857cdd0 (diff)
parentf51200b5d763f11c151a01909aea7a400f267a86 (diff)
downloadshiftos_thereturn-0b3873bb9413d91fee3484c9dc2aea9729e61500.tar.gz
shiftos_thereturn-0b3873bb9413d91fee3484c9dc2aea9729e61500.tar.bz2
shiftos_thereturn-0b3873bb9413d91fee3484c9dc2aea9729e61500.zip
Merge pull request #95 from lempamo/master
icons and stuffs
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs37
-rw-r--r--ShiftOS.WinForms/Applications/AudioPlayer.cs41
-rw-r--r--ShiftOS.WinForms/Applications/ShiftLetters.cs1
-rw-r--r--ShiftOS.WinForms/SystemIcons/iconShiftLetters.pngbin0 -> 243 bytes
-rw-r--r--ShiftOS.WinForms/SystemIcons/iconTerminal.pngbin48451 -> 235 bytes
5 files changed, 79 insertions, 0 deletions
diff --git a/ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs b/ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs
new file mode 100644
index 0000000..3cc88df
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/AudioPlayer.Designer.cs
@@ -0,0 +1,37 @@
+namespace ShiftOS.WinForms.Applications
+{
+ partial class AudioPlayer
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ components = new System.ComponentModel.Container();
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ }
+
+ #endregion
+ }
+}
diff --git a/ShiftOS.WinForms/Applications/AudioPlayer.cs b/ShiftOS.WinForms/Applications/AudioPlayer.cs
new file mode 100644
index 0000000..b7dc9ee
--- /dev/null
+++ b/ShiftOS.WinForms/Applications/AudioPlayer.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
+{
+ public partial class AudioPlayer : UserControl, IShiftOSWindow
+ {
+ public AudioPlayer()
+ {
+ InitializeComponent();
+ }
+
+ public void OnLoad()
+ {
+
+ }
+
+ public void OnSkinLoad()
+ {
+
+ }
+
+ public bool OnUnload()
+ {
+ return true;
+ }
+
+ public void OnUpgrade()
+ {
+
+ }
+ }
+}
diff --git a/ShiftOS.WinForms/Applications/ShiftLetters.cs b/ShiftOS.WinForms/Applications/ShiftLetters.cs
index 6ff528a..0dd1505 100644
--- a/ShiftOS.WinForms/Applications/ShiftLetters.cs
+++ b/ShiftOS.WinForms/Applications/ShiftLetters.cs
@@ -39,6 +39,7 @@ namespace ShiftOS.WinForms.Applications
[Launcher("ShiftLetters", false, null, "Games")]
[RequiresUpgrade("shiftletters")]
[WinOpen("shiftletters")]
+ [DefaultIcon("iconShiftLetters")]
public partial class ShiftLetters : UserControl, IShiftOSWindow
{
int lives = 7;
diff --git a/ShiftOS.WinForms/SystemIcons/iconShiftLetters.png b/ShiftOS.WinForms/SystemIcons/iconShiftLetters.png
new file mode 100644
index 0000000..c82d0c7
--- /dev/null
+++ b/ShiftOS.WinForms/SystemIcons/iconShiftLetters.png
Binary files differ
diff --git a/ShiftOS.WinForms/SystemIcons/iconTerminal.png b/ShiftOS.WinForms/SystemIcons/iconTerminal.png
index df5e779..7a20771 100644
--- a/ShiftOS.WinForms/SystemIcons/iconTerminal.png
+++ b/ShiftOS.WinForms/SystemIcons/iconTerminal.png
Binary files differ