diff options
| author | JayXKanz666 <[email protected]> | 2017-07-13 16:46:24 +0200 |
|---|---|---|
| committer | JayXKanz666 <[email protected]> | 2017-07-13 16:46:24 +0200 |
| commit | 264deb3774935da3faba95fef55a94227e3f2368 (patch) | |
| tree | 2eac43f957e8a20c3c773119155bc328c9851244 /TimeHACK.Main/OS/Win95/Win95Apps | |
| parent | dd76075ce70c2ac31f01b2450c7f64009489dee9 (diff) | |
| download | histacom2-264deb3774935da3faba95fef55a94227e3f2368.tar.gz histacom2-264deb3774935da3faba95fef55a94227e3f2368.tar.bz2 histacom2-264deb3774935da3faba95fef55a94227e3f2368.zip | |
Fixed type names
-`String` replaced with `string`
-`Boolean` replaced with `bool`
Diffstat (limited to 'TimeHACK.Main/OS/Win95/Win95Apps')
6 files changed, 138 insertions, 18 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs index fe75e83..482d54c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs @@ -57,7 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps txtLast.Text = toSet.LastName; if (toSet.Emails != null) { - foreach (String email in toSet.Emails) + foreach (string email in toSet.Emails) { emails.Items.Add(email); } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs index 24404bf..95ee509 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs @@ -282,12 +282,12 @@ namespace TimeHACK.OS.Win95.Win95Apps public string FirstName; public string MiddleName; public string LastName; - public List<String> Emails = new List<String>(); + public List<string> Emails = new List<string>(); } public class AddressBookContactList { - public String AttachedNode; + public string AttachedNode; public List<AddressBookContact> Contacts = new List<AddressBookContact>(); } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4Start.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/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs index 70cd0f9..a754ed0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs @@ -71,7 +71,7 @@ namespace TimeHACK.OS.Win95.Win95Apps /// Write text to the Terminal. Very similar to the Win32 Console.Write Function. /// </summary> /// <param name="Text"></param> - public void Write(String Text) + public void Write(string Text) { cmdPrompt.AppendText(Text); cmdPrompt.Update(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index e4f98ff..98dc4ff 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -45,9 +45,9 @@ namespace TimeHACK.OS.Win95.Win95Apps //' Next //'End Sub - String ReadDataFile(String reqDirectory, Boolean returnYesIfProtected = false) { - String Val = ""; - String directoryFileInfo; + string ReadDataFile(string reqDirectory, bool returnYesIfProtected = false) { + string Val = ""; + string directoryFileInfo; directoryFileInfo = File.ReadAllText(Path.Combine(reqDirectory, "_data.info")); FileSystemFolderInfo toRead = new FileSystemFolderInfo(); toRead = JsonConvert.DeserializeObject<FileSystemFolderInfo>(directoryFileInfo); @@ -70,14 +70,14 @@ namespace TimeHACK.OS.Win95.Win95Apps try { // Refresh the right listview this.mainView.Items.Clear(); - // For Each drive As String In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") + // For Each drive As string In My.Computer.FileSystem.GetDirectories(GameMain.MyDocuments & "\HistacomVB\" & GameMain.SaveProfile & "\HistacomVB\Folders") // If GetPropetiesForDir(drive)(4) = "isMyDocuments" Then // diskView.Items.Add("", 0) // End If //Next - foreach (String str in Directory.GetDirectories(currentDirectory)) + foreach (string str in Directory.GetDirectories(currentDirectory)) { - String label = ReadDataFile(str, false); + string label = ReadDataFile(str, false); if (label == "") { this.mainView.Items.Add(Path.GetFileName(str)); @@ -87,7 +87,7 @@ namespace TimeHACK.OS.Win95.Win95Apps this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str); } } - foreach (String str in Directory.GetFiles(currentDirectory)) + foreach (string str in Directory.GetFiles(currentDirectory)) { // Get app Icon @@ -96,7 +96,7 @@ namespace TimeHACK.OS.Win95.Win95Apps switch (new FileInfo(str).Extension) { case ".exe": - String contents; + string contents; contents = File.ReadAllText(str); @@ -492,7 +492,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if ((String)mainView.FocusedItem.Tag != "") { // If it isn't a file + if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } else { // If it is a file if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) @@ -547,10 +547,10 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - Boolean OpenFile = false; + bool OpenFile = false; if (mainView.FocusedItem != null) { - if ((String)mainView.FocusedItem.Tag != "") + if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } @@ -632,7 +632,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e) { - String setText; + string setText; setText = mainView.FocusedItem.Text; if (setText == "") { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index bf0cb16..2453abc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -155,7 +155,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextFont(string font) { - // The next two lines convert a String to a Font + // The next two lines convert a string to a Font var cvt = new FontConverter(); Font f = cvt.ConvertFromString(font) as Font; @@ -164,7 +164,7 @@ namespace TimeHACK.OS.Win95.Win95Apps void SetSelectedTextSize(string size) { - // The next few lines will ATTEMPT to convert a String to an Integer + // The next few lines will ATTEMPT to convert a string to an Integer int SizeInt = Convert.ToInt32(size); mainText.SelectionFont = new Font(mainText.SelectionFont.FontFamily, SizeInt, mainText.SelectionFont.Style); |
