Skip to content

Commit

Permalink
Merge pull request #29 from FN-FAL113/Dev/presets-feature
Browse files Browse the repository at this point in the history
Presets feature and chores
  • Loading branch information
FN-FAL113 committed Nov 29, 2023
2 parents 25bf923 + 7546368 commit d062d24
Show file tree
Hide file tree
Showing 17 changed files with 1,074 additions and 47 deletions.
39 changes: 26 additions & 13 deletions CS2ServerPicker/App.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion CS2ServerPicker/App.vb
Expand Up @@ -121,7 +121,7 @@
Environment.NewLine +
"Author: FN-FAL113 (github username)" + Environment.NewLine +
"License: GNU General Public License V3" + Environment.NewLine +
"App Version: 2.0.6",
"App Version: 2.0.7",
"App Info"
)
End Sub
Expand Down Expand Up @@ -170,8 +170,14 @@

Load_Server_List()

' save clustered settings
My.Settings.Is_Clustered = isClustered
My.Settings.Save()
My.Settings.Reload()
End Sub

Private Sub PresetsButton_Click(sender As Object, e As EventArgs) Handles PresetsButton.Click
Presets.ShowDialog()
Presets.Activate()
End Sub
End Class
27 changes: 27 additions & 0 deletions CS2ServerPicker/CS2ServerPicker.vbproj
Expand Up @@ -121,6 +121,24 @@
<DependentUpon>App.vb</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Include="Presets\AddPresetForm.Designer.vb">
<DependentUpon>AddPresetForm.vb</DependentUpon>
</Compile>
<Compile Include="Presets\AddPresetForm.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Presets\DeletePresetForm.Designer.vb">
<DependentUpon>DeletePresetForm.vb</DependentUpon>
</Compile>
<Compile Include="Presets\DeletePresetForm.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Presets\Presets.Designer.vb">
<DependentUpon>Presets.vb</DependentUpon>
</Compile>
<Compile Include="Presets\Presets.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Services\DataGridViewService.vb" />
<Compile Include="Services\PingService.vb" />
<Compile Include="My Project\AssemblyInfo.vb" />
Expand Down Expand Up @@ -152,6 +170,15 @@
<CustomToolNamespace>My.Resources</CustomToolNamespace>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Presets\AddPresetForm.resx">
<DependentUpon>AddPresetForm.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Presets\DeletePresetForm.resx">
<DependentUpon>DeletePresetForm.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Presets\Presets.resx">
<DependentUpon>Presets.vb</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="app.manifest" />
Expand Down
4 changes: 2 additions & 2 deletions CS2ServerPicker/My Project/AssemblyInfo.vb
Expand Up @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("2.0.6.0")>
<Assembly: AssemblyFileVersion("2.0.6.0")>
<Assembly: AssemblyVersion("2.0.7.0")>
<Assembly: AssemblyFileVersion("2.0.7.0")>
<Assembly: NeutralResourcesLanguage("en")>
102 changes: 102 additions & 0 deletions CS2ServerPicker/Presets/AddPresetForm.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 120 additions & 0 deletions CS2ServerPicker/Presets/AddPresetForm.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>

0 comments on commit d062d24

Please sign in to comment.