diff options
Diffstat (limited to 'ShiftOS-TheRevival/MainForms')
5 files changed, 225 insertions, 12 deletions
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb index 79bd379..4ecd5b5 100644 --- a/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/Applications/Console.Designer.vb @@ -88,7 +88,7 @@ Partial Class Console ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.Color.Red + Me.BackColor = System.Drawing.Color.Black Me.ClientSize = New System.Drawing.Size(800, 450) Me.Controls.Add(Me.TextBox1) Me.Controls.Add(Me.InfoBar) diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.Designer.vb new file mode 100644 index 0000000..4c4521a --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.Designer.vb @@ -0,0 +1,80 @@ +<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> +Partial Class DuWM_Shifter_About + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + <System.Diagnostics.DebuggerNonUserCode()> + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + <System.Diagnostics.DebuggerStepThrough()> + Private Sub InitializeComponent() + Me.lbl_Title = New System.Windows.Forms.Label() + Me.lbl_ShiftOSVersion = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'lbl_Title + ' + Me.lbl_Title.AutoSize = True + Me.lbl_Title.Font = New System.Drawing.Font("Segoe UI", 24.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle)) + Me.lbl_Title.Location = New System.Drawing.Point(11, 10) + Me.lbl_Title.Name = "lbl_Title" + Me.lbl_Title.Size = New System.Drawing.Size(111, 45) + Me.lbl_Title.TabIndex = 0 + Me.lbl_Title.Text = "About" + ' + 'lbl_ShiftOSVersion + ' + Me.lbl_ShiftOSVersion.AutoSize = True + Me.lbl_ShiftOSVersion.Font = New System.Drawing.Font("Segoe UI", 12.0!) + Me.lbl_ShiftOSVersion.ForeColor = System.Drawing.Color.Black + Me.lbl_ShiftOSVersion.Location = New System.Drawing.Point(15, 97) + Me.lbl_ShiftOSVersion.Name = "lbl_ShiftOSVersion" + Me.lbl_ShiftOSVersion.Size = New System.Drawing.Size(123, 21) + Me.lbl_ShiftOSVersion.TabIndex = 2 + Me.lbl_ShiftOSVersion.Text = "ShiftOS Version " + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Font = New System.Drawing.Font("Segoe UI", 12.0!) + Me.Label1.ForeColor = System.Drawing.Color.Black + Me.Label1.Location = New System.Drawing.Point(15, 69) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(244, 21) + Me.Label1.TabIndex = 2 + Me.Label1.Text = "Shifter for Dual Window Manager" + ' + 'DuWM_Shifter_About + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.White + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.lbl_ShiftOSVersion) + Me.Controls.Add(Me.lbl_Title) + Me.Name = "DuWM_Shifter_About" + Me.Size = New System.Drawing.Size(640, 480) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lbl_Title As Label + Friend WithEvents lbl_ShiftOSVersion As Label + Friend WithEvents Label1 As Label +End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.resx b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.vb new file mode 100644 index 0000000..7591bdd --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/Categories/DuWM_Shifter_About.vb @@ -0,0 +1,5 @@ +Public Class DuWM_Shifter_About + Private Sub DuWM_Shifter_Desktop_Load(sender As Object, e As EventArgs) Handles MyBase.Load + lbl_ShiftOSVersion.Text = lbl_ShiftOSVersion.Text & My.Resources.CurrentVersion + End Sub +End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb index fdd9ba2..b0b4afb 100644 --- a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb +++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb @@ -2,7 +2,7 @@ Private PrevHeight As Integer = Height Private PrevWidth As Integer = Width Private FeatureGap As Integer = 450 - 400 - Private ChildFeature As UserControl + Private ChildFeature As String Private Sub Shifter_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -21,15 +21,23 @@ End Sub Private Sub lst_Features_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lst_Features.SelectedIndexChanged - Select Case lst_Features.SelectedItem - Case "Desktop" - Dim Shifter_Desktop As New DuWM_Shifter_Desktop - Shifter_Desktop.Size = pnl_Content.Size - pnl_Content.Controls.Clear() - pnl_Content.Controls.Add(Shifter_Desktop) - Case "About" - pnl_Content.Controls.Clear() - MsgBox("Aboot") - End Select + If lst_Features.SelectedItem = ChildFeature Then + + Else + Select Case lst_Features.SelectedItem + Case "Desktop" + Dim Shifter_Desktop As New DuWM_Shifter_Desktop + Shifter_Desktop.Size = pnl_Content.Size + ChildFeature = "Desktop" + pnl_Content.Controls.Clear() + pnl_Content.Controls.Add(Shifter_Desktop) + Case "About" + ChildFeature = "About" + Dim Shifter_About As New DuWM_Shifter_About + Shifter_About.Size = pnl_Content.Size + pnl_Content.Controls.Clear() + pnl_Content.Controls.Add(Shifter_About) + End Select + End If End Sub End Class
\ No newline at end of file |