From 365cc92f8a7c20a1a2f455a92188528b1239cd6d Mon Sep 17 00:00:00 2001 From: EverythingWindows Date: Sat, 10 Dec 2022 01:56:35 +0700 Subject: [PATCH] 0.2.8 final code --- .../Functions/OutGame/SaveLoadSystem.vb | 4 +- .../Functions/OutGame/TheUpdater.vb | 104 ++++++ .../Calculator/Uni_Calculator.Designer.vb | 315 ++++++++++++++++++ .../Universal/Calculator/Uni_Calculator.resx | 120 +++++++ .../Universal/Calculator/Uni_Calculator.vb | 3 + .../File Skimmer/Uni_FileSkimmer.Designer.vb | 13 +- .../File Skimmer/Uni_FileSkimmer.resx | 50 +-- .../MainForms/ShiftOSUpdater.vb | 3 +- .../codename AnusWM/AnusWM_Menu.Designer.vb | 44 ++- .../My Project/Settings.Designer.vb | 62 ++-- .../Resources/CurrentVersion.txt | 2 +- ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj | 9 + .../Internal/Com_Shiftfetch.vb | 2 +- 13 files changed, 646 insertions(+), 85 deletions(-) create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.Designer.vb create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.resx create mode 100644 ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.vb diff --git a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb index 8a55d24..a8a0478 100644 --- a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb +++ b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb @@ -144,7 +144,7 @@ Module SaveLoadSystem Strings.ComputerInfo(0) = "shiftos" Strings.ComputerInfo(1) = "user" Strings.ComputerInfo(2) = "0" - Strings.ComputerInfo(4) = "42" + Strings.ComputerInfo(4) = "53" Strings.AvailableFeature(0) = "1" Strings.AvailableFeature(1) = "1" Strings.AvailableFeature(2) = "1" @@ -213,7 +213,7 @@ Module SaveLoadSystem 'Same as new game but codepoints automatically assigned to 9999 and not saved into the FS Strings.ComputerInfo(0) = "shiftos" Strings.ComputerInfo(1) = "user" - Strings.ComputerInfo(2) = 9999 + Strings.ComputerInfo(2) = 100000 Strings.ComputerInfo(4) = "0" Strings.AvailableFeature(0) = "2" Strings.AvailableFeature(1) = "2" diff --git a/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb b/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb index b8b66ec..db45c42 100644 --- a/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb +++ b/ShiftOS-TheRevival/Functions/OutGame/TheUpdater.vb @@ -187,6 +187,18 @@ Module TheUpdater Strings.AvailableFeature(39) = 2 Strings.AvailableFeature(40) = 2 Strings.AvailableFeature(41) = 2 + Strings.AvailableFeature(42) = 2 + Strings.AvailableFeature(43) = 2 + Strings.AvailableFeature(44) = 2 + Strings.AvailableFeature(45) = 2 + Strings.AvailableFeature(46) = 2 + Strings.AvailableFeature(47) = 2 + Strings.AvailableFeature(48) = 2 + Strings.AvailableFeature(49) = 2 + Strings.AvailableFeature(50) = 2 + Strings.AvailableFeature(51) = 2 + Strings.AvailableFeature(52) = 2 + Strings.AvailableFeature(53) = 2 Strings.ComputerInfo(0) = ComputerInfoHere(0) Strings.ComputerInfo(1) = ComputerInfoHere(1) Strings.ComputerInfo(2) = ComputerInfoHere(2) @@ -247,6 +259,98 @@ Module TheUpdater Strings.AvailableFeature(39) = 2 Strings.AvailableFeature(40) = 2 Strings.AvailableFeature(41) = 2 + Strings.AvailableFeature(42) = 2 + Strings.AvailableFeature(43) = 2 + Strings.AvailableFeature(44) = 2 + Strings.AvailableFeature(45) = 2 + Strings.AvailableFeature(46) = 2 + Strings.AvailableFeature(47) = 2 + Strings.AvailableFeature(48) = 2 + Strings.AvailableFeature(49) = 2 + Strings.AvailableFeature(50) = 2 + Strings.AvailableFeature(51) = 2 + Strings.AvailableFeature(52) = 2 + Strings.AvailableFeature(53) = 2 + Strings.ComputerInfo(0) = ComputerInfoHere(0) + Strings.ComputerInfo(1) = ComputerInfoHere(1) + Strings.ComputerInfo(2) = ComputerInfoHere(2) + Strings.ComputerInfo(3) = ComputerInfoHere(3) + Strings.ComputerInfo(4) = ComputerInfoHere(4) + Strings.ComputerInfo(5) = "0F" + Strings.ComputerInfo(6) = "F0" + If Directory.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS") = True Then + + Else + Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS") + End If + ShiftOSUpdater.Button2.Text = "Updated!" + Case "0.2.7" + Strings.AvailableFeature(0) = AvailableFeatureHere(0) + Strings.AvailableFeature(1) = AvailableFeatureHere(1) + Strings.AvailableFeature(2) = AvailableFeatureHere(2) + Strings.AvailableFeature(3) = AvailableFeatureHere(3) + Strings.AvailableFeature(4) = AvailableFeatureHere(4) + Strings.AvailableFeature(5) = AvailableFeatureHere(5) + Strings.AvailableFeature(6) = AvailableFeatureHere(6) + Strings.AvailableFeature(7) = AvailableFeatureHere(7) + Strings.AvailableFeature(8) = AvailableFeatureHere(8) + Strings.AvailableFeature(9) = AvailableFeatureHere(9) + Strings.AvailableFeature(10) = AvailableFeatureHere(10) + Strings.AvailableFeature(11) = AvailableFeatureHere(11) + Strings.AvailableFeature(12) = AvailableFeatureHere(12) + Strings.AvailableFeature(13) = AvailableFeatureHere(13) + Strings.AvailableFeature(14) = AvailableFeatureHere(14) + Strings.AvailableFeature(15) = AvailableFeatureHere(15) + Strings.AvailableFeature(16) = AvailableFeatureHere(16) + Strings.AvailableFeature(17) = AvailableFeatureHere(17) + Strings.AvailableFeature(18) = AvailableFeatureHere(18) + Strings.AvailableFeature(19) = AvailableFeatureHere(19) + Strings.AvailableFeature(20) = AvailableFeatureHere(20) + Strings.AvailableFeature(21) = AvailableFeatureHere(21) + Strings.AvailableFeature(22) = AvailableFeatureHere(22) + Strings.AvailableFeature(23) = AvailableFeatureHere(23) + Strings.AvailableFeature(24) = AvailableFeatureHere(24) + Strings.AvailableFeature(25) = AvailableFeatureHere(25) + Strings.AvailableFeature(26) = AvailableFeatureHere(26) + Strings.AvailableFeature(27) = AvailableFeatureHere(27) + Strings.AvailableFeature(28) = AvailableFeatureHere(28) + Strings.AvailableFeature(29) = AvailableFeatureHere(29) + Strings.AvailableFeature(30) = AvailableFeatureHere(30) + Strings.AvailableFeature(31) = AvailableFeatureHere(31) + Strings.AvailableFeature(32) = AvailableFeatureHere(32) + Strings.AvailableFeature(33) = AvailableFeatureHere(33) + Strings.AvailableFeature(34) = AvailableFeatureHere(34) + Strings.AvailableFeature(35) = AvailableFeatureHere(35) + Strings.AvailableFeature(36) = AvailableFeatureHere(36) + Strings.AvailableFeature(37) = AvailableFeatureHere(37) + Strings.AvailableFeature(38) = AvailableFeatureHere(38) + Strings.AvailableFeature(39) = AvailableFeatureHere(39) + Strings.AvailableFeature(40) = AvailableFeatureHere(40) + Strings.AvailableFeature(41) = AvailableFeatureHere(41) + If Strings.AvailableFeature(37) = 1 Then + Strings.AvailableFeature(42) = 0 + Else + Strings.AvailableFeature(42) = 2 + End If + If Strings.AvailableFeature(35) = 1 Then + Strings.AvailableFeature(43) = 0 + Else + Strings.AvailableFeature(43) = 2 + End If + Strings.AvailableFeature(44) = 2 + Strings.AvailableFeature(45) = 2 + Strings.AvailableFeature(46) = 2 + Strings.AvailableFeature(47) = 2 + Strings.AvailableFeature(48) = 2 + Strings.AvailableFeature(49) = 2 + Strings.AvailableFeature(50) = 2 + Strings.AvailableFeature(51) = 2 + Strings.AvailableFeature(52) = 2 + If Strings.AvailableFeature(36) = 1 Then + Strings.AvailableFeature(53) = 0 + Else + Strings.AvailableFeature(53) = 2 + End If Strings.ComputerInfo(0) = ComputerInfoHere(0) Strings.ComputerInfo(1) = ComputerInfoHere(1) Strings.ComputerInfo(2) = ComputerInfoHere(2) diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.Designer.vb new file mode 100644 index 0000000..3d0efca --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.Designer.vb @@ -0,0 +1,315 @@ + _ +Partial Class Uni_Calculator + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + 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. + _ + Private Sub InitializeComponent() + Me.Button1 = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() + Me.Button4 = New System.Windows.Forms.Button() + Me.Button5 = New System.Windows.Forms.Button() + Me.Button6 = New System.Windows.Forms.Button() + Me.Button7 = New System.Windows.Forms.Button() + Me.Button8 = New System.Windows.Forms.Button() + Me.Button9 = New System.Windows.Forms.Button() + Me.Button10 = New System.Windows.Forms.Button() + Me.Button11 = New System.Windows.Forms.Button() + Me.Button12 = New System.Windows.Forms.Button() + Me.Button13 = New System.Windows.Forms.Button() + Me.Button14 = New System.Windows.Forms.Button() + Me.Button15 = New System.Windows.Forms.Button() + Me.Button16 = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'Button1 + ' + Me.Button1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button1.Location = New System.Drawing.Point(12, 122) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(150, 80) + Me.Button1.TabIndex = 0 + Me.Button1.Text = "1" + Me.Button1.UseVisualStyleBackColor = True + ' + 'Label1 + ' + Me.Label1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Label1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.Label1.Font = New System.Drawing.Font("Tahoma", 20.0!, System.Drawing.FontStyle.Italic) + Me.Label1.Location = New System.Drawing.Point(12, 32) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(618, 77) + Me.Label1.TabIndex = 1 + Me.Label1.Text = "Fuck you, Calculator!" + Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight + ' + 'Button2 + ' + Me.Button2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button2.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button2.Location = New System.Drawing.Point(168, 122) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(150, 80) + Me.Button2.TabIndex = 0 + Me.Button2.Text = "2" + Me.Button2.UseVisualStyleBackColor = True + ' + 'Button3 + ' + Me.Button3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button3.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button3.Location = New System.Drawing.Point(324, 122) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(150, 80) + Me.Button3.TabIndex = 0 + Me.Button3.Text = "3" + Me.Button3.UseVisualStyleBackColor = True + ' + 'Button4 + ' + Me.Button4.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button4.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button4.Location = New System.Drawing.Point(480, 122) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(150, 80) + Me.Button4.TabIndex = 0 + Me.Button4.Text = "+" + Me.Button4.UseVisualStyleBackColor = True + ' + 'Button5 + ' + Me.Button5.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button5.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button5.Location = New System.Drawing.Point(12, 208) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(150, 80) + Me.Button5.TabIndex = 0 + Me.Button5.Text = "4" + Me.Button5.UseVisualStyleBackColor = True + ' + 'Button6 + ' + Me.Button6.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button6.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button6.Location = New System.Drawing.Point(168, 208) + Me.Button6.Name = "Button6" + Me.Button6.Size = New System.Drawing.Size(150, 80) + Me.Button6.TabIndex = 0 + Me.Button6.Text = "5" + Me.Button6.UseVisualStyleBackColor = True + ' + 'Button7 + ' + Me.Button7.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button7.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button7.Location = New System.Drawing.Point(324, 208) + Me.Button7.Name = "Button7" + Me.Button7.Size = New System.Drawing.Size(150, 80) + Me.Button7.TabIndex = 0 + Me.Button7.Text = "6" + Me.Button7.UseVisualStyleBackColor = True + ' + 'Button8 + ' + Me.Button8.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button8.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button8.Location = New System.Drawing.Point(480, 208) + Me.Button8.Name = "Button8" + Me.Button8.Size = New System.Drawing.Size(150, 80) + Me.Button8.TabIndex = 0 + Me.Button8.Text = "-" + Me.Button8.UseVisualStyleBackColor = True + ' + 'Button9 + ' + Me.Button9.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button9.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button9.Location = New System.Drawing.Point(12, 294) + Me.Button9.Name = "Button9" + Me.Button9.Size = New System.Drawing.Size(150, 80) + Me.Button9.TabIndex = 0 + Me.Button9.Text = "7" + Me.Button9.UseVisualStyleBackColor = True + ' + 'Button10 + ' + Me.Button10.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button10.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button10.Location = New System.Drawing.Point(12, 380) + Me.Button10.Name = "Button10" + Me.Button10.Size = New System.Drawing.Size(150, 80) + Me.Button10.TabIndex = 0 + Me.Button10.Text = "C" + Me.Button10.UseVisualStyleBackColor = True + ' + 'Button11 + ' + Me.Button11.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button11.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button11.Location = New System.Drawing.Point(168, 294) + Me.Button11.Name = "Button11" + Me.Button11.Size = New System.Drawing.Size(150, 80) + Me.Button11.TabIndex = 0 + Me.Button11.Text = "8" + Me.Button11.UseVisualStyleBackColor = True + ' + 'Button12 + ' + Me.Button12.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button12.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button12.Location = New System.Drawing.Point(168, 380) + Me.Button12.Name = "Button12" + Me.Button12.Size = New System.Drawing.Size(150, 80) + Me.Button12.TabIndex = 0 + Me.Button12.Text = "0" + Me.Button12.UseVisualStyleBackColor = True + ' + 'Button13 + ' + Me.Button13.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button13.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button13.Location = New System.Drawing.Point(324, 294) + Me.Button13.Name = "Button13" + Me.Button13.Size = New System.Drawing.Size(150, 80) + Me.Button13.TabIndex = 0 + Me.Button13.Text = "9" + Me.Button13.UseVisualStyleBackColor = True + ' + 'Button14 + ' + Me.Button14.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button14.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button14.Location = New System.Drawing.Point(324, 380) + Me.Button14.Name = "Button14" + Me.Button14.Size = New System.Drawing.Size(150, 80) + Me.Button14.TabIndex = 0 + Me.Button14.Text = "=" + Me.Button14.UseVisualStyleBackColor = True + ' + 'Button15 + ' + Me.Button15.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button15.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button15.Location = New System.Drawing.Point(480, 294) + Me.Button15.Name = "Button15" + Me.Button15.Size = New System.Drawing.Size(150, 80) + Me.Button15.TabIndex = 0 + Me.Button15.Text = "*" + Me.Button15.UseVisualStyleBackColor = True + ' + 'Button16 + ' + Me.Button16.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button16.Font = New System.Drawing.Font("Segoe UI", 15.0!) + Me.Button16.Location = New System.Drawing.Point(480, 380) + Me.Button16.Name = "Button16" + Me.Button16.Size = New System.Drawing.Size(150, 80) + Me.Button16.TabIndex = 0 + Me.Button16.Text = "/" + Me.Button16.UseVisualStyleBackColor = True + ' + 'Uni_Calculator + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.Color.White + Me.ClientSize = New System.Drawing.Size(640, 480) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.Button16) + Me.Controls.Add(Me.Button8) + Me.Controls.Add(Me.Button15) + Me.Controls.Add(Me.Button4) + Me.Controls.Add(Me.Button14) + Me.Controls.Add(Me.Button7) + Me.Controls.Add(Me.Button13) + Me.Controls.Add(Me.Button3) + Me.Controls.Add(Me.Button12) + Me.Controls.Add(Me.Button6) + Me.Controls.Add(Me.Button11) + Me.Controls.Add(Me.Button2) + Me.Controls.Add(Me.Button10) + Me.Controls.Add(Me.Button5) + Me.Controls.Add(Me.Button9) + Me.Controls.Add(Me.Button1) + Me.ForeColor = System.Drawing.Color.Black + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Name = "Uni_Calculator" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Uni_Calculator" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents Button1 As Button + Friend WithEvents Label1 As Label + Friend WithEvents Button2 As Button + Friend WithEvents Button3 As Button + Friend WithEvents Button4 As Button + Friend WithEvents Button5 As Button + Friend WithEvents Button6 As Button + Friend WithEvents Button7 As Button + Friend WithEvents Button8 As Button + Friend WithEvents Button9 As Button + Friend WithEvents Button10 As Button + Friend WithEvents Button11 As Button + Friend WithEvents Button12 As Button + Friend WithEvents Button13 As Button + Friend WithEvents Button14 As Button + Friend WithEvents Button15 As Button + Friend WithEvents Button16 As Button +End Class diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.resx b/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.vb b/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.vb new file mode 100644 index 0000000..dc5ec74 --- /dev/null +++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/Calculator/Uni_Calculator.vb @@ -0,0 +1,3 @@ +Public Class Uni_Calculator + +End Class \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.Designer.vb index 54982fe..6c65e04 100644 --- a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.Designer.vb @@ -72,6 +72,7 @@ Partial Class Uni_FileSkimmer Me.msn_Options.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.OptionsToolStripMenuItem, Me.AboutToolStripMenuItem}) Me.msn_Options.Location = New System.Drawing.Point(0, 0) Me.msn_Options.Name = "msn_Options" + Me.msn_Options.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.msn_Options.Size = New System.Drawing.Size(800, 27) Me.msn_Options.TabIndex = 0 Me.msn_Options.Text = "mns_Options" @@ -86,24 +87,24 @@ Partial Class Uni_FileSkimmer 'CompressToolStripMenuItem ' Me.CompressToolStripMenuItem.Name = "CompressToolStripMenuItem" - Me.CompressToolStripMenuItem.Size = New System.Drawing.Size(139, 24) + Me.CompressToolStripMenuItem.Size = New System.Drawing.Size(180, 24) Me.CompressToolStripMenuItem.Text = "Compress" ' 'DeleteToolStripMenuItem ' Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem" - Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(139, 24) + Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(180, 24) Me.DeleteToolStripMenuItem.Text = "Delete" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(136, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6) ' 'CloseToolStripMenuItem ' Me.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem" - Me.CloseToolStripMenuItem.Size = New System.Drawing.Size(139, 24) + Me.CloseToolStripMenuItem.Size = New System.Drawing.Size(180, 24) Me.CloseToolStripMenuItem.Text = "Close" ' 'OptionsToolStripMenuItem @@ -117,14 +118,14 @@ Partial Class Uni_FileSkimmer ' Me.JobBarToolStripMenuItem.CheckOnClick = True Me.JobBarToolStripMenuItem.Name = "JobBarToolStripMenuItem" - Me.JobBarToolStripMenuItem.Size = New System.Drawing.Size(165, 24) + Me.JobBarToolStripMenuItem.Size = New System.Drawing.Size(180, 24) Me.JobBarToolStripMenuItem.Text = "JobBar" ' 'PropertyPaneToolStripMenuItem ' Me.PropertyPaneToolStripMenuItem.CheckOnClick = True Me.PropertyPaneToolStripMenuItem.Name = "PropertyPaneToolStripMenuItem" - Me.PropertyPaneToolStripMenuItem.Size = New System.Drawing.Size(165, 24) + Me.PropertyPaneToolStripMenuItem.Size = New System.Drawing.Size(180, 24) Me.PropertyPaneToolStripMenuItem.Text = "Property Pane" ' 'AboutToolStripMenuItem diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.resx b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.resx index d5eac64..16a6cc9 100644 --- a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.resx +++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA+ - GAAAAk1TRnQBSQFMAgEBCgEAAbABAAGwAQABKgEAASoBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + GAAAAk1TRnQBSQFMAgEBCgEAAbgBAAG4AQABKgEAASoBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABqAMAAX4DAAEBAQABCAUAAbABUhgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -241,8 +241,8 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACI - EwAAAk1TRnQBSQFMAgEBCgEAAWgBAAFoAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB2 + EwAAAk1TRnQBSQFMAgEBCgEAAXABAAFwAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABYAMAAUgDAAEBAQABCAYAARsYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -300,32 +300,32 @@ FuwBbQEAFuwBbQIAAe8I/wIHAfQI/wHvAwAB7wL/AfAOBwL/Ae8CABbsAW0BABbsAW0CAAHvE/8B7wMA Ae8T/wHvAgAW7AFtAQAW7AFtAgAB7wj/Ae0B7AHyCP8B7wMAAe8C/w7sAfcC/wHvAgAW7AFtAQAW7AFt AgAB7wj/Ae0B7AHwCP8B7wMAAe8T/wHvAgAW7AFtAQAW7AFtAgAB7wj/AQcB7AH3CP8B7wMAAe8C/wHw - DgcC/wHvAgAW7AFtAQAW7AFtAgAB7wj/AfIC7AG8B/8B7wMAAe8C/w7yAfMC/wHvAgAB+AHsAW0B7AFt - AewB+ALsAesB7AFtAewB6wLsAfgB7AFtAewBbQHsAW0BABbsAW0CAAHvCf8BvALsAQcG/wHvAwAB7xP/ - Ae8CAAEQARQBbQHsAW0BFAEQAQABEAEUAW0B7AFtARQBEAEAARABFAFtAewBbQEUAgAW7AFtAgAB7wr/ - AbwC7AHvBf8B7wMAAe8C/wEHDvcC/wHvAgAB7AHrAewBbQHsAesC7AH4AewBbQHsAW0B7AH4AuwB6wHs - AW0B7AHrAW0BABbsAW0CAAHvC/8B8ALsAfEE/wHvAwAB7xP/Ae8CABbsAW0BABbsAW0CAAHvDP8BBwHs - AZIE/wHvAwAB7wL/DvcBBwL/Ae8CABbsAW0BABbsAW0CAAHvA/8B9AHvAewB8wX/AfIC7AT/Ae8DAAHv - E/8B7wIAFuwBbQEAFuwBbQIAAe8E/wLsAfAF/wHwAuwE/wHvAwAB7wL/AfMO8gL/Ae8CABbsAW0BABbs - AW0CAAHvBP8BBwHsAe0B8wP/AfMB7QHsAQcE/wHvAwAB7wL/DgcB8AL/Ae8CABbsAW0BABbsAW0CAAHv - BP8B9AHtAuwBvAHyAbwC7AHtAfQE/wHvAwAB7xP/Ae8CABbsAW0BABbsAW0CAAHvBv8BkgXsAZIG/wHv - AwAB7wL/AfcO7AL/Ae8CABbsAW0BAAhtAQ8O8gIAAe8H/wHzA/IB8wf/Ae8DAAHvE/8B7wIACG0BDw7y - AQAIFAH0EAAB7xP/Ae8DAAHvAv8OBwHwAv8B7wIACBQB9CgAAe8T/wHvAwAB7xP/Ae8zAAHvEwAB7wMA - Ae8TAAHvGQABQgFNAT4HAAE+AwABKAMAAWADAAFIAwABAQEAAQEFAAFgAQMWAAP/AQAG/wYAAcABAAED - A/8GAAHAAQABAwGAAQABAQYAAcABAAEDAYABAAEBBgABwAEAAQMBgAEAAQEGAAHAAQABAwGAAQABAQYA + DgcC/wHvAgAW7AFtAQAW7AFtAgAB7wj/AfIC7AG8B/8B7wMAAe8C/w7yAfMC/wHvAgAC7AFtAewBbQTs + AesB7AFtAewB6wTsAW0B7AFtAewBbQEAFuwBbQIAAe8J/wG8AuwBBwb/Ae8DAAHvE/8B7wIAARABFAFt + AewBbQEUARABAAEQARQBbQHsAW0BFAEQAQABEAEUAW0B7AFtARQCABbsAW0CAAHvCv8BvALsAe8F/wHv + AwAB7wL/AQcO9wL/Ae8CAAHsAesB7AFtAewB6wTsAW0B7AFtBOwB6wHsAW0B7AHrAW0BABbsAW0CAAHv + C/8B8ALsAfEE/wHvAwAB7xP/Ae8CABbsAW0BABbsAW0CAAHvDP8BBwHsAZIE/wHvAwAB7wL/DvcBBwL/ + Ae8CABbsAW0BABbsAW0CAAHvA/8B9AHvAewB8wX/AfIC7AT/Ae8DAAHvE/8B7wIAFuwBbQEAFuwBbQIA + Ae8E/wLsAfAF/wHwAuwE/wHvAwAB7wL/AfMO8gL/Ae8CABbsAW0BABbsAW0CAAHvBP8BBwHsAe0B8wP/ + AfMB7QHsAQcE/wHvAwAB7wL/DgcB8AL/Ae8CABbsAW0BABbsAW0CAAHvBP8B9AHtAuwBvAHyAbwC7AHt + AfQE/wHvAwAB7xP/Ae8CABbsAW0BABbsAW0CAAHvBv8BkgXsAZIG/wHvAwAB7wL/AfcO7AL/Ae8CABbs + AW0BAAhtAQ8O8gIAAe8H/wHzA/IB8wf/Ae8DAAHvE/8B7wIACG0BDw7yAQAIFAH0EAAB7xP/Ae8DAAHv + Av8OBwHwAv8B7wIACBQB9CgAAe8T/wHvAwAB7xP/Ae8zAAHvEwAB7wMAAe8TAAHvGQABQgFNAT4HAAE+ + AwABKAMAAWADAAFIAwABAQEAAQEFAAFgAQMWAAP/AQAG/wYAAcABAAEDA/8GAAHAAQABAwGAAQABAQYA AcABAAEDAYABAAEBBgABwAEAAQMBgAEAAQEGAAHAAQABAwGAAQABAQYAAcABAAEDAYABAAEBBgABwAEA - AQMBgAEAAQEGAAHAAQABAwGAAQABAQYAAcABAAEDAYABAAEBBgABwAEAAQMBgAgAAcABAAEDAYAIAAHA - AQABAwGACAABwAEAAQMBgAgAAcABAAEDAYAIAAHAAQABAwGACAABwAEAAQcB4AgAAcABAAEPAeAIAAP/ - AeAIAAP/AeAIAAb/BgAG/wHwAQABDwP/BgAB8AEAAQ8D/wYAAfABAAEPA/8GAAHwAQABDwkAAfABAAEP - CQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHw - AQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEP - CQAB8AEAAQ8HAAE/Af8B8AEAAR8J/wHwAQABPwn/AfABAAF/Bv8BwAEAAQEBwAEAAQED/wMAAcABAAEB - AcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEA + AQMBgAEAAQEGAAHAAQABAwGAAQABAQYAAcABAAEDAYABAAEBBgABwAEAAQMBgAEAAQEGAAHAAQABAwGA + AQABAQYAAcABAAEDAYABAAEBBgABwAEAAQMBgAgAAcABAAEDAYAIAAHAAQABAwGACAABwAEAAQMBgAgA + AcABAAEDAYAIAAHAAQABAwGACAABwAEAAQcB4AgAAcABAAEPAeAIAAP/AeAIAAP/AeAIAAb/BgAG/wHw + AQABDwP/BgAB8AEAAQ8D/wYAAfABAAEPA/8GAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkA + AfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEA + AQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8HAAE/Af8B8AEA + AR8J/wHwAQABPwn/AfABAAF/Bv8BwAEAAQEBwAEAAQED/wMAAcABAAEBAcABAAEBBgABwAEAAQEBwAEA AQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYA AcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEA AQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHA - AQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEEAAE/Af8BwAEAAQEBwAEAAQEBAAE/BP8BwAEA - AQEBwAEAAQEG/wHAAQABAQHAAQABAQP/Cw== + AQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEB + BgABwAEAAQEBwAEAAQEEAAE/Af8BwAEAAQEBwAEAAQEBAAE/BP8BwAEAAQEBwAEAAQEG/wHAAQABAQHA + AQABAQP/Cw== \ No newline at end of file diff --git a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb index 089ea5f..c1a050d 100644 --- a/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb +++ b/ShiftOS-TheRevival/MainForms/ShiftOSUpdater.vb @@ -26,7 +26,8 @@ Public Class ShiftOSUpdater If Not FilePut.FileName = "" Then Button1.Enabled = False Button2.Enabled = False - Dim PutTo As String = "http://148.251.124.62:8080/ShiftOS/versions/ShiftOS-TheRevival.v" & NewVersion & ".exe" + Dim PutTo As String = "http://github.com/EverythingWindows/ShiftOS-TheRevival/releases/download/" & NewVersion & "/ShiftOS-TheRevival.v" & NewVersion & ".exe" + 'Dim PutTo As String = "http://148.251.124.62:8080/ShiftOS/versions/ShiftOS-TheRevival.v" & NewVersion & ".exe" <= Legacy Updater 'Dim GetTo As New Uri(PutTo) My.Computer.Network.DownloadFile(PutTo, FilePut.FileName) 'Revisit this later diff --git a/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb index 6e0e83c..5525f55 100644 --- a/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb +++ b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class AnusWM_Menu Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class AnusWM_Menu '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. - _ + Private Sub InitializeComponent() Me.mnu_Main = New System.Windows.Forms.MenuStrip() Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() @@ -31,7 +31,7 @@ Partial Class AnusWM_Menu Me.StopAnusWMToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.RestartToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ShutdownToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.TestcocjToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.lbl_Title = New System.Windows.Forms.Label() Me.mnu_Main.SuspendLayout() Me.SuspendLayout() ' @@ -41,41 +41,41 @@ Partial Class AnusWM_Menu Me.mnu_Main.Font = New System.Drawing.Font("Segoe UI", 12.0!) Me.mnu_Main.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ApplicationsToolStripMenuItem, Me.ShifterToolStripMenuItem, Me.AboutToolStripMenuItem, Me.ExitToolStripMenuItem}) Me.mnu_Main.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow - Me.mnu_Main.Location = New System.Drawing.Point(0, 0) + Me.mnu_Main.Location = New System.Drawing.Point(0, 25) Me.mnu_Main.Name = "mnu_Main" - Me.mnu_Main.Size = New System.Drawing.Size(169, 121) + Me.mnu_Main.RenderMode = System.Windows.Forms.ToolStripRenderMode.System + Me.mnu_Main.Size = New System.Drawing.Size(139, 112) Me.mnu_Main.TabIndex = 0 Me.mnu_Main.Text = "MenuStrip1" ' 'ToolStripMenuItem1 ' Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" - Me.ToolStripMenuItem1.Size = New System.Drawing.Size(162, 4) + Me.ToolStripMenuItem1.Size = New System.Drawing.Size(106, 4) ' 'ApplicationsToolStripMenuItem ' - Me.ApplicationsToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TestcocjToolStripMenuItem}) Me.ApplicationsToolStripMenuItem.Name = "ApplicationsToolStripMenuItem" - Me.ApplicationsToolStripMenuItem.Size = New System.Drawing.Size(162, 25) + Me.ApplicationsToolStripMenuItem.Size = New System.Drawing.Size(106, 25) Me.ApplicationsToolStripMenuItem.Text = "Applications" ' 'ShifterToolStripMenuItem ' Me.ShifterToolStripMenuItem.Name = "ShifterToolStripMenuItem" - Me.ShifterToolStripMenuItem.Size = New System.Drawing.Size(162, 25) + Me.ShifterToolStripMenuItem.Size = New System.Drawing.Size(106, 25) Me.ShifterToolStripMenuItem.Text = "Shifter" ' 'AboutToolStripMenuItem ' Me.AboutToolStripMenuItem.Name = "AboutToolStripMenuItem" - Me.AboutToolStripMenuItem.Size = New System.Drawing.Size(162, 25) + Me.AboutToolStripMenuItem.Size = New System.Drawing.Size(106, 25) Me.AboutToolStripMenuItem.Text = "About" ' 'ExitToolStripMenuItem ' Me.ExitToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.StopAnusWMToolStripMenuItem, Me.RestartToolStripMenuItem, Me.ShutdownToolStripMenuItem}) Me.ExitToolStripMenuItem.Name = "ExitToolStripMenuItem" - Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(162, 25) + Me.ExitToolStripMenuItem.Size = New System.Drawing.Size(106, 25) Me.ExitToolStripMenuItem.Text = "Exit" ' 'StopAnusWMToolStripMenuItem @@ -96,19 +96,27 @@ Partial Class AnusWM_Menu Me.ShutdownToolStripMenuItem.Size = New System.Drawing.Size(179, 26) Me.ShutdownToolStripMenuItem.Text = "Shutdown" ' - 'TestcocjToolStripMenuItem + 'lbl_Title ' - Me.TestcocjToolStripMenuItem.Name = "TestcocjToolStripMenuItem" - Me.TestcocjToolStripMenuItem.Size = New System.Drawing.Size(180, 26) - Me.TestcocjToolStripMenuItem.Text = "Testcocj" + Me.lbl_Title.BackColor = System.Drawing.Color.Black + Me.lbl_Title.Dock = System.Windows.Forms.DockStyle.Top + Me.lbl_Title.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic) + Me.lbl_Title.ForeColor = System.Drawing.Color.White + Me.lbl_Title.Location = New System.Drawing.Point(0, 0) + Me.lbl_Title.Name = "lbl_Title" + Me.lbl_Title.Size = New System.Drawing.Size(139, 25) + Me.lbl_Title.TabIndex = 1 + Me.lbl_Title.Text = "Toolchest" + Me.lbl_Title.TextAlign = System.Drawing.ContentAlignment.MiddleCenter ' 'AnusWM_Menu ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BackColor = System.Drawing.Color.White - Me.ClientSize = New System.Drawing.Size(169, 121) + Me.ClientSize = New System.Drawing.Size(139, 137) Me.Controls.Add(Me.mnu_Main) + Me.Controls.Add(Me.lbl_Title) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.MainMenuStrip = Me.mnu_Main Me.Name = "AnusWM_Menu" @@ -129,5 +137,5 @@ Partial Class AnusWM_Menu Friend WithEvents StopAnusWMToolStripMenuItem As ToolStripMenuItem Friend WithEvents RestartToolStripMenuItem As ToolStripMenuItem Friend WithEvents ShutdownToolStripMenuItem As ToolStripMenuItem - Friend WithEvents TestcocjToolStripMenuItem As ToolStripMenuItem + Friend WithEvents lbl_Title As Label End Class diff --git a/ShiftOS-TheRevival/My Project/Settings.Designer.vb b/ShiftOS-TheRevival/My Project/Settings.Designer.vb index 2cb65fb..bf296cb 100644 --- a/ShiftOS-TheRevival/My Project/Settings.Designer.vb +++ b/ShiftOS-TheRevival/My Project/Settings.Designer.vb @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + #Region "My.Settings Auto-Save Functionality" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -57,13 +57,13 @@ Namespace My End Namespace Namespace My - - _ + + _ Friend Module MySettingsProperty - - _ + + _ Friend ReadOnly Property Settings() As Global.ShiftOS_TheRevival.My.MySettings Get Return Global.ShiftOS_TheRevival.My.MySettings.Default diff --git a/ShiftOS-TheRevival/Resources/CurrentVersion.txt b/ShiftOS-TheRevival/Resources/CurrentVersion.txt index 967b33f..08456a4 100644 --- a/ShiftOS-TheRevival/Resources/CurrentVersion.txt +++ b/ShiftOS-TheRevival/Resources/CurrentVersion.txt @@ -1 +1 @@ -0.2.7 \ No newline at end of file +0.2.8 \ No newline at end of file diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj index e0ded7c..d9f8782 100644 --- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj +++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj @@ -124,6 +124,12 @@ Form + + Uni_Calculator.vb + + + Form + True True @@ -307,6 +313,9 @@ DuWM_Shifter.vb + + Uni_Calculator.vb + My.Resources ResXFileCodeGenerator diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb index 46da356..c13d8e2 100644 --- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb +++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb @@ -21,7 +21,7 @@ AddLine("Dual Window Manager") End Select End If - NewLine(" ^@@! : @Y .:::^~:. 7# Y@^ Window Manager Theme: -") + NewLine(" ^@@! : @Y .:::^~:. 7# Y@^ Desktop Environment: -") NewLine(" 7@@: ! B@&BBBBGPPB@#Y. :&^ ^@? Terminal: shiftos-terminal") NewLine(" ?@@: 7 :??7~:. 5@@5 :&^ .&? Terminal Font: ") If IsStartG = True Then