aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEverythingWindows <[email protected]>2022-12-03 23:16:06 +0700
committerEverythingWindows <[email protected]>2022-12-03 23:16:06 +0700
commit0e6eb6e76f8227b8055f5ea032f9582dcacee5f5 (patch)
treed4dd7645353ed283b480ee9f2adea0f20a81e590
parent16094d6b2fd9409d0866ac8f62ca355a383ebb1e (diff)
downloadshiftos-therevival-old-0e6eb6e76f8227b8055f5ea032f9582dcacee5f5.tar.gz
shiftos-therevival-old-0e6eb6e76f8227b8055f5ea032f9582dcacee5f5.tar.bz2
shiftos-therevival-old-0e6eb6e76f8227b8055f5ea032f9582dcacee5f5.zip
Console Font finished and the foundation of new window manager is there
-rw-r--r--ShiftOS-TheRevival/API/TerminalAPI.vb6
-rw-r--r--ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb2
-rw-r--r--ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb4
-rw-r--r--ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb34
-rw-r--r--ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb17
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.Designer.vb157
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.resx120
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.vb48
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.Designer.vb2
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb17
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter_Configs.vb1
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.Designer.vb10
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.resx3
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/ico_zip.pngbin0 -> 7236 bytes
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.Designer.vb286
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.resx259
-rw-r--r--ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.vb77
-rw-r--r--ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb124
-rw-r--r--ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.resx123
-rw-r--r--ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.vb13
-rw-r--r--ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj19
-rw-r--r--ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb7
22 files changed, 1017 insertions, 312 deletions
diff --git a/ShiftOS-TheRevival/API/TerminalAPI.vb b/ShiftOS-TheRevival/API/TerminalAPI.vb
index 10a6214..65faa9e 100644
--- a/ShiftOS-TheRevival/API/TerminalAPI.vb
+++ b/ShiftOS-TheRevival/API/TerminalAPI.vb
@@ -14,6 +14,7 @@ Module TerminalAPI
Cursor.Hide()
Strings.OnceInfo(7) = Console.Width
Strings.OnceInfo(8) = Console.Height
+ Console.TextBox1.Font = New Font("Consolas", 11)
If Strings.IsFree = True Then
Strings.ComputerInfo(0) = "shiftos"
Strings.ComputerInfo(1) = "user"
@@ -55,6 +56,11 @@ Module TerminalAPI
Cursor.Show()
Console_Windowed()
Console.TopMost = True
+ Try
+ Console.TextBox1.Font = GUISCustomizations.GUIConsoleFont
+ Catch ex As Exception
+ Console.TextBox1.Font = New Font("Consolas", 11)
+ End Try
Terminal_PrintPrompt()
Terminal_AssignPrompt()
End If
diff --git a/ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb b/ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb
index 0ee26e4..f5d86dc 100644
--- a/ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb
+++ b/ShiftOS-TheRevival/Functions/InGame/ROMs/GUISCustomizations.vb
@@ -1,4 +1,6 @@
Public Class GUISCustomizations
'Desktop Stuff
Public Shared DesktopColor As Color
+ 'Console Stuff
+ Public Shared GUIConsoleFont As Font
End Class
diff --git a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb
index 685b484..6bd57f1 100644
--- a/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb
+++ b/ShiftOS-TheRevival/Functions/InGame/ROMs/Strings.vb
@@ -3,7 +3,7 @@
Public Shared ComputerInfo(7) As String
Public Shared IsFree As Boolean
Public Shared OnceInfo(8) As String
- Public Shared AvailableFeature(52) As String
+ Public Shared AvailableFeature(53) As String
Public Shared CLIInterpreter As String
Public Shared SaveFile As String
Public Shared Achievement As String
@@ -107,6 +107,7 @@
'50 = File Skimmer JobBar [Adds a top bar for actions on File Skimmer] (default : 0)
'51 = File Skimmer Small Icons [Adds small icons layout on File Skimmer] (default : 0)
'52 = File Skimmer List [Adds small icons layout on File Skimmer] (default : 0)
+ '53 = Shifter Console [Adds Console Customization on Shifter] (default : 0)
'
'Features bought hierarchy :
'
@@ -153,6 +154,7 @@
'>>DuWM RGB Support (DUWMRGB) (225 CP)
'>>>DuWM 16 Colors Support (DUWMRGB2) (275 CP)
'>>Shifter (SHIFTER) (250 CP)
+ '>>>Shifter Console (SHR_CONSOLE) (275 CP)
'>>Knowledge Input (KNOWLEDGE) (275 CP)
'>>>KI Animals (KI_ANIMALS) (300 CP)
'>>>KI Fruits (KI_FRUITS) (300 CP)
diff --git a/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb b/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb
index f6bb039..5d9ee99 100644
--- a/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb
+++ b/ShiftOS-TheRevival/Functions/InGame/StoreManager/Shiftoriums.vb
@@ -142,14 +142,17 @@
If Strings.AvailableFeature(36) = 0 Then
NewLine("(shifter | 250 CP) Shifter")
Else
+ If Strings.AvailableFeature(53) = 0 Then
+ NewLine("(shr_console | 275 CP) Shifter Console")
+ End If
If Strings.AvailableFeature(40) = 0 Then
- NewLine("(duwmrgb | 225 CP) DuWM RGB Support")
- Else
- If Strings.AvailableFeature(41) = 0 Then
- NewLine("(duwmrgb2 | 275 CP) DuWM 16 Color Support")
+ NewLine("(duwmrgb | 225 CP) DuWM RGB Support")
+ Else
+ If Strings.AvailableFeature(41) = 0 Then
+ NewLine("(duwmrgb2 | 275 CP) DuWM 16 Color Support")
+ End If
End If
End If
- End If
If Strings.AvailableFeature(37) = 0 Then
NewLine("(knowledge | 275 CP) Knowledge Input")
Else
@@ -688,7 +691,7 @@
NormalCommand()
End If
Case "fs_list"
- If Strings.AvailableFeature(51) = 0 Then
+ If Strings.AvailableFeature(52) = 0 Then
ManHeader(0) = "FS List"
ManHeader(1) = "425 CP"
NewLine(ManHeader(0))
@@ -698,6 +701,17 @@
NewLine(ManHeader(1))
NormalCommand()
End If
+ Case "shr_console"
+ If Strings.AvailableFeature(53) = 0 Then
+ ManHeader(0) = "Shifter Console"
+ ManHeader(1) = "275 CP"
+ NewLine(ManHeader(0))
+ NewLine(Nothing)
+ NewLine("Adds Console customability on Shifter")
+ NewLine(Nothing)
+ NewLine(ManHeader(1))
+ NormalCommand()
+ End If
Case Else
NormalCommand()
Console.TextBox1.Text = Console.TextBox1.Text & Environment.NewLine & "Shiftorium: Bad command or not available"
@@ -867,6 +881,9 @@
Case "fs_list"
Shiftorium_InstallFeatures(True, "fs_list", 52, 425)
NormalCommand()
+ Case "shr_console"
+ Shiftorium_InstallFeatures(True, "shr_console", 53, 275)
+ NormalCommand()
Case Else
NormalCommand()
NewLine("Shiftorium: Bad command or not available")
@@ -1035,6 +1052,7 @@
Strings.AvailableFeature(35) = "1"
Strings.ComputerInfo(7) = 1
GUISCustomizations.DesktopColor = Color.Black
+ GUISCustomizations.GUIConsoleFont = New Font("Consolas", 11)
Strings.AvailableFeature(36) = "0"
Strings.AvailableFeature(37) = "0"
Strings.AvailableFeature(43) = "0"
@@ -1043,6 +1061,7 @@
Strings.AvailableFeature(36) = "1"
Strings.AvailableFeature(40) = "0"
Strings.AvailableFeature(41) = "0"
+ Strings.AvailableFeature(53) = "0"
success = True
Case "knowledge"
Strings.AvailableFeature(37) = "1"
@@ -1105,6 +1124,9 @@
Case "fs_list"
Strings.AvailableFeature(52) = "1"
success = True
+ Case "shr_console"
+ Strings.AvailableFeature(53) = "1"
+ success = True
End Select
If success = False Then
If IsCLI = True Then
diff --git a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb
index 550d01d..68579c0 100644
--- a/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb
+++ b/ShiftOS-TheRevival/Functions/OutGame/SaveLoadSystem.vb
@@ -123,6 +123,7 @@ Module SaveLoadSystem
Strings.AvailableFeature(50) = "2"
Strings.AvailableFeature(51) = "2"
Strings.AvailableFeature(52) = "2"
+ Strings.AvailableFeature(53) = "2"
End Select
End Sub
@@ -191,6 +192,10 @@ Module SaveLoadSystem
Strings.AvailableFeature(50) = "1"
Strings.AvailableFeature(51) = "1"
Strings.AvailableFeature(52) = "1"
+ Strings.AvailableFeature(53) = "1"
+ 'GUI Customizations
+ GUISCustomizations.DesktopColor = Color.Black
+ GUISCustomizations.GUIConsoleFont = New Font("Consolas", 11)
End Sub
Public Sub GodMode()
@@ -256,6 +261,7 @@ Module SaveLoadSystem
Strings.AvailableFeature(50) = "2"
Strings.AvailableFeature(51) = "2"
Strings.AvailableFeature(52) = "2"
+ Strings.AvailableFeature(53) = "2"
End Sub
Public Sub SaveGame()
@@ -267,6 +273,10 @@ Module SaveLoadSystem
Case 1
Dim DesktopColor As Integer = GUISCustomizations.DesktopColor.ToArgb()
File.WriteAllText(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\Shifter_Desktop.sos", DesktopColor.ToString)
+ Dim ConsoleFont(1) As String
+ ConsoleFont(0) = GUISCustomizations.GUIConsoleFont.Name
+ ConsoleFont(1) = GUISCustomizations.GUIConsoleFont.Size
+ File.WriteAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\Shifter_ConsoleFont.sos", ConsoleFont)
End Select
End If
End If
@@ -286,6 +296,13 @@ Module SaveLoadSystem
Else
GUISCustomizations.DesktopColor = Color.Black
End If
+ If File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\Shifter_ConsoleFont.sos") = True Then
+ Dim ConsoleFont(1) As String
+ ConsoleFont = File.ReadAllLines(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\saved\Shifter_ConsoleFont.sos")
+ GUISCustomizations.GUIConsoleFont = New Font(ConsoleFont(0), ConsoleFont(1))
+ Else
+ GUISCustomizations.GUIConsoleFont = New Font("Consolas", 11)
+ End If
End Select
End If
End If
diff --git a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.Designer.vb
new file mode 100644
index 0000000..69e3a30
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.Designer.vb
@@ -0,0 +1,157 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class DuWM_Shifter_Console
+ 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_DescConsole = New System.Windows.Forms.Label()
+ Me.lbl_ConsoleFont = New System.Windows.Forms.Label()
+ Me.cmb_ConsoleFont = New System.Windows.Forms.ComboBox()
+ Me.lbl_ConsoleFontSize = New System.Windows.Forms.Label()
+ Me.cmb_ConsoleFontSize = New System.Windows.Forms.ComboBox()
+ Me.lbl_Example = New System.Windows.Forms.Label()
+ Me.txt_ConsoleExample = New System.Windows.Forms.TextBox()
+ 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(136, 45)
+ Me.lbl_Title.TabIndex = 1
+ Me.lbl_Title.Text = "Console"
+ '
+ 'lbl_DescConsole
+ '
+ Me.lbl_DescConsole.AutoSize = True
+ Me.lbl_DescConsole.Font = New System.Drawing.Font("Segoe UI", 12.0!)
+ Me.lbl_DescConsole.ForeColor = System.Drawing.Color.Black
+ Me.lbl_DescConsole.Location = New System.Drawing.Point(15, 71)
+ Me.lbl_DescConsole.Name = "lbl_DescConsole"
+ Me.lbl_DescConsole.Size = New System.Drawing.Size(266, 21)
+ Me.lbl_DescConsole.TabIndex = 3
+ Me.lbl_DescConsole.Text = "Choose Console font face and its size"
+ '
+ 'lbl_ConsoleFont
+ '
+ Me.lbl_ConsoleFont.AutoSize = True
+ Me.lbl_ConsoleFont.Font = New System.Drawing.Font("Segoe UI", 12.0!)
+ Me.lbl_ConsoleFont.ForeColor = System.Drawing.Color.Black
+ Me.lbl_ConsoleFont.Location = New System.Drawing.Point(15, 106)
+ Me.lbl_ConsoleFont.Name = "lbl_ConsoleFont"
+ Me.lbl_ConsoleFont.Size = New System.Drawing.Size(135, 21)
+ Me.lbl_ConsoleFont.TabIndex = 4
+ Me.lbl_ConsoleFont.Text = "Console Font Face"
+ '
+ 'cmb_ConsoleFont
+ '
+ Me.cmb_ConsoleFont.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+ Me.cmb_ConsoleFont.Font = New System.Drawing.Font("Segoe UI", 12.0!)
+ Me.cmb_ConsoleFont.FormattingEnabled = True
+ Me.cmb_ConsoleFont.Items.AddRange(New Object() {"Consolas", "Courier New", "Lucida Console"})
+ Me.cmb_ConsoleFont.Location = New System.Drawing.Point(156, 103)
+ Me.cmb_ConsoleFont.Name = "cmb_ConsoleFont"
+ Me.cmb_ConsoleFont.Size = New System.Drawing.Size(250, 30)
+ Me.cmb_ConsoleFont.TabIndex = 5
+ '
+ 'lbl_ConsoleFontSize
+ '
+ Me.lbl_ConsoleFontSize.AutoSize = True
+ Me.lbl_ConsoleFontSize.Font = New System.Drawing.Font("Segoe UI", 12.0!)
+ Me.lbl_ConsoleFontSize.ForeColor = System.Drawing.Color.Black
+ Me.lbl_ConsoleFontSize.Location = New System.Drawing.Point(15, 147)
+ Me.lbl_ConsoleFontSize.Name = "lbl_ConsoleFontSize"
+ Me.lbl_ConsoleFontSize.Size = New System.Drawing.Size(133, 21)
+ Me.lbl_ConsoleFontSize.TabIndex = 6
+ Me.lbl_ConsoleFontSize.Text = "Console Font Size"
+ '
+ 'cmb_ConsoleFontSize
+ '
+ Me.cmb_ConsoleFontSize.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed
+ Me.cmb_ConsoleFontSize.Font = New System.Drawing.Font("Segoe UI", 12.0!)
+ Me.cmb_ConsoleFontSize.FormattingEnabled = True
+ Me.cmb_ConsoleFontSize.Items.AddRange(New Object() {"6", "8", "9", "10", "11", "12", "14", "16"})
+ Me.cmb_ConsoleFontSize.Location = New System.Drawing.Point(156, 144)
+ Me.cmb_ConsoleFontSize.Name = "cmb_ConsoleFontSize"
+ Me.cmb_ConsoleFontSize.Size = New System.Drawing.Size(70, 30)
+ Me.cmb_ConsoleFontSize.TabIndex = 5
+ '
+ 'lbl_Example
+ '
+ Me.lbl_Example.AutoSize = True
+ Me.lbl_Example.Font = New System.Drawing.Font("Segoe UI", 12.0!)
+ Me.lbl_Example.ForeColor = System.Drawing.Color.Black
+ Me.lbl_Example.Location = New System.Drawing.Point(15, 189)
+ Me.lbl_Example.Name = "lbl_Example"
+ Me.lbl_Example.Size = New System.Drawing.Size(75, 21)
+ Me.lbl_Example.TabIndex = 6
+ Me.lbl_Example.Text = "Example :"
+ '
+ 'txt_ConsoleExample
+ '
+ Me.txt_ConsoleExample.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.txt_ConsoleExample.BackColor = System.Drawing.Color.Black
+ Me.txt_ConsoleExample.BorderStyle = System.Windows.Forms.BorderStyle.None
+ Me.txt_ConsoleExample.Font = New System.Drawing.Font("Consolas", 11.0!)
+ Me.txt_ConsoleExample.ForeColor = System.Drawing.Color.White
+ Me.txt_ConsoleExample.Location = New System.Drawing.Point(19, 218)
+ Me.txt_ConsoleExample.Multiline = True
+ Me.txt_ConsoleExample.Name = "txt_ConsoleExample"
+ Me.txt_ConsoleExample.ReadOnly = True
+ Me.txt_ConsoleExample.Size = New System.Drawing.Size(600, 243)
+ Me.txt_ConsoleExample.TabIndex = 7
+ Me.txt_ConsoleExample.Text = "devx@shiftos $> ver" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ShiftOS 11 build 11.0.9"
+ '
+ 'DuWM_Shifter_Console
+ '
+ 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.txt_ConsoleExample)
+ Me.Controls.Add(Me.lbl_Example)
+ Me.Controls.Add(Me.lbl_ConsoleFontSize)
+ Me.Controls.Add(Me.cmb_ConsoleFontSize)
+ Me.Controls.Add(Me.cmb_ConsoleFont)
+ Me.Controls.Add(Me.lbl_ConsoleFont)
+ Me.Controls.Add(Me.lbl_DescConsole)
+ Me.Controls.Add(Me.lbl_Title)
+ Me.ForeColor = System.Drawing.Color.Black
+ Me.Name = "DuWM_Shifter_Console"
+ Me.Size = New System.Drawing.Size(640, 480)
+ Me.ResumeLayout(False)
+ Me.PerformLayout()
+
+ End Sub
+
+ Friend WithEvents lbl_Title As Label
+ Friend WithEvents lbl_DescConsole As Label
+ Friend WithEvents lbl_ConsoleFont As Label
+ Friend WithEvents cmb_ConsoleFont As ComboBox
+ Friend WithEvents lbl_ConsoleFontSize As Label
+ Friend WithEvents cmb_ConsoleFontSize As ComboBox
+ Friend WithEvents lbl_Example As Label
+ Friend WithEvents txt_ConsoleExample As TextBox
+End Class
diff --git a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.resx b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.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/DuWM/Shifter/Categories/DuWM_Shifter_Console.vb b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.vb
new file mode 100644
index 0000000..04551ae
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/Categories/DuWM_Shifter_Console.vb
@@ -0,0 +1,48 @@
+Public Class DuWM_Shifter_Console
+ Private Sub DuWM_Shifter_Console_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+ txt_ConsoleExample.Font = Console.TextBox1.Font
+ cmb_ConsoleFont.Text = GUISCustomizations.GUIConsoleFont.Name
+ cmb_ConsoleFontSize.Text = GUISCustomizations.GUIConsoleFont.Size
+ End Sub
+
+ Private Sub cmb_ConsoleFont_DrawItem(ByVal sender As Object, ByVal e As System.Windows.Forms.DrawItemEventArgs) Handles cmb_ConsoleFont.DrawItem
+ e.DrawBackground()
+ If (e.State And DrawItemState.Selected) = DrawItemState.Selected Then
+ e.Graphics.FillRectangle(Brushes.Black, e.Bounds)
+ End If
+ Dim sf As New StringFormat
+ Using b As New SolidBrush(e.ForeColor)
+ e.Graphics.DrawString(cmb_ConsoleFont.GetItemText(cmb_ConsoleFont.Items(e.Index)), e.Font, b, e.Bounds, sf)
+ End Using
+ e.DrawFocusRectangle()
+ End Sub
+
+ Private Sub cmb_ConsoleFontSize_DrawItem(ByVal sender As Object, ByVal e As System.Windows.Forms.DrawItemEventArgs) Handles cmb_ConsoleFontSize.DrawItem
+ e.DrawBackground()
+ If (e.State And DrawItemState.Selected) = DrawItemState.Selected Then
+ e.Graphics.FillRectangle(Brushes.Black, e.Bounds)
+ End If
+ Dim sf As New StringFormat
+ Using b As New SolidBrush(e.ForeColor)
+ e.Graphics.DrawString(cmb_ConsoleFontSize.GetItemText(cmb_ConsoleFontSize.Items(e.Index)), e.Font, b, e.Bounds, sf)
+ End Using
+ e.DrawFocusRectangle()
+ End Sub
+
+ Private Sub cmb_ConsoleFont_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmb_ConsoleFont.SelectedIndexChanged
+ Select Case cmb_ConsoleFont.SelectedItem
+ Case "Consolas"
+ txt_ConsoleExample.Font = New Font("Consolas", txt_ConsoleExample.Font.Size)
+ Case "Courier New"
+ txt_ConsoleExample.Font = New Font("Courier New", txt_ConsoleExample.Font.Size)
+ Case "Lucida Console"
+ txt_ConsoleExample.Font = New Font("Lucida Console", txt_ConsoleExample.Font.Size)
+ End Select
+ DuWM_Shifter_Configs.ConsoleFont = txt_ConsoleExample.Font
+ End Sub
+
+ Private Sub cmb_ConsoleFontSize_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmb_ConsoleFontSize.SelectedIndexChanged
+ txt_ConsoleExample.Font = New Font(txt_ConsoleExample.Font.Name, cmb_ConsoleFontSize.SelectedItem)
+ DuWM_Shifter_Configs.ConsoleFont = txt_ConsoleExample.Font
+ End Sub
+End Class
diff --git a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.Designer.vb
index 97cb13b..78537a8 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.Designer.vb
@@ -53,7 +53,7 @@ Partial Class DuWM_Shifter
Me.lst_Features.Font = New System.Drawing.Font("Segoe UI", 12.0!)
Me.lst_Features.FormattingEnabled = True
Me.lst_Features.ItemHeight = 21
- Me.lst_Features.Items.AddRange(New Object() {"Desktop", "About"})
+ Me.lst_Features.Items.AddRange(New Object() {"Console", "Desktop", "About"})
Me.lst_Features.Location = New System.Drawing.Point(0, 51)
Me.lst_Features.Name = "lst_Features"
Me.lst_Features.Size = New System.Drawing.Size(200, 399)
diff --git a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb
index 04f68e6..da5046d 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter.vb
@@ -5,7 +5,7 @@
Private ChildFeature As String
Private Sub Shifter_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-
+ CheckAvailability()
End Sub
Private Sub lst_Features_DrawItem(ByVal sender As Object, ByVal e As System.Windows.Forms.DrawItemEventArgs) Handles lst_Features.DrawItem
@@ -37,6 +37,12 @@
Else
Select Case lst_Features.SelectedItem
+ Case "Console"
+ Dim Shifter_Console As New DuWM_Shifter_Console
+ Shifter_Console.Size = pnl_Content.Size
+ ChildFeature = "Console"
+ pnl_Content.Controls.Clear()
+ pnl_Content.Controls.Add(Shifter_Console)
Case "Desktop"
Dim Shifter_Desktop As New DuWM_Shifter_Desktop
Shifter_Desktop.Size = pnl_Content.Size
@@ -59,6 +65,9 @@
Private Sub Apply()
Select Case lst_Features.SelectedItem
+ Case "Console"
+ Console.TextBox1.Font = DuWM_Shifter_Configs.ConsoleFont
+ GUISCustomizations.GUIConsoleFont = Console.TextBox1.Font
Case "Desktop"
Desktop.BackColor = DuWM_Shifter_Configs.DesktopBackColor
GUISCustomizations.DesktopColor = Desktop.BackColor
@@ -69,4 +78,10 @@
Apply()
Close()
End Sub
+
+ Private Sub CheckAvailability()
+ If Strings.AvailableFeature(53) = 0 Then
+ lst_Features.Items.Remove("Console")
+ End If
+ End Sub
End Class \ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter_Configs.vb b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter_Configs.vb
index 2b7c70d..219a45b 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter_Configs.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/DuWM/Shifter/DuWM_Shifter_Configs.vb
@@ -1,3 +1,4 @@
Public Class DuWM_Shifter_Configs
Public Shared DesktopBackColor As Color
+ Public Shared ConsoleFont As Font
End Class
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.Designer.vb b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.Designer.vb
index 5f701af..df1b1f2 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.Designer.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.Designer.vb
@@ -153,5 +153,15 @@ Namespace My.Resources
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
+
+ '''<summary>
+ ''' Looks up a localized resource of type System.Drawing.Bitmap.
+ '''</summary>
+ Friend Shared ReadOnly Property ico_zip() As System.Drawing.Bitmap
+ Get
+ Dim obj As Object = ResourceManager.GetObject("ico_zip", resourceCulture)
+ Return CType(obj,System.Drawing.Bitmap)
+ End Get
+ End Property
End Class
End Namespace
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.resx b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.resx
index f36ed03..9fec1f1 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.resx
+++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/FileSkimmerFileIcons.resx
@@ -145,4 +145,7 @@
<data name="ico_video" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>ico_video.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="ico_zip" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>ico_zip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
</root> \ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/ico_zip.png b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/ico_zip.png
new file mode 100644
index 0000000..516ae7a
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Icons/ico_zip.png
Binary files differ
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 058f86c..54982fe 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
@@ -24,9 +24,12 @@ Partial Class Uni_FileSkimmer
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Uni_FileSkimmer))
- Dim ListViewItem2 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("test", 0)
+ Dim ListViewItem1 As System.Windows.Forms.ListViewItem = New System.Windows.Forms.ListViewItem("test", 0)
Me.msn_Options = New System.Windows.Forms.MenuStrip()
Me.FileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.CompressToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.CloseToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.OptionsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.JobBarToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -35,7 +38,14 @@ Partial Class Uni_FileSkimmer
Me.pnl_JobBar = New System.Windows.Forms.Panel()
Me.cmb_Layout = New System.Windows.Forms.ComboBox()
Me.Label1 = New System.Windows.Forms.Label()
+ Me.Label2 = New System.Windows.Forms.Label()
+ Me.btn_CopyPath = New System.Windows.Forms.Button()
+ Me.btn_Rename = New System.Windows.Forms.Button()
+ Me.btn_Delete = New System.Windows.Forms.Button()
+ Me.btn_Compress = New System.Windows.Forms.Button()
+ Me.btn_NewFolder = New System.Windows.Forms.Button()
Me.pnl_Properties = New System.Windows.Forms.Panel()
+ Me.pic_Icon = New System.Windows.Forms.PictureBox()
Me.lbl_filesize = New System.Windows.Forms.Label()
Me.lbl_filetype = New System.Windows.Forms.Label()
Me.lbl_filename = New System.Windows.Forms.Label()
@@ -48,21 +58,11 @@ Partial Class Uni_FileSkimmer
Me.lbl_Address = New System.Windows.Forms.Label()
Me.lsv_Content = New System.Windows.Forms.ListView()
Me.iml_smallicons = New System.Windows.Forms.ImageList(Me.components)
- Me.Label2 = New System.Windows.Forms.Label()
- Me.pic_Icon = New System.Windows.Forms.PictureBox()
- Me.btn_CopyPath = New System.Windows.Forms.Button()
- Me.btn_Rename = New System.Windows.Forms.Button()
- Me.btn_Delete = New System.Windows.Forms.Button()
- Me.btn_Compress = New System.Windows.Forms.Button()
- Me.btn_NewFolder = New System.Windows.Forms.Button()
- Me.DeleteToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.CompressToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.msn_Options.SuspendLayout()
Me.pnl_JobBar.SuspendLayout()
Me.pnl_Properties.SuspendLayout()
- Me.pnl_AddressBar.SuspendLayout()
CType(Me.pic_Icon, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.pnl_AddressBar.SuspendLayout()
Me.SuspendLayout()
'
'msn_Options
@@ -83,10 +83,27 @@ Partial Class Uni_FileSkimmer
Me.FileToolStripMenuItem.Size = New System.Drawing.Size(41, 23)
Me.FileToolStripMenuItem.Text = "File"
'
+ 'CompressToolStripMenuItem
+ '
+ Me.CompressToolStripMenuItem.Name = "CompressToolStripMenuItem"
+ Me.CompressToolStripMenuItem.Size = New System.Drawing.Size(139, 24)
+ Me.CompressToolStripMenuItem.Text = "Compress"
+ '
+ 'DeleteToolStripMenuItem
+ '
+ Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
+ Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(139, 24)
+ Me.DeleteToolStripMenuItem.Text = "Delete"
+ '
+ 'ToolStripSeparator1
+ '
+ Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(136, 6)
+ '
'CloseToolStripMenuItem
'
Me.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem"
- Me.CloseToolStripMenuItem.Size = New System.Drawing.Size(111, 24)
+ Me.CloseToolStripMenuItem.Size = New System.Drawing.Size(139, 24)
Me.CloseToolStripMenuItem.Text = "Close"
'
'OptionsToolStripMenuItem
@@ -100,14 +117,14 @@ Partial Class Uni_FileSkimmer
'
Me.JobBarToolStripMenuItem.CheckOnClick = True
Me.JobBarToolStripMenuItem.Name = "JobBarToolStripMenuItem"
- Me.JobBarToolStripMenuItem.Size = New System.Drawing.Size(180, 24)
+ Me.JobBarToolStripMenuItem.Size = New System.Drawing.Size(165, 24)
Me.JobBarToolStripMenuItem.Text = "JobBar"
'
'PropertyPaneToolStripMenuItem
'
Me.PropertyPaneToolStripMenuItem.CheckOnClick = True
Me.PropertyPaneToolStripMenuItem.Name = "PropertyPaneToolStripMenuItem"
- Me.PropertyPaneToolStripMenuItem.Size = New System.Drawing.Size(180, 24)
+ Me.PropertyPaneToolStripMenuItem.Size = New System.Drawing.Size(165, 24)
Me.PropertyPaneToolStripMenuItem.Text = "Property Pane"
'
'AboutToolStripMenuItem
@@ -154,6 +171,89 @@ Partial Class Uni_FileSkimmer
Me.Label1.TabIndex = 0
Me.Label1.Text = "Layout"
'
+ 'Label2
+ '
+ Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+ Me.Label2.AutoSize = True
+ Me.Label2.Font = New System.Drawing.Font("Tahoma", 30.0!)
+ Me.Label2.ForeColor = System.Drawing.Color.Gray
+ Me.Label2.Location = New System.Drawing.Point(567, 35)
+ Me.Label2.Name = "Label2"
+ Me.Label2.Size = New System.Drawing.Size(247, 48)
+ Me.Label2.TabIndex = 2
+ Me.Label2.Text = "File Skimmer"
+ '
+ 'btn_CopyPath
+ '
+ Me.btn_CopyPath.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_CopyPath.Font = New System.Drawing.Font("Segoe UI", 7.0!)
+ Me.btn_CopyPath.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
+ Me.btn_CopyPath.Location = New System.Drawing.Point(213, 0)
+ Me.btn_CopyPath.Name = "btn_CopyPath"
+ Me.btn_CopyPath.Size = New System.Drawing.Size(72, 70)
+ Me.btn_CopyPath.TabIndex = 0
+ Me.btn_CopyPath.Text = "Copy path"
+ Me.btn_CopyPath.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+ Me.btn_CopyPath.UseVisualStyleBackColor = True
+ '
+ 'btn_Rename
+ '
+ Me.btn_Rename.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_Rename.Font = New System.Drawing.Font("Segoe UI", 7.0!)
+ Me.btn_Rename.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
+ Me.btn_Rename.Location = New System.Drawing.Point(142, 0)
+ Me.btn_Rename.Name = "btn_Rename"
+ Me.btn_Rename.Size = New System.Drawing.Size(72, 70)
+ Me.btn_Rename.TabIndex = 0
+ Me.btn_Rename.Text = "Rename"
+ Me.btn_Rename.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+ Me.btn_Rename.UseVisualStyleBackColor = True
+ '
+ 'btn_Delete
+ '
+ Me.btn_Delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_Delete.Font = New System.Drawing.Font("Segoe UI", 7.0!)
+ Me.btn_Delete.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
+ Me.btn_Delete.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.btn_Delete.Location = New System.Drawing.Point(71, 0)
+ Me.btn_Delete.Name = "btn_Delete"
+ Me.btn_Delete.Size = New System.Drawing.Size(72, 70)
+ Me.btn_Delete.TabIndex = 0
+ Me.btn_Delete.Text = "Delete"
+ Me.btn_Delete.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+ Me.btn_Delete.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+ Me.btn_Delete.UseVisualStyleBackColor = True
+ '
+ 'btn_Compress
+ '
+ Me.btn_Compress.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_Compress.Font = New System.Drawing.Font("Segoe UI", 7.0!)
+ Me.btn_Compress.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
+ Me.btn_Compress.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.btn_Compress.Location = New System.Drawing.Point(284, 0)
+ Me.btn_Compress.Name = "btn_Compress"
+ Me.btn_Compress.Size = New System.Drawing.Size(72, 70)
+ Me.btn_Compress.TabIndex = 0
+ Me.btn_Compress.Text = "Compress"
+ Me.btn_Compress.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+ Me.btn_Compress.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+ Me.btn_Compress.UseVisualStyleBackColor = True
+ '
+ 'btn_NewFolder
+ '
+ Me.btn_NewFolder.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_NewFolder.Font = New System.Drawing.Font("Segoe UI", 7.0!)
+ Me.btn_NewFolder.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
+ Me.btn_NewFolder.ImageAlign = System.Drawing.ContentAlignment.TopCenter
+ Me.btn_NewFolder.Location = New System.Drawing.Point(0, 0)
+ Me.btn_NewFolder.Name = "btn_NewFolder"
+ Me.btn_NewFolder.Size = New System.Drawing.Size(72, 70)
+ Me.btn_NewFolder.TabIndex = 0
+ Me.btn_NewFolder.Text = "New Folder"
+ Me.btn_NewFolder.TextAlign = System.Drawing.ContentAlignment.BottomCenter
+ Me.btn_NewFolder.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
+ Me.btn_NewFolder.UseVisualStyleBackColor = True
+ '
'pnl_Properties
'
Me.pnl_Properties.BackColor = System.Drawing.Color.Gray
@@ -169,6 +269,15 @@ Partial Class Uni_FileSkimmer
Me.pnl_Properties.TabIndex = 2
Me.pnl_Properties.Visible = False
'
+ 'pic_Icon
+ '
+ Me.pic_Icon.Location = New System.Drawing.Point(10, 42)
+ Me.pic_Icon.Name = "pic_Icon"
+ Me.pic_Icon.Size = New System.Drawing.Size(64, 64)
+ Me.pic_Icon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
+ Me.pic_Icon.TabIndex = 2
+ Me.pic_Icon.TabStop = False
+ '
'lbl_filesize
'
Me.lbl_filesize.AutoSize = True
@@ -214,14 +323,15 @@ Partial Class Uni_FileSkimmer
Me.iml_icons.ImageStream = CType(resources.GetObject("iml_icons.ImageStream"), System.Windows.Forms.ImageListStreamer)
Me.iml_icons.TransparentColor = System.Drawing.Color.Transparent
Me.iml_icons.Images.SetKeyName(0, "ico_folder.bmp")
- Me.iml_icons.Images.SetKeyName(1, "ico_textfile.bmp")
- Me.iml_icons.Images.SetKeyName(2, "ico_unknown.bmp")
- Me.iml_icons.Images.SetKeyName(3, "ico_picture.bmp")
- Me.iml_icons.Images.SetKeyName(4, "ico_up.bmp")
- Me.iml_icons.Images.SetKeyName(5, "ico_url.bmp")
- Me.iml_icons.Images.SetKeyName(6, "ico_video.bmp")
- Me.iml_icons.Images.SetKeyName(7, "ico_sfp.png")
- Me.iml_icons.Images.SetKeyName(8, "ico_exe.png")
+ Me.iml_icons.Images.SetKeyName(1, "ico_unknown.bmp")
+ Me.iml_icons.Images.SetKeyName(2, "ico_textfile.bmp")
+ Me.iml_icons.Images.SetKeyName(3, "ico_zip.png")
+ Me.iml_icons.Images.SetKeyName(4, "ico_picture.bmp")
+ Me.iml_icons.Images.SetKeyName(5, "ico_up.bmp")
+ Me.iml_icons.Images.SetKeyName(6, "ico_url.bmp")
+ Me.iml_icons.Images.SetKeyName(7, "ico_video.bmp")
+ Me.iml_icons.Images.SetKeyName(8, "ico_sfp.png")
+ Me.iml_icons.Images.SetKeyName(9, "ico_exe.png")
'
'pnl_AddressBar
'
@@ -282,7 +392,7 @@ Partial Class Uni_FileSkimmer
Me.lsv_Content.Dock = System.Windows.Forms.DockStyle.Fill
Me.lsv_Content.Font = New System.Drawing.Font("Segoe UI", 8.0!)
Me.lsv_Content.HideSelection = False
- Me.lsv_Content.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem2})
+ Me.lsv_Content.Items.AddRange(New System.Windows.Forms.ListViewItem() {ListViewItem1})
Me.lsv_Content.LargeImageList = Me.iml_icons
Me.lsv_Content.Location = New System.Drawing.Point(0, 133)
Me.lsv_Content.MultiSelect = False
@@ -298,123 +408,15 @@ Partial Class Uni_FileSkimmer
Me.iml_smallicons.ImageStream = CType(resources.GetObject("iml_smallicons.ImageStream"), System.Windows.Forms.ImageListStreamer)
Me.iml_smallicons.TransparentColor = System.Drawing.Color.Transparent
Me.iml_smallicons.Images.SetKeyName(0, "ico_folder.bmp")
- Me.iml_smallicons.Images.SetKeyName(1, "ico_textfile.bmp")
- Me.iml_smallicons.Images.SetKeyName(2, "ico_unknown.bmp")
- Me.iml_smallicons.Images.SetKeyName(3, "ico_picture.bmp")
- Me.iml_smallicons.Images.SetKeyName(4, "ico_up.bmp")
- Me.iml_smallicons.Images.SetKeyName(5, "ico_url.bmp")
- Me.iml_smallicons.Images.SetKeyName(6, "ico_video.bmp")
- Me.iml_smallicons.Images.SetKeyName(7, "ico_sfp.png")
- Me.iml_smallicons.Images.SetKeyName(8, "ico_exe.png")
- '
- 'Label2
- '
- Me.Label2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
- Me.Label2.AutoSize = True
- Me.Label2.Font = New System.Drawing.Font("Tahoma", 30.0!)
- Me.Label2.ForeColor = System.Drawing.Color.Gray
- Me.Label2.Location = New System.Drawing.Point(567, 35)
- Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(247, 48)
- Me.Label2.TabIndex = 2
- Me.Label2.Text = "File Skimmer"
- '
- 'pic_Icon
- '
- Me.pic_Icon.Location = New System.Drawing.Point(10, 42)
- Me.pic_Icon.Name = "pic_Icon"
- Me.pic_Icon.Size = New System.Drawing.Size(64, 64)
- Me.pic_Icon.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage
- Me.pic_Icon.TabIndex = 2
- Me.pic_Icon.TabStop = False
- '
- 'btn_CopyPath
- '
- Me.btn_CopyPath.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btn_CopyPath.Font = New System.Drawing.Font("Segoe UI", 7.0!)
- Me.btn_CopyPath.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
- Me.btn_CopyPath.Location = New System.Drawing.Point(213, 0)
- Me.btn_CopyPath.Name = "btn_CopyPath"
- Me.btn_CopyPath.Size = New System.Drawing.Size(72, 70)
- Me.btn_CopyPath.TabIndex = 0
- Me.btn_CopyPath.Text = "Copy path"
- Me.btn_CopyPath.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
- Me.btn_CopyPath.UseVisualStyleBackColor = True
- '
- 'btn_Rename
- '
- Me.btn_Rename.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btn_Rename.Font = New System.Drawing.Font("Segoe UI", 7.0!)
- Me.btn_Rename.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
- Me.btn_Rename.Location = New System.Drawing.Point(142, 0)
- Me.btn_Rename.Name = "btn_Rename"
- Me.btn_Rename.Size = New System.Drawing.Size(72, 70)
- Me.btn_Rename.TabIndex = 0
- Me.btn_Rename.Text = "Rename"
- Me.btn_Rename.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
- Me.btn_Rename.UseVisualStyleBackColor = True
- '
- 'btn_Delete
- '
- Me.btn_Delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btn_Delete.Font = New System.Drawing.Font("Segoe UI", 7.0!)
- Me.btn_Delete.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
- Me.btn_Delete.ImageAlign = System.Drawing.ContentAlignment.TopCenter
- Me.btn_Delete.Location = New System.Drawing.Point(71, 0)
- Me.btn_Delete.Name = "btn_Delete"
- Me.btn_Delete.Size = New System.Drawing.Size(72, 70)
- Me.btn_Delete.TabIndex = 0
- Me.btn_Delete.Text = "Delete"
- Me.btn_Delete.TextAlign = System.Drawing.ContentAlignment.BottomCenter
- Me.btn_Delete.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
- Me.btn_Delete.UseVisualStyleBackColor = True
- '
- 'btn_Compress
- '
- Me.btn_Compress.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btn_Compress.Font = New System.Drawing.Font("Segoe UI", 7.0!)
- Me.btn_Compress.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
- Me.btn_Compress.ImageAlign = System.Drawing.ContentAlignment.TopCenter
- Me.btn_Compress.Location = New System.Drawing.Point(284, 0)
- Me.btn_Compress.Name = "btn_Compress"
- Me.btn_Compress.Size = New System.Drawing.Size(72, 70)
- Me.btn_Compress.TabIndex = 0
- Me.btn_Compress.Text = "Compress"
- Me.btn_Compress.TextAlign = System.Drawing.ContentAlignment.BottomCenter
- Me.btn_Compress.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
- Me.btn_Compress.UseVisualStyleBackColor = True
- '
- 'btn_NewFolder
- '
- Me.btn_NewFolder.FlatStyle = System.Windows.Forms.FlatStyle.Flat
- Me.btn_NewFolder.Font = New System.Drawing.Font("Segoe UI", 7.0!)
- Me.btn_NewFolder.Image = Global.ShiftOS_TheRevival.My.Resources.Resources.ico_folder
- Me.btn_NewFolder.ImageAlign = System.Drawing.ContentAlignment.TopCenter
- Me.btn_NewFolder.Location = New System.Drawing.Point(0, 0)
- Me.btn_NewFolder.Name = "btn_NewFolder"
- Me.btn_NewFolder.Size = New System.Drawing.Size(72, 70)
- Me.btn_NewFolder.TabIndex = 0
- Me.btn_NewFolder.Text = "New Folder"
- Me.btn_NewFolder.TextAlign = System.Drawing.ContentAlignment.BottomCenter
- Me.btn_NewFolder.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText
- Me.btn_NewFolder.UseVisualStyleBackColor = True
- '
- 'DeleteToolStripMenuItem
- '
- Me.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"
- Me.DeleteToolStripMenuItem.Size = New System.Drawing.Size(180, 24)
- Me.DeleteToolStripMenuItem.Text = "Delete"
- '
- 'CompressToolStripMenuItem
- '
- Me.CompressToolStripMenuItem.Name = "CompressToolStripMenuItem"
- Me.CompressToolStripMenuItem.Size = New System.Drawing.Size(180, 24)
- Me.CompressToolStripMenuItem.Text = "Compress"
- '
- 'ToolStripSeparator1
- '
- Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
+ Me.iml_smallicons.Images.SetKeyName(1, "ico_unknown.bmp")
+ Me.iml_smallicons.Images.SetKeyName(2, "ico_textfile.bmp")
+ Me.iml_smallicons.Images.SetKeyName(3, "ico_zip.png")
+ Me.iml_smallicons.Images.SetKeyName(4, "ico_picture.bmp")
+ Me.iml_smallicons.Images.SetKeyName(5, "ico_up.bmp")
+ Me.iml_smallicons.Images.SetKeyName(6, "ico_url.bmp")
+ Me.iml_smallicons.Images.SetKeyName(7, "ico_video.bmp")
+ Me.iml_smallicons.Images.SetKeyName(8, "ico_sfp.png")
+ Me.iml_smallicons.Images.SetKeyName(9, "ico_exe.png")
'
'Uni_FileSkimmer
'
@@ -439,9 +441,9 @@ Partial Class Uni_FileSkimmer
Me.pnl_JobBar.PerformLayout()
Me.pnl_Properties.ResumeLayout(False)
Me.pnl_Properties.PerformLayout()
+ CType(Me.pic_Icon, System.ComponentModel.ISupportInitialize).EndInit()
Me.pnl_AddressBar.ResumeLayout(False)
Me.pnl_AddressBar.PerformLayout()
- CType(Me.pic_Icon, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
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 e2de425..d5eac64 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.resx
+++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.resx
@@ -127,8 +127,8 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACA
- FwAAAk1TRnQBSQFMAgEBCQEAAagBAAGoAQABKgEAASoBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA+
+ GAAAAk1TRnQBSQFMAgEBCgEAAbABAAGwAQABKgEAASoBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABqAMAAX4DAAEBAQABCAUAAbABUhgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc
AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA
AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz
@@ -156,79 +156,82 @@
AZkBzAEAAf8BmQH/AQAB/wHMAgAB/wHMATMBAAH/AcwBZgEAAf8BzAGZAQAB/wLMAQAB/wHMAf8BAAL/
ATMBAAHMAf8BZgEAAv8BmQEAAv8BzAEAAmYB/wEAAWYB/wFmAQABZgL/AQAB/wJmAQAB/wFmAf8BAAL/
AWYBAAEhAQABpQEAA18BAAN3AQADhgEAA5YBAAPLAQADsgEAA9cBAAPdAQAD4wEAA+oBAAPxAQAD+AEA
- AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP//wD/AP8ATgAm7IIA
- Aewk/wHsggAB7CT/AeyCAAHsJP8B7IIAAewk/wHsggAB7CT/AeyCAAHsJP8B7IIAAewk/wHsggAB7CT/
- AeyCAAHsJP8B7IIAAewk/wHsggAB7CT/AeyCAAHsJP8B7IIAAewk/wHsggAB7CT/AeyCAAHsJP8B7IIA
- Aewk/wHsggAB7CT/AeyCAAHsJP8D7IAAAewk/wHsAf8B7IAAAewk/wHsAf8B7IAAAewk/wHsAf8B7IAA
- Aewk/wHsAf8B7IAAAewk/wHsAf8B7IAAAewk/wHsAf8B7IAAJuwB/wHsgAAd7AIAAewCAAHsAgAB7AH/
- AeyAAB3sAgAB7AIAAewCAAHsAf8B7IAAJuwB/wHshAAB7CL/AeyEAAHsIv8B7IQAAewi/wHshAAk7IQA
- G+wCAAHsAgAB7AIAAeyEABvsAgAB7AIAAewCAAHshAAk7P8AZAAK/5MACv8BAAr/AQAB7AP/jgAJ/wEA
- DP8BAAHsAv+OAAn/AQAM/wEAAewC/10AKOwJAAj/AQAN/wEAAewC/10AD+wKAA/sCQAH/wEAA/8BAAr/
- AQAB7AL/XQAP7AEACP8BAA/sCQAH/wEAAv8CAAL/AQAC/wEAAv8BAAH/AQAB7AL/OQAc/wgAD+wBAAj/
- AQAP7AkACP8CAAHsAQAC/wEAAv8BAAL/AQAB/wEAAewC/wkAKP8IABz/CAAP7AEACP8BAA/sCQAL/wEA
- Av8BAAL/AQAC/wIAAewD/wkAKP8IABz/CAAP7AEACP8BAA/sCQAL/wEAAv8BAAL/AwAB7AX/CQAo/wgA
- HP8IAA/sAQAI/wEAD+wJAAv/AQAC/wMAAewI/wkAKP8IABz/CAAP7AEACP8BAA/sCQAL/wEAAv8BAAHs
- Cv8JAA//AQAY/wgAHP8IAA/sAQAI/wEAD+wJAAv/AQAC/wEAAewK/wkAD/8CABf/CAAc/wgAD+wBAAj/
- AQAP7AkAC/8BAAL/AQAB7Ar/CQAP/wMAFv8IABz/CAAP7AEACP8BAA/sCQAL/wEAAv8BAAHsCv8JAA//
- BAAV/wgAHP8IAA/sAQAI/wEAD+wJAAL/CfwBAAL/AQAB7Ar/CQAP/wUAFP8IABz/CAAP7AEACP8BAA/s
- CQAM/wIAAewL/wkAD/8GABP/CAAc/wgAD+wBAAj/AQAP7AkAA/8E/AL/AfwE/wH8C/8JAA//BwAS/wgA
- HP8IAA/sAQAI/wEAD+wJAAL/AfwE/wH8Af8B/AT/AfwL/wkAD/8IABH/CAAc/wgAD+wBAAj/AQAP7AkA
- Av8B/AT/AfwB/wH8BP8B/Av/CQAP/wkAEP8IABz/CAAP7AEACP8BAA/sCQAC/wH8BP8B/AH/AvwD/wH8
- C/8JAA//CgAP/wgAHP8IAArsBgAI/wcACewJAAL/AfwE/wH8Af8B/AH/AvwB/wH8C/8JAA//CgAP/wgA
- HP8IAArsAQAT/wEACewJAAL/AfwE/wH8Bv8B/Av/CQAP/wkAEP8IABz/CAAL7AEAEf8BAArsCQAC/wH8
- BP8B/Ab/AfwL/wkAD/8IABH/CAAc/wgADOwBAA//AQAL7AkAAv8B/AT/AfwG/wH8C/8JAA//BwAS/ywA
- DewBAA3/AQAM7AkAAv8B/AT/AfwG/wH8C/8JAA//BgAT/ywADuwBAAv/AQAN7AkAGv8JAA//BQAU/ywA
- D+wBAAn/AQAO7AkAGv8JAA//BAAV/ywAEOwBAAf/AQAP7AkAGv8JAA//AwAW/wwAFP8MABHsAQAF/wEA
- EOwJABr/CQAP/wIAF/8MAA7/BAAC/wwAEuwBAAP/AQAR7AkAGv8JAA//AQAY/wwADv8EAAL/DAAT7AEA
- Af8BABLsCQAa/wkAKP8MAA7/BAAC/wwAFOwBABPsCQAa/wkAKP8MAA7/BAAC/wwAKOwJABr/CQAo/wwA
- Dv8EAAL/DAAo7AkAGv8JACj/DAAO/wQAAv89ABT/QwAU/wwAD+wiABT/AQAC/wLsPgAU/wwADuwjABT/
- AQAB/wLskAAU/wEAAuyRABT/AQAB7JIAFP//AOIAIf8JACH/XQAh/wkAIf9dACH/CQAh/y8AKOwGAAT/
- GuwD/wkAIf8FACjsAgAo7AYAIf8JACH/BQAo7AIAKOwGACH/CQAO/wTsD/8FACjsAgAo7AYAA/8a7AT/
- CQAO/wTsD/8FACjsAgAo7AYAIf8JAA7/BOwP/wUAKOwCACjsBgAh/wkADv8E7A//BQAo7AIAKOwGAAT/
- GuwD/wkAIf8FACTsBP8CACjsBgAh/wkAIf8FACHsB/8CACjsBgAh/wkAIf8FAAX/GuwJ/wIAKOwGAAP/
- GuwE/wkADv8BkgPsD/8FAAj/FuwF/wHsBP8CACjsBgAh/wkADv8BkgPsD/8FAA//C+wJ/wLsA/8CACjs
- BgAh/wkADv8BkgPsAfIO/wUAHv8B7AX/AewD/wIAKOwGAAT/GuwD/wkADv8BBwPsAbwO/wUAHv8C7AT/
- AuwC/wIAKOwGACH/CQAO/wHxBOwO/wUAF/8D7AX/AuwE/wHsAv8CACjsBgAh/wkAD/8E7AHvDf8FABn/
- AuwF/wHsBP8B7AL/AgAo7AYAA/8a7AT/CQAP/wHxBOwB7wz/BQAa/wHsBf8B7AT/AewC/wIAKOwGACH/
- CQAQ/wG8BOwB7wH0Cv8FABr/AuwE/wHsBP8C7AH/AgAo7AYAIf8JABH/AbwE7AHtAfQJ/wUAE/8E7AT/
- AuwJ/wHsAf8CACjsBgAE/xrsA/8JABL/AfAE7AGSCf8FABb/AuwF/wHsCv8CACjsBgAh/wkAE/8B8gTs
- Ae8I/wUAF/8B7An/BuwB/wIAKOwGACH/CQAU/wHyBOwB8gf/BQAX/wLsBv8J7AIAKOwGAAP/GuwE/wkA
- Ff8BvAPsAe8H/wUAEP8B7Af/AuwE/wrsAgAo7AYAIf8JABb/BOwH/wUAEP8D7Ab/AuwC/wvsAgAo7AYA
- If8JAAb/AfMB7wGSAewB7wv/AZID7Af/BQAS/wPsB/8M7AIAKOwGAAT/GuwD/wkABv8B9APsAe0L/wHt
- A+wH/wUAFP8C7Ab/DOwCACjsBgAh/wkAB/8E7AHyCf8B8wPsAe0H/wUAFf8C7AT/DewCACjsBgAh/wkA
- B/8BBwPsAfcJ/wH3A+wB7wf/BQAN/wTsBf8D7AL/DewCACjsBgAD/xrsBP8JAAf/AfQE7AHvB/8B7wTs
- AfMH/wUAEP8C7An/DewCACjsBgAh/wkACP8BBwTsAZIB8AH0Af8B9AHwAZIE7AEHCP8FABH/AewJ/w3s
- AgAo7AYAIf8JAAn/Ae8N7AHvCf8FABH/COwC/w3sAgAo7AYABP8a7AP/CQAK/wHwC+wB8Ar/BQAb/w3s
- MAAh/wkAC/8B9AG8AfcE7AHtAe8BvAz/BQAc/wzsAgAP7B8AIf8JACH/BQAc/wzsAgAO7CAAA/8a7AT/
- CQAh/10AIf8JACH/XQAh/wkAIf9dACH/CQAh/9YAAUIBTQE+BwABPgMAASgDAAGoAwABfgMAAQEBAAEB
- BQAB0AELFgAD/wEABf8BwBIABf8BwBIABf8BwBIABf8BwBIABf8BwBIAAcAEAAHAEgABwAQAAcASAAHA
- BAABwBIAAcAEAAHAEgABwAQAAcASAAHABAABwBIAAcAEAAHAEgABwAQAAcASAAHABAABwBIAAcAEAAHA
- EgABwAQAAcASAAHABAABwBIAAcAEAAHAEgABwAQAAcASAAHABAABwBIAAcAEAAHAEgABwAQAAcASAAHA
- BAABwBIAAcAXAAHAFwABwBcAAcAXAAHAFwABwBcAAcAXAAHAFwABwBcAAcAXAAHAFwAB/BcAAfwXAAH8
- FwAB/BcAAfwXAAH8FwAB/BcABf8BwBIABv8BgAIAAQcL/wMABv8BgAIAAQcL/wMABv8BgAIAAQcG/wHA
- AwABDwgAAT8BgAIAAQcG/wHAAwABDwgAAT8BgAIAAQcG/wHAAwABDwgAAT8BgAIAAQcG/wHAAwABDwgA
- AT8BgAIAAQcB8AQAAQMBwAMAAQ8IAAE/AYACAAEHAfAEAAEDAcADAAEPCAABPwGAAgABBwHwBAABAwHA
- AwABDwgAAT8BgAIAAQcB8AQAAQMBwAMAAQ8IAAE/AYACAAEHAfAEAAEDAcADAAEPCAABPwGAAgABBwHw
- BAABAwHAAwABDwgAAT8BgAIAAQcB8AQAAQMBwAMAAQ8IAAE/AYACAAEHAfAEAAEDAcADAAEPCAABPwGA
- AgABBwHwBAABAwHAAwABDwgAAT8BgAIAAQcB8AQAAQMBwAMAAQ8IAAE/AYACAAEHAfAEAAEDAcADAAEP
- CAABPwGAAgABBwHwBAABAwHAAwABDwgAAT8BgAIAAQcB8AQAAQMBwAMAAQ8IAAE/AYACAAEHAfAEAAED
- AcADAAEPCAABPwGAAgABBwHwBAABAwHAAwABDwgAAT8BgAIAAQcB8AQAAQMBwAMAAQ8IAAE/AYACAAEH
- AfAEAAEDAcADAAEPCAABPwGAAgABBwHwBAABAwHAAwABDwgAAT8BgAIAAQcB8AQAAQMBwAMAAQ8IAAE/
- AYACAAEHAfAEAAEDAcADAAEPCAABPwGAAgABBwHwBAABAwHAAwABDwgAAT8BgAIAAQcB8AQAAQMBwAMA
- AQ8IAAE/AYACAAEHAfAEAAEDAcADAAEPCAABPwGAAgABBwHwBAABAwHAAwABDwgAAT8BgAIAAQcB8AQA
- AQMBwAMAAQ8IAAE/AYACAAEHAfAEAAEDAcADAAEPCAABPwGAAgABBwHwBAABAwHAAwABDwgAAT8BgAIA
- AQcB8AQAAQMBwAMAAR8IAAE/AYACAAEHAfAEAAEDAcADAAE/CAABPwGAAgABBwHwBAABAwHAAwABfwUA
- AX8D/wGAAgABDwb/AcADAAF/BQAE/wGAAgABHwv/BAABAQT/AYACAAE/C/8DAAb/AYACAAF/C/8DAAb/
- AYACAAz/AwAG/wGAAQABAQz/AwAF/wH8BAABfwQAAR8F/wMABf8B/AQAAX8EAAEfBf8DAAX/AfwEAAF/
- BAABHwX/CAABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQA
- AX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQA
- AX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQA
- AX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQA
- AX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQA
- AX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQA
- AX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcCgABfwL/AfwEAAF/BAABHAoA
- A/8B/AQAAX8EAAEcCQABAQP/AfwEAAF/BAABHwX/AwAF/wH8BAABfwQAAR8F/wMABf8B/AQAAX8EAAEf
- Bf8DAAX/AfwEAAF/BAABHwX/AwAL
+ AfAB+wH/AQABpAKgAQADgAMAAf8CAAH/AwAC/wEAAf8DAAH/AQAB/wEAAv8CAAP//wD/AP8AeAAm7F0A
+ HP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0A
+ HP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0A
+ HP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0A
+ HP8JAAHsJP8B7F0AHP8JAAHsJP8B7F0AHP8JAAHsJP8D7IAAAewk/wHsAf8B7IAAAewk/wHsAf8B7IAA
+ Aewk/wHsAf8B7IAAAewk/wHsAf8B7F8AFP8NAAHsJP8B7AH/AexfAA7/BAAC/w0AAewk/wHsAf8B7F8A
+ Dv8EAAL/DQAm7AH/AexfAA7/BAAC/w0AHewCAAHsAgAB7AIAAewB/wHsXwAO/wQAAv8NAB3sAgAB7AIA
+ AewCAAHsAf8B7F8ADv8EAAL/DQAm7AH/AexfAA7/BAAC/xEAAewi/wHsXwAU/xEAAewi/wHsXwAU/xEA
+ Aewi/wHshAAk7IQAG+wCAAHsAgAB7AIAAeyEABvsAgAB7AIAAewCAAHshAAk7P8AZAAK/5MACv8BAAr/
+ AQAB7AP/jgAJ/wEADP8BAAHsAv+OAAn/AQAM/wEAAewC/zMAKOwCACjsCQAI/wEADf8BAAHsAv8zACjs
+ AgAP7AoAD+wJAAf/AQAD/wEACv8BAAHsAv8zACjsAgAP7AEACP8BAA/sCQAH/wEAAv8CAAL/AQAC/wEA
+ Av8BAAH/AQAB7AL/MwAo7AIAD+wBAAj/AQAP7AkACP8CAAHsAQAC/wEAAv8BAAL/AQAB/wEAAewC/wkA
+ KP8CACjsAgAP7AEACP8BAA/sCQAL/wEAAv8BAAL/AQAC/wIAAewD/wkAKP8CACjsAgAP7AEACP8BAA/s
+ CQAL/wEAAv8BAAL/AwAB7AX/CQAo/wIAJOwE/wIAD+wBAAj/AQAP7AkAC/8BAAL/AwAB7Aj/CQAo/wIA
+ IewH/wIAD+wBAAj/AQAP7AkAC/8BAAL/AQAB7Ar/CQAP/wEAGP8CAAX/GuwJ/wIAD+wBAAj/AQAP7AkA
+ C/8BAAL/AQAB7Ar/CQAP/wIAF/8CAAj/FuwF/wHsBP8CAA/sAQAI/wEAD+wJAAv/AQAC/wEAAewK/wkA
+ D/8DABb/AgAP/wvsCf8C7AP/AgAP7AEACP8BAA/sCQAL/wEAAv8BAAHsCv8JAA//BAAV/wIAHv8B7AX/
+ AewD/wIAD+wBAAj/AQAP7AkAAv8J/AEAAv8BAAHsCv8JAA//BQAU/wIAHv8C7AT/AuwC/wIAD+wBAAj/
+ AQAP7AkADP8CAAHsC/8JAA//BgAT/wIAF/8D7AX/AuwE/wHsAv8CAA/sAQAI/wEAD+wJAAP/BPwC/wH8
+ BP8B/Av/CQAP/wcAEv8CABn/AuwF/wHsBP8B7AL/AgAP7AEACP8BAA/sCQAC/wH8BP8B/AH/AfwE/wH8
+ C/8JAA//CAAR/wIAGv8B7AX/AewE/wHsAv8CAA/sAQAI/wEAD+wJAAL/AfwE/wH8Af8B/AT/AfwL/wkA
+ D/8JABD/AgAa/wLsBP8B7AT/AuwB/wIAD+wBAAj/AQAP7AkAAv8B/AT/AfwB/wL8A/8B/Av/CQAP/woA
+ D/8CABP/BOwE/wLsCf8B7AH/AgAK7AYACP8HAAnsCQAC/wH8BP8B/AH/AfwB/wL8Af8B/Av/CQAP/woA
+ D/8CABb/AuwF/wHsCv8CAArsAQAT/wEACewJAAL/AfwE/wH8Bv8B/Av/CQAP/wkAEP8CABf/AewJ/wbs
+ Af8CAAvsAQAR/wEACuwJAAL/AfwE/wH8Bv8B/Av/CQAP/wgAEf8CABf/AuwG/wnsAgAM7AEAD/8BAAvs
+ CQAC/wH8BP8B/Ab/AfwL/wkAD/8HABL/AgAQ/wHsB/8C7AT/CuwCAA3sAQAN/wEADOwJAAL/AfwE/wH8
+ Bv8B/Av/CQAP/wYAE/8CABD/A+wG/wLsAv8L7AIADuwBAAv/AQAN7AkAGv8JAA//BQAU/wIAEv8D7Af/
+ DOwCAA/sAQAJ/wEADuwJABr/CQAP/wQAFf8CABT/AuwG/wzsAgAQ7AEAB/8BAA/sCQAa/wkAD/8DABb/
+ AgAV/wLsBP8N7AIAEewBAAX/AQAQ7AkAGv8JAA//AgAX/wIADf8E7AX/A+wC/w3sAgAS7AEAA/8BABHs
+ CQAa/wkAD/8BABj/AgAQ/wLsCf8N7AIAE+wBAAH/AQAS7AkAGv8JACj/AgAR/wHsCf8N7AIAFOwBABPs
+ CQAa/wkAKP8CABH/COwC/w3sAgAo7AkAGv8JACj/AgAb/w3sAgAo7AkAGv8JACj/AgAc/wzsMwAU/zkA
+ HP8M7AIAD+wiABT/AQAC/wLsXgAO7CMAFP8BAAH/AuyQABT/AQAC7JEAFP8BAAHskgAU//8AuAAh/wkA
+ If9dACH/CQAh/10AIf8JACH/LwAo7AYAIf8JAAT/GuwD/wUAKOwCACjsBgAh/wkAIf8FACjsAgAo7AYA
+ Dv8E7A//CQAh/wUAKOwCACjsBgAO/wTsD/8JAAP/GuwE/wUAKOwCACjsBgAO/wTsD/8JACH/BQAo7AIA
+ KOwGAA7/BOwP/wkAIf8FACjsAgAo7AYAIf8JAAT/GuwD/wUAKOwCACjsBgAh/wkAIf8FACjsAgAo7AYA
+ If8JACH/BQAo7AIAKOwGAA7/AZID7A//CQAD/xrsBP8FACjsAgAo7AYADv8BkgPsD/8JACH/BQAo7AIA
+ KOwGAA7/AZID7AHyDv8JACH/BQAo7AIAKOwGAA7/AQcD7AG8Dv8JAAT/GuwD/wUAKOwCACjsBgAO/wHx
+ BOwO/wkAIf8FACjsAgAo7AYAD/8E7AHvDf8JACH/BQAo7AIAKOwGAA//AfEE7AHvDP8JAAP/GuwE/wYA
+ A+wBAAPsAQAD7AEAA+wBAAPsAQAD7AEAA+wBAAPsAQAD7AEAA+wCACjsBgAQ/wG8BOwB7wH0Cv8JACH/
+ BQAB7AEAAewBAAHsAQAB7AEAAewBAAHsAQAB7AEAAewBAAHsAQAB7AEAAewBAAHsAQAB7AEAAewBAAHs
+ AQAB7AEAAewBAAHsAQAB7AEAAewDACjsBgAR/wG8BOwB7QH0Cf8JACH/BQAC7AEAA+wBAAPsAQAD7AEA
+ A+wBAAPsAQAD7AEAA+wBAAPsAQAD7AEAAewCACjsBgAS/wHwBOwBkgn/CQAE/xrsA/8FACjsAgAo7AYA
+ E/8B8gTsAe8I/wkAIf8FACjsAgAo7AYAFP8B8gTsAfIH/wkAIf8FACjsAgAo7AYAFf8BvAPsAe8H/wkA
+ A/8a7AT/BQAo7AIAKOwGABb/BOwH/wkAIf8FACjsAgAo7AYABv8B8wHvAZIB7AHvC/8BkgPsB/8JACH/
+ BQAo7AIAKOwGAAb/AfQD7AHtC/8B7QPsB/8JAAT/GuwD/wUAKOwCACjsBgAH/wTsAfIJ/wHzA+wB7Qf/
+ CQAh/wUAKOwCACjsBgAH/wEHA+wB9wn/AfcD7AHvB/8JACH/BQAo7AIAKOwGAAf/AfQE7AHvB/8B7wTs
+ AfMH/wkAA/8a7AT/BQAo7AIAKOwGAAj/AQcE7AGSAfAB9AH/AfQB8AGSBOwBBwj/CQAh/wUAKOwCACjs
+ BgAJ/wHvDewB7wn/CQAh/wUAKOwCACjsBgAK/wHwC+wB8Ar/CQAE/xrsA/8FACjsMAAL/wH0AbwB9wTs
+ Ae0B7wG8DP8JACH/LwAP7B8AIf8JACH/BQAP7BsADuwgACH/CQAD/xrsBP8FAA7sSgAh/wkAIf9dACH/
+ CQAh/10AIf8JACH/1gABQgFNAT4HAAE+AwABKAMAAagDAAF+AwABAQEAAQEFAAHQAQsWAAP/AQAK/wHw
+ DQAK/wHwDQAB8AMAAQMF/wHwDQAB8AMAAQMF/wHwDQAB8AMAAQMF/wHwDQAB8AMAAQMB8AQAATANAAHw
+ AwABAwHwBAABMA0AAfADAAEDAfAEAAEwDQAB8AMAAQMB8AQAATANAAHwAwABAwHwBAABMA0AAfADAAED
+ AfAEAAEwDQAB8AMAAQMB8AQAATANAAHwAwABAwHwBAABMA0AAfADAAEDAfAEAAEwDQAB8AMAAQMB8AQA
+ ATANAAHwAwABAwHwBAABMA0AAfADAAEDAfAEAAEwDQAB8AMAAQMB8AQAATANAAHwAwABAwHwBAABMA0A
+ AfADAAEDAfAEAAEwDQAB8AMAAQMB8AQAATANAAHwAwABAwHwBAABMA0AAfADAAEDAfAEAAEwDQAB8AMA
+ AQMB8BIAAfADAAEDAfASAAHwAwABAwHwEgAB8AMAAQMB8BIAAfADAAEDAfASAAHwAwABAwHwEgAB8AMA
+ AQMB8BIAAfADAAEDAfASAAHwAwABAwHwEgAB8AMAAQMB8BIAAfADAAEHAfASAAHwAwABDwH/EgAB8AMA
+ AR8B/xIAAfADAAEfAf8SAAb/EgAG/xIABv8SAAb/EgAK/wHwDQAL/wHgAgABAQb/AwAL/wHgAgABAQb/
+ AwAL/wHgAgABAQb/DQABDwHgAgABAQb/DQABDwHgAgABAQb/DQABDwHgAgABAQb/DQABDwHgAgABAQH8
+ EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8
+ EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8
+ EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8
+ EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8
+ EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8
+ EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8EgABDwHgAgABAQH8DwABHwP/AeACAAED
+ Bv8KAAE/A/8B4AIAAQcG/wMABf8BwAEAAX8D/wHgAgABDwb/AwAL/wHgAgABHwb/AwAL/wHgAgABPwb/
+ AwAL/wHgAgABfwb/AwAF/wH8BAABfwQAAR8F/wMABf8B/AQAAX8EAAEfBf8DAAX/AfwEAAF/BAABHwX/
+ CAABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEc
+ DQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEc
+ DQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEc
+ DQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEc
+ DQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEc
+ DQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEc
+ DQABPAQAAX8EAAEcDQABPAQAAX8EAAEcDQABPAQAAX8EAAEcCgABfwL/AfwEAAF/BAABHAEAAQED/wUA
+ A/8B/AQAAX8EAAEcAQABAwP/BAABAQP/AfwEAAF/BAABHAEAAQcD/wMABf8B/AQAAX8EAAEfBf8DAAX/
+ AfwEAAF/BAABHwX/AwAF/wH8BAABfwQAAR8F/wMACw==
</value>
</data>
<metadata name="iml_smallicons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -238,8 +241,8 @@
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
- ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC6
- EgAAAk1TRnQBSQFMAgEBCQEAAWABAAFgAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACI
+ EwAAAk1TRnQBSQFMAgEBCgEAAWgBAAFoAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABYAMAAUgDAAEBAQABCAYAARsYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -267,58 +270,62 @@
AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
- AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/8IAAfQV80oAAe8U/wEH
- SgAB7xT/AQdKAAHvFP8BB0oAAe8U/wEHSgAB7xT/AQdKAAHvFP8BB0oAAe8U/wEHSgAB7xT/AQdKAAHv
- FP8BB0oAAe8U/wEHSgAB7xT/AQcB70kAAe8U/wEHAfJJAAHvFP8BBwHySQAB7xT/AQcB8kkAAe8Q7AEU
- AesBFAESAW0B8kkAAe8Q7AEQAW0BEAEVARIB8ksAAfMT/wHySwAB8xP/AfJLAAHzD+wBFAHsARQBbQES
- SwAB8w/sARAB7AEQARIBFcUABQcBbQb/ARMBBwHsNAAY7wUABf8B7Ab/ARQCBx4AAe8WAAjsBm0I7AFt
- BQAE/wFtAf8BvAX/ARQCBx4AAe8WAAjsARAE/wnsAW0FAAT/AQcB7AEUAf8BBwHsAf8BAAEUAgceAAHv
- AQAQ/wUACOwBEAT/CewBbQUABP8BvAHwARQB/wEHAewB/wEAAeoB9AEHBQAW/wEHAgAB7wEAEP8FAAjs
- ARAE/wnsAW0FAAb/ARQB/wJtAewBBwL/AQcFABb/AQcCAAHvAQAQ/wUACOwBEAT/CewBbQUABv8BFAH/
- AW0F/wEHBQAI/wEUAfEM/wEHAgAB7wEAEP8FAAjsARAE/wnsAW0FAAb/ARQB/wFtBf8BBwUACP8BFAEA
- DP8BBwIAAe8BABD/BQAI7AEQBP8J7AFtBQAB/wXIARQB/wFtBf8BBwUACP8BFAEAAQ4L/wEHAgAB7wEA
- EP8FAAjsARAE/wnsAW0FAAH/Ad0C1gH/Ad0B8QHsAd0F/wEHBQAI/wEUAwAB8Qn/AQcCAAHvAQAQ/wUA
- COwBEAT/CewBbQUAAf8B1gL/Ad0B1gL/Ad0F/wEHBQAI/wEUBAAB8Qj/AQcCAAHvAQAQ/wUACOwBEAT/
- CewBbQUAAf8B1gL/Ad0B/AL/Ad0F/wEHBQAI/wEUBQAI/wEHAgAB7wEAEP8FAAXsARQDBwT/AfEDBwEU
- BOwBbQUAAf8B1gL/Ad0BGQHdAf8B3QX/AQcFAAj/ARQEAAFtCP8BBwIAAe8BABD/BQAG7AESCf8BEgXs
- AW0FAAH/AdYC/wHdA/8B3QX/AQcFAAj/ARQDAAFtCf8BBwIAAe8BABDsBQAH7AEQAfMF/wHzARAG7AFt
- BQAB/wHWAv8B3QP/Ad0F/wEHBQAI/wEUAgABFAr/AQcCAAHvFgAI7AEQBf8BEAfsAW0FAA7/AQcFAAj/
- ARQBAAEUC/8BBwIAAe8WAAnsARID/wESCOwBbQUADv8BBwUACP8BFAFtDP8BBwIAAe8DAAHsB/8B9wIU
- Af8HAArsARIB/wESCewBbQUADv8BBwUACP8B9w3/AQcCAAHvAwAB7Af/AewCAAH/BwAL7AEQCuwBbQUA
- Dv8BBwUAFv8BBwIAAe8DAAHsB/8B7AIAAf8DAAESAwAW7AFtBQAO/wEHBQAW/wEHAgAB7wMAAewH/wHs
- AgAB/wcACG0BDw7yBQAL/wEAAQcBbQESBAAY8gIAAe8DAAHsC/8HAAgUAfQTAAv/AQAB7QHsUgAL/wEA
- AW2wAAHvEwcB7wMAAe8TBwHvGQAY7wIAAe8T/wHvAwAB7xP/Ae8BABjvAQAW7AFtAgAB7wL/AQcO9wL/
- Ae8DAAHvE/8B7wIAFuwBbQEAFuwBbQIAAe8T/wHvAwAB7wj/AuwB8gj/Ae8CABbsAW0BABbsAW0CAAHv
- Av8O8gHzAv8B7wMAAe8I/wLsAfII/wHvAgAW7AFtAQAW7AFtAgAB7wL/AfAOBwL/Ae8DAAHvCP8CBwH0
- CP8B7wIAFOwB7wEHAe0BABbsAW0CAAHvE/8B7wMAAe8T/wHvAgAC9wGSDuwB7QEHA/8BBwEAFuwBbQIA
- Ae8C/w7sAfcC/wHvAwAB7wj/Ae0B7AHyCP8B7wIABP8B9wzsA/8B8gH/AQcBABbsAW0CAAHvE/8B7wMA
- Ae8I/wHtAewB8Aj/Ae8CAAj/AfMF8gHzAv8B8AL/AZIB/wEHAQAW7AFtAgAB7wL/AfAOBwL/Ae8DAAHv
- CP8BBwHsAfcI/wHvAgAN/wEHAfAC/wH3AfAB/wHwAgcBABbsAW0CAAHvAv8O8gHzAv8B7wMAAe8I/wHy
- AuwBvAf/Ae8CAA7/AZID/wH3Av8CBwEAFuwBbQIAAe8T/wHvAwAB7wn/AbwC7AEHBv8B7wIADv8B8gHs
- Av8B9wL/AewBBwEAFuwBbQIAAe8C/wEHDvcC/wHvAwAB7wr/AbwC7AHvBf8B7wIAC/8B8gGSAfAB/wHy
- Ae8E/wH0AQcBABbsAW0CAAHvE/8B7wMAAe8L/wHwAuwB8QT/Ae8CAA3/AfcD/wHyAe8D7AHtAQAW7AFt
- AgAB7wL/DvcBBwL/Ae8DAAHvDP8BBwHsAZIE/wHvAgAJ/wHvAfMC/wHwAZIB/wHzBewBbQEAFuwBbQIA
- Ae8T/wHvAwAB7wP/AfQB7wHsAfMF/wHyAuwE/wHvAgAK/wLsBP8G7AFtAQAW7AFtAgAB7wL/AfMO8gL/
- Ae8DAAHvBP8C7AHwBf8B8ALsBP8B7wIAC/8B8gGSAv8B9wbsAW0BABbsAW0CAAHvAv8OBwHwAv8B7wMA
- Ae8E/wEHAewB7QHzA/8B8wHtAewBBwT/Ae8CAAf/AgcB9wL/AfABBwH/B+wBbQEAFuwBbQIAAe8T/wHv
- AwAB7wT/AfQB7QLsAbwB8gG8AuwB7QH0BP8B7wIACf8BBwTyAf8H7AFtAQAW7AFtAgAB7wL/AfcO7AL/
- Ae8DAAHvBv8BkgXsAZIG/wHvAgAP/wfsAW0BAAhtAQ8O8gIAAe8T/wHvAwAB7wf/AfMD8gHzB/8B7wIA
- EP8G7AFtAQAIFAH0EAAB7wL/DgcB8AL/Ae8DAAHvE/8B7wEAGO8aAAHvE/8B7wMAAe8T/wHvMwAB7xMA
- Ae8DAAHvEwAB7xkAAUIBTQE+BwABPgMAASgDAAFgAwABSAMAAQEBAAEBBQABYAEDFgAD/wEAA/8JAAP/
- CQABgAEAAQEJAAGAAQABAQkAAYABAAEBCQABgAEAAQEJAAGAAQABAQkAAYABAAEBCQABgAEAAQEJAAGA
- AQABAQkAAYABAAEBCQABgAEAAQEJAAGAAQABAQkAAYALAAGACwABgAsAAYALAAGACwABgAsAAeALAAHg
- CwAB4AsAAeALAAP/CQAD/wHwAQABDwb/AwAB8AEAAQ8D/wHAAQABAwMAAfABAAEPA/8BwAEAAQMDAAHw
- AQABDwMAAcABAAEDAwAB8AEAAQ8DAAHAAQABAwMAAfABAAEPAwABwAEAAQMDAAHwAQABDwMAAcABAAED
- AwAB8AEAAQ8DAAHAAQABAwMAAfABAAEPAwABwAEAAQMDAAHwAQABDwMAAcABAAEDAwAB8AEAAQ8DAAHA
- AQABAwMAAfABAAEPAwABwAEAAQMDAAHwAQABDwMAAcABAAEDAwAB8AEAAQ8DAAHAAQABAwMAAfABAAEP
- AwABwAEAAQMDAAHwAQABDwMAAcABAAEDAwAB8AEAAQ8DAAHAAQABAwMAAfABAAEPAwABwAEAAQMDAAHw
- AQABDwMAAcABAAEDAwAB8AEAAQ8DAAHAAQABBwMAAfABAAEPAwABwAEAAQ8BAAE/Af8B8AEAAR8J/wHw
- AQABPwn/AfABAAF/Cf8BwAEAAQEBwAEAAQED/wMAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHA
- AQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEB
+ AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/2MAAe9fAAHvFgAB9BXz
+ MwAB7wEAEP8FAAHvFP8BBzMAAe8BABD/BQAB7xT/AQczAAHvAQAQ/wUAAe8U/wEHMwAB7wEAEP8FAAHv
+ FP8BBzMAAe8BABD/BQAB7xT/AQczAAHvAQAQ/wUAAe8U/wEHMwAB7wEAEP8FAAHvFP8BBzMAAe8BABD/
+ BQAB7xT/AQczAAHvAQAQ/wUAAe8U/wEHMwAB7wEAEP8FAAHvFP8BBzMAAe8BABDsBQAB7xT/AQcB7zIA
+ Ae8WAAHvFP8BBwHyMgAB7xYAAe8U/wEHAfIyAAHvAwAB7Af/AfcCFAH/BwAB7xT/AQcB8jIAAe8DAAHs
+ B/8B7AIAAf8HAAHvEOwBFAHrARQBEgFtAfIyAAHvAwAB7Af/AewCAAH/AwABEgMAAe8Q7AEQAW0BEAEV
+ ARIB8jIAAe8DAAHsB/8B7AIAAf8JAAHzE/8B8jIAAe8DAAHsC/8JAAHzE/8B8ksAAfMP7AEUAewBFAFt
+ ARJLAAHzD+wBEAHsARABEgEVxQAFBwFtBv8BEwEHAewcADDvBQAF/wHsBv8BFAIHHQAW7AFtAQAI7AZt
+ COwBbQUABP8BbQH/AbwF/wEUAgcdABbsAW0BAAjsARAE/wnsAW0FAAT/AQcB7AEUAf8BBwHsAf8BAAEU
+ AgcdABbsAW0BAAjsARAE/wnsAW0FAAT/AbwB8AEUAf8BBwHsAf8BAAHqAfQBBwUAFv8BBwEAFOwB7wEH
+ Ae0BAAjsARAE/wnsAW0FAAb/ARQB/wJtAewBBwL/AQcFABb/AQcBAAL3AZIO7AHtAQcD/wEHAQAI7AEQ
+ BP8J7AFtBQAG/wEUAf8BbQX/AQcFAAj/ARQB8Qz/AQcBAAT/AfcM7AP/AfIB/wEHAQAI7AEQBP8J7AFt
+ BQAG/wEUAf8BbQX/AQcFAAj/ARQBAAz/AQcBAAj/AfMF8gHzAv8B8AL/AZIB/wEHAQAI7AEQBP8J7AFt
+ BQAB/wXIARQB/wFtBf8BBwUACP8BFAEAAQ4L/wEHAQAN/wEHAfAC/wH3AfAB/wHwAgcBAAjsARAE/wns
+ AW0FAAH/Ad0C1gH/Ad0B8QHsAd0F/wEHBQAI/wEUAwAB8Qn/AQcBAA7/AZID/wH3Av8CBwEACOwBEAT/
+ CewBbQUAAf8B1gL/Ad0B1gL/Ad0F/wEHBQAI/wEUBAAB8Qj/AQcBAA7/AfIB7AL/AfcC/wHsAQcBAAjs
+ ARAE/wnsAW0FAAH/AdYC/wHdAfwC/wHdBf8BBwUACP8BFAUACP8BBwEAC/8B8gGSAfAB/wHyAe8E/wH0
+ AQcBAAXsARQDBwT/AfEDBwEUBOwBbQUAAf8B1gL/Ad0BGQHdAf8B3QX/AQcFAAj/ARQEAAFtCP8BBwEA
+ Df8B9wP/AfIB7wPsAe0BAAbsARIJ/wESBewBbQUAAf8B1gL/Ad0D/wHdBf8BBwUACP8BFAMAAW0J/wEH
+ AQAJ/wHvAfMC/wHwAZIB/wHzBewBbQEAB+wBEAHzBf8B8wEQBuwBbQUAAf8B1gL/Ad0D/wHdBf8BBwUA
+ CP8BFAIAARQK/wEHAQAK/wLsBP8G7AFtAQAI7AEQBf8BEAfsAW0FAA7/AQcFAAj/ARQBAAEUC/8BBwEA
+ C/8B8gGSAv8B9wbsAW0BAAnsARID/wESCOwBbQUADv8BBwUACP8BFAFtDP8BBwEAB/8CBwH3Av8B8AEH
+ Af8H7AFtAQAK7AESAf8BEgnsAW0FAA7/AQcFAAj/AfcN/wEHAQAJ/wEHBPIB/wfsAW0BAAvsARAK7AFt
+ BQAO/wEHBQAW/wEHAQAP/wfsAW0BABbsAW0FAA7/AQcFABb/AQcBABD/BuwBbQEACG0BDw7yBQAL/wEA
+ AQcBbQESBAAY8hjvAQAIFAH0EwAL/wEAAe0B7FIAC/8BAAFtmAAB7xMHAe8DAAHvEwcB7xkAGO8CAAHv
+ E/8B7wMAAe8T/wHvAQAY7wEAFuwBbQIAAe8T/wHvAwAB7wL/AQcO9wL/Ae8CABbsAW0BABbsAW0CAAHv
+ CP8C7AHyCP8B7wMAAe8T/wHvAgAW7AFtAQAW7AFtAgAB7wj/AuwB8gj/Ae8DAAHvAv8O8gHzAv8B7wIA
+ 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
+ AcABAAEDAYABAAEBBgABwAEAAQMBgAEAAQEGAAHAAQABAwGAAQABAQYAAcABAAEDAYABAAEBBgABwAEA
+ AQMBgAEAAQEGAAHAAQABAwGAAQABAQYAAcABAAEDAYABAAEBBgABwAEAAQMBgAgAAcABAAEDAYAIAAHA
+ AQABAwGACAABwAEAAQMBgAgAAcABAAEDAYAIAAHAAQABAwGACAABwAEAAQcB4AgAAcABAAEPAeAIAAP/
+ AeAIAAP/AeAIAAb/BgAG/wHwAQABDwP/BgAB8AEAAQ8D/wYAAfABAAEPA/8GAAHwAQABDwkAAfABAAEP
+ CQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHw
+ AQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEPCQAB8AEAAQ8JAAHwAQABDwkAAfABAAEP
+ CQAB8AEAAQ8HAAE/Af8B8AEAAR8J/wHwAQABPwn/AfABAAF/Bv8BwAEAAQEBwAEAAQED/wMAAcABAAEB
AcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEA
AQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYA
AcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEA
- AQEBwAEAAQEEAAE/Af8BwAEAAQEBwAEAAQEDAAP/AcABAAEBAcABAAEBBv8BwAEAAQEBwAEAAQED/ws=
+ AQEBwAEAAQEGAAHAAQABAQHAAQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEGAAHAAQABAQHA
+ AQABAQYAAcABAAEBAcABAAEBBgABwAEAAQEBwAEAAQEEAAE/Af8BwAEAAQEBwAEAAQEBAAE/BP8BwAEA
+ AQEBwAEAAQEG/wHAAQABAQHAAQABAQP/Cw==
</value>
</data>
</root> \ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.vb b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.vb
index 50ed01c..a0758c4 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Universal/File Skimmer/Uni_FileSkimmer.vb
@@ -158,6 +158,9 @@ Public Class Uni_FileSkimmer
Dim DirFullName As String = directoryInfo.FullName
txt_AddressBar.Text = DirFullName.Replace(Strings.OnceInfo(1), "!")
CurrentDir = DirFullName
+ If txt_AddressBar.Text = "!" Then
+ txt_AddressBar.Text = txt_AddressBar.Text & "\"
+ End If
ShowContent()
End If
Catch ex As Exception
@@ -221,6 +224,7 @@ Public Class Uni_FileSkimmer
lbl_filetype.Text = "Text File"
IsFile = True
ElseIf lsv_Content.SelectedItems(0).Text Like "*.zip" Then
+ pic_Icon.Image = My.Resources.FileSkimmerFileIcons.ico_zip
lbl_filetype.Text = "Compressed ZIP File"
IsFile = True
ElseIf lsv_Content.SelectedItems(0).Text Like "*.*" Then
@@ -275,8 +279,12 @@ Public Class Uni_FileSkimmer
End Sub
Public Sub ExecuteFile(path As String)
- If path Like "*.txt" Then
- Undeveloped()
+ If path Like "*.*" Then
+ If path Like "*.txt" Then
+
+ ElseIf path Like "*.zip" Then
+
+ End If
Else
path = path.Replace("!\", Strings.OnceInfo(1) & "\")
If My.Computer.FileSystem.DirectoryExists(path) Then
@@ -299,18 +307,12 @@ Public Class Uni_FileSkimmer
Dim Folders As DirectoryInfo() = Dir.GetDirectories()
Dim Folder As DirectoryInfo
- 'For Each Dir As String In IO.Directory.GetDirectories(CurrentDir)
- ' Dim Dirinfo As New IO.DirectoryInfo(Dir)
- ' lsv_Content.Items.Add(Dirinfo.Name, 0)
- ' 'NewLine("[DIR] 0 KB " & dirinf.Name)
- 'Next
-
For Each Folder In Folders
Dim FolderName As String = Folder.Name
If Strings.AvailableFeature(45) = 1 Then
lsv_Content.Items.Add(FolderName, 0)
Else
- lsv_Content.Items.Add("???", 2)
+ lsv_Content.Items.Add("???", 1)
End If
Next
@@ -321,7 +323,7 @@ Public Class Uni_FileSkimmer
If Strings.AvailableFeature(46) = 1 Then
lsv_Content.Items.Add(filename, FileType)
Else
- lsv_Content.Items.Add("???", 2)
+ lsv_Content.Items.Add("???", 1)
End If
Next
End Sub
@@ -333,8 +335,11 @@ Public Class Uni_FileSkimmer
Select Case fileex
Case ".txt"
- FileType = 1
+ FileType = 2
Program = "Text Document"
+ Case ".zip"
+ FileType = 3
+ Program = "Compressed ZIP file"
'Case ".doc"
' filetype = 5
' program = "Word Document"
@@ -393,7 +398,7 @@ Public Class Uni_FileSkimmer
' filetype = 5
' program = "Web Page"
Case Else
- FileType = 2
+ FileType = 1
Program = "Unknown File Type"
End Select
@@ -411,31 +416,35 @@ Public Class Uni_FileSkimmer
Dim ZipRandom As New Random
Dim UnzipRandomInt As Integer
Dim UnzipRandom As New Random
- If lsv_Content.SelectedItems(0).Text Like "*.zip" Then
- UnzipRandomInt = UnzipRandom.Next(1, 1000000)
- Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt)
- ZipFile.ExtractToDirectory(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt)
- Directory.CreateDirectory(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text.Replace(".zip", ""))
- CopyDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt, CurrentDir & "\" & lsv_Content.SelectedItems(0).Text.Replace("zip", ""))
- Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt, True)
- ElseIf lsv_Content.SelectedItems(0).Text Like "*.*" Then
- ZipRandomInt = ZipRandom.Next(1, 1000000)
- Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt)
- File.Copy(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt & "\" & lsv_Content.SelectedItems(0).Text)
- Dim Numbering As String = lsv_Content.SelectedItems(0).Text.Length
- Dim TheNaming As String = lsv_Content.SelectedItems(0).Text.Substring(0, Numbering - 3) & "zip"
- ZipFile.CreateFromDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt, CurrentDir & "\" & TheNaming)
- Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt, True)
- NothingIn = False
- ElseIf lsv_Content.SelectedItems(0).Text Like "*" Then
- If Directory.Exists(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text) = True Then
- ZipFile.CreateFromDirectory(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text, CurrentDir & "\" & lsv_Content.SelectedItems(0).Text & ".zip")
+ Try
+ If lsv_Content.SelectedItems(0).Text Like "*.zip" Then
+ UnzipRandomInt = UnzipRandom.Next(1, 1000000)
+ Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt)
+ ZipFile.ExtractToDirectory(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt)
+ Directory.CreateDirectory(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text.Replace(".zip", ""))
+ CopyDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt, CurrentDir & "\" & lsv_Content.SelectedItems(0).Text.Replace("zip", ""))
+ Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\UNZIP" & UnzipRandomInt, True)
+ ElseIf lsv_Content.SelectedItems(0).Text Like "*.*" Then
+ ZipRandomInt = ZipRandom.Next(1, 1000000)
+ Directory.CreateDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt)
+ File.Copy(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt & "\" & lsv_Content.SelectedItems(0).Text)
+ Dim Numbering As String = lsv_Content.SelectedItems(0).Text.Length
+ Dim TheNaming As String = lsv_Content.SelectedItems(0).Text.Substring(0, Numbering - 3) & "zip"
+ ZipFile.CreateFromDirectory(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt, CurrentDir & "\" & TheNaming)
+ Directory.Delete(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\ShiftOS\SysShiftFS\ZIP" & ZipRandomInt, True)
NothingIn = False
- Else
+ ElseIf lsv_Content.SelectedItems(0).Text Like "*" Then
+ If Directory.Exists(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text) = True Then
+ ZipFile.CreateFromDirectory(CurrentDir & "\" & lsv_Content.SelectedItems(0).Text, CurrentDir & "\" & lsv_Content.SelectedItems(0).Text & ".zip")
+ NothingIn = False
+ Else
+ End If
End If
- End If
- ShowContent()
+ ShowContent()
+ Catch ex As Exception
+
+ End Try
End Sub
Private Sub FS_Delete()
diff --git a/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb
new file mode 100644
index 0000000..7edf13a
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.Designer.vb
@@ -0,0 +1,124 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class AnusWM_Menu
+ Inherits System.Windows.Forms.Form
+
+ 'Form 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.MenuStrip1 = New System.Windows.Forms.MenuStrip()
+ Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ApplicationsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShifterToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.AboutToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ExitToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.StopAnusWMToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.RestartToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.ShutdownToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+ Me.MenuStrip1.SuspendLayout()
+ Me.SuspendLayout()
+ '
+ 'MenuStrip1
+ '
+ Me.MenuStrip1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.MenuStrip1.Font = New System.Drawing.Font("Segoe UI", 12.0!)
+ Me.MenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ApplicationsToolStripMenuItem, Me.ShifterToolStripMenuItem, Me.AboutToolStripMenuItem, Me.ExitToolStripMenuItem})
+ Me.MenuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow
+ Me.MenuStrip1.Location = New System.Drawing.Point(0, 0)
+ Me.MenuStrip1.Name = "MenuStrip1"
+ Me.MenuStrip1.Size = New System.Drawing.Size(169, 121)
+ Me.MenuStrip1.TabIndex = 0
+ Me.MenuStrip1.Text = "MenuStrip1"
+ '
+ 'ToolStripMenuItem1
+ '
+ Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+ Me.ToolStripMenuItem1.Size = New System.Drawing.Size(162, 4)
+ '
+ 'ApplicationsToolStripMenuItem
+ '
+ Me.ApplicationsToolStripMenuItem.Name = "ApplicationsToolStripMenuItem"
+ Me.ApplicationsToolStripMenuItem.Size = New System.Drawing.Size(162, 25)
+ Me.ApplicationsToolStripMenuItem.Text = "Applications"
+ '
+ 'ShifterToolStripMenuItem
+ '
+ Me.ShifterToolStripMenuItem.Name = "ShifterToolStripMenuItem"
+ Me.ShifterToolStripMenuItem.Size = New System.Drawing.Size(162, 25)
+ Me.ShifterToolStripMenuItem.Text = "Shifter"
+ '
+ 'AboutToolStripMenuItem
+ '
+ Me.AboutToolStripMenuItem.Name = "AboutToolStripMenuItem"
+ Me.AboutToolStripMenuItem.Size = New System.Drawing.Size(162, 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.Text = "Exit"
+ '
+ 'StopAnusWMToolStripMenuItem
+ '
+ Me.StopAnusWMToolStripMenuItem.Name = "StopAnusWMToolStripMenuItem"
+ Me.StopAnusWMToolStripMenuItem.Size = New System.Drawing.Size(180, 26)
+ Me.StopAnusWMToolStripMenuItem.Text = "Stop AnusWM"
+ '
+ 'RestartToolStripMenuItem
+ '
+ Me.RestartToolStripMenuItem.Name = "RestartToolStripMenuItem"
+ Me.RestartToolStripMenuItem.Size = New System.Drawing.Size(180, 26)
+ Me.RestartToolStripMenuItem.Text = "Restart"
+ '
+ 'ShutdownToolStripMenuItem
+ '
+ Me.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"
+ Me.ShutdownToolStripMenuItem.Size = New System.Drawing.Size(180, 26)
+ Me.ShutdownToolStripMenuItem.Text = "Shutdown"
+ '
+ '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.Controls.Add(Me.MenuStrip1)
+ Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
+ Me.MainMenuStrip = Me.MenuStrip1
+ Me.Name = "AnusWM_Menu"
+ Me.Text = "AnusWM_Menu"
+ Me.MenuStrip1.ResumeLayout(False)
+ Me.MenuStrip1.PerformLayout()
+ Me.ResumeLayout(False)
+ Me.PerformLayout()
+
+ End Sub
+
+ Friend WithEvents MenuStrip1 As MenuStrip
+ Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem
+ Friend WithEvents ApplicationsToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ShifterToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents AboutToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ExitToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents StopAnusWMToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents RestartToolStripMenuItem As ToolStripMenuItem
+ Friend WithEvents ShutdownToolStripMenuItem As ToolStripMenuItem
+End Class
diff --git a/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.resx b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.resx
new file mode 100644
index 0000000..bb70361
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.resx
@@ -0,0 +1,123 @@
+<?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>
+ <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root> \ No newline at end of file
diff --git a/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.vb b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.vb
new file mode 100644
index 0000000..ac3b9e6
--- /dev/null
+++ b/ShiftOS-TheRevival/MainForms/WindowManager/codename AnusWM/AnusWM_Menu.vb
@@ -0,0 +1,13 @@
+Public Class AnusWM_Menu
+ Private Sub StopAnusWMToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles StopAnusWMToolStripMenuItem.Click
+ StopG()
+ End Sub
+
+ Private Sub RestartToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RestartToolStripMenuItem.Click
+
+ End Sub
+
+ Private Sub ShutdownToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShutdownToolStripMenuItem.Click
+ TerminateShiftOS()
+ End Sub
+End Class \ No newline at end of file
diff --git a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj
index decc558..e0ded7c 100644
--- a/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj
+++ b/ShiftOS-TheRevival/ShiftOS-TheRevival.vbproj
@@ -105,6 +105,12 @@
<Compile Include="MainForms\Applications\DuWM\Shifter\Categories\DuWM_Shifter_About.vb">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Include="MainForms\Applications\DuWM\Shifter\Categories\DuWM_Shifter_Console.Designer.vb">
+ <DependentUpon>DuWM_Shifter_Console.vb</DependentUpon>
+ </Compile>
+ <Compile Include="MainForms\Applications\DuWM\Shifter\Categories\DuWM_Shifter_Console.vb">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Include="MainForms\Applications\DuWM\Shifter\Categories\DuWM_Shifter_Desktop.Designer.vb">
<DependentUpon>DuWM_Shifter_Desktop.vb</DependentUpon>
</Compile>
@@ -221,6 +227,12 @@
</Compile>
<Compile Include="API\ConsoleAPI.vb" />
<Compile Include="API\TerminalAPI.vb" />
+ <Compile Include="MainForms\WindowManager\codename AnusWM\AnusWM_Menu.Designer.vb">
+ <DependentUpon>AnusWM_Menu.vb</DependentUpon>
+ </Compile>
+ <Compile Include="MainForms\WindowManager\codename AnusWM\AnusWM_Menu.vb">
+ <SubType>Form</SubType>
+ </Compile>
<Compile Include="MainForms\WindowManager\DualWindowManager\DuWM_Main.vb" />
<Compile Include="MainForms\WindowManager\DualWindowManager\DuWM_WindowContainer.Designer.vb">
<DependentUpon>DuWM_WindowContainer.vb</DependentUpon>
@@ -286,6 +298,9 @@
<EmbeddedResource Include="MainForms\Applications\DuWM\Shifter\Categories\DuWM_Shifter_About.resx">
<DependentUpon>DuWM_Shifter_About.vb</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="MainForms\Applications\DuWM\Shifter\Categories\DuWM_Shifter_Console.resx">
+ <DependentUpon>DuWM_Shifter_Console.vb</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="MainForms\Applications\DuWM\Shifter\Categories\DuWM_Shifter_Desktop.resx">
<DependentUpon>DuWM_Shifter_Desktop.vb</DependentUpon>
</EmbeddedResource>
@@ -340,6 +355,9 @@
<EmbeddedResource Include="MainForms\Applications\Console.resx">
<DependentUpon>Console.vb</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="MainForms\WindowManager\codename AnusWM\AnusWM_Menu.resx">
+ <DependentUpon>AnusWM_Menu.vb</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="MainForms\WindowManager\DualWindowManager\DuWM_WindowContainer.resx">
<DependentUpon>DuWM_WindowContainer.vb</DependentUpon>
</EmbeddedResource>
@@ -390,6 +408,7 @@
<None Include="MainForms\Applications\Universal\File Skimmer\Icons\ico_up.bmp" />
<None Include="MainForms\Applications\Universal\File Skimmer\Icons\ico_url.bmp" />
<None Include="MainForms\Applications\Universal\File Skimmer\Icons\ico_video.bmp" />
+ <None Include="MainForms\Applications\Universal\File Skimmer\Icons\ico_zip.png" />
<Content Include="MainForms\Applications\Universal\Knowledge Input\Contents\Animals.txt" />
<Content Include="MainForms\Applications\Universal\Knowledge Input\Contents\Countries.txt" />
<Content Include="MainForms\Applications\Universal\Knowledge Input\Contents\Fruits.txt" />
diff --git a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb
index 412095f..46da356 100644
--- a/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb
+++ b/ShiftOS-TheRevival/TerminalApplications/Internal/Com_Shiftfetch.vb
@@ -23,7 +23,12 @@
End If
NewLine(" ^@@! : @Y .:::^~:. 7# Y@^ Window Manager Theme: -")
NewLine(" 7@@: ! B@&BBBBGPPB@#Y. :&^ ^@? Terminal: shiftos-terminal")
- NewLine(" ?@@: 7 :??7~:. 5@@5 :&^ .&? Terminal Font: Consolas, 11pt")
+ NewLine(" ?@@: 7 :??7~:. 5@@5 :&^ .&? Terminal Font: ")
+ If IsStartG = True Then
+ AddLine(GUISCustomizations.GUIConsoleFont.Name & ", " & GUISCustomizations.GUIConsoleFont.Size & "pt")
+ Else
+ AddLine("Consolas, 11pt (default)")
+ End If
NewLine(" ~@@! !@ G#&B!. Y@@B 7#. Y~ CPU: " & My.Computer.Registry.GetValue("HKEY_LOCAL_MACHINE\HARDWARE\DESCRIPTION\System\CentralProcessor\0", "ProcessorNameString", Nothing))
NewLine(" B@G B@J ...~&G. 7@@@? .#? 7 GPU: N/A")
Dim TripleDigitRAM As String