Skip to content

Commit b26f159

Browse files
committed
preset enhancements and chores
## Changes - when creating a preset you need to double click check boxes to select; only one click should be needed - button to invert selection - button to block all servers except the ones in a preset - intentionally Disallow preset multi-select - change delete preset form to a confirmation instead of typing preset name - allow to edit preset
1 parent f570409 commit b26f159

19 files changed

+668
-188
lines changed

CS2ServerPicker/App.Designer.vb

Lines changed: 37 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CS2ServerPicker/App.vb

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
My.Settings.Save()
7373
My.Settings.Reload()
7474

75-
Await Should_Block_All_Servers(False)
75+
Await Block_Unblock_All_Servers(False)
7676
Else
7777
Ping_All_Servers()
7878
End If
@@ -89,25 +89,29 @@
8989
End Sub
9090

9191
Private Async Sub BlockAllButton_Click(sender As Object, e As EventArgs) Handles BlockAllButton.Click
92-
Await Should_Block_All_Servers(True)
92+
Await Block_Unblock_All_Servers(True)
9393
End Sub
9494

9595
Private Async Sub UnblockAllButton_Click(sender As Object, e As EventArgs) Handles UnblockAllButton.Click
96-
Await Should_Block_All_Servers(False)
96+
Await Block_Unblock_All_Servers(False)
9797
End Sub
9898

9999
Private Sub BlockSelectedButton_Click(sender As Object, e As EventArgs) Handles BlockSelectedButton.Click
100-
Should_Block_Selected_Servers(True)
100+
Block_Unblock_Selected_Servers(True)
101101
End Sub
102102

103103
Private Sub UnblockSelectedButton_Click(sender As Object, e As EventArgs) Handles UnblockSelectedButton.Click
104-
Should_Block_Selected_Servers(False)
104+
Block_Unblock_Selected_Servers(False)
105105
End Sub
106106

107107
Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
108108
Process.Start("https://github.com/FN-FAL113/csgo-server-picker")
109109
End Sub
110110

111+
Private Sub PictureBox2_Click(sender As Object, e As EventArgs) Handles PictureBox2.Click
112+
Process.Start("https://www.paypal.com/paypalme/ameliaOrbeta")
113+
End Sub
114+
111115
Private Sub InfoButton_Click(sender As Object, e As EventArgs) Handles InfoButton.Click
112116
MessageBox.Show(
113117
"How to select server/s:" + Environment.NewLine +
@@ -121,7 +125,7 @@
121125
Environment.NewLine +
122126
"Author: FN-FAL113 (github username)" + Environment.NewLine +
123127
"License: GNU General Public License V3" + Environment.NewLine +
124-
"App Version: 2.0.7",
128+
"App Version: 2.0.9",
125129
"App Info"
126130
)
127131
End Sub
@@ -154,7 +158,7 @@
154158

155159
MessageBox.Show("App will unblock all servers before " + IIf(isClustered, "unclustering", "clustering") + " servers. Please standby...", "Info")
156160

157-
Await Should_Block_All_Servers(False, False)
161+
Await Block_Unblock_All_Servers(False, False)
158162

159163
Clear_DataGridView_Rows()
160164

CS2ServerPicker/CS2ServerPicker.vbproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@
139139
<Compile Include="Presets\Presets.vb">
140140
<SubType>Form</SubType>
141141
</Compile>
142+
<Compile Include="Presets\UpdatePresetForm.Designer.vb">
143+
<DependentUpon>UpdatePresetForm.vb</DependentUpon>
144+
</Compile>
145+
<Compile Include="Presets\UpdatePresetForm.vb">
146+
<SubType>Form</SubType>
147+
</Compile>
142148
<Compile Include="Services\DataGridViewService.vb" />
143149
<Compile Include="Services\PingService.vb" />
144150
<Compile Include="My Project\AssemblyInfo.vb" />
@@ -179,6 +185,9 @@
179185
<EmbeddedResource Include="Presets\Presets.resx">
180186
<DependentUpon>Presets.vb</DependentUpon>
181187
</EmbeddedResource>
188+
<EmbeddedResource Include="Presets\UpdatePresetForm.resx">
189+
<DependentUpon>UpdatePresetForm.vb</DependentUpon>
190+
</EmbeddedResource>
182191
</ItemGroup>
183192
<ItemGroup>
184193
<None Include="app.manifest" />
@@ -209,5 +218,8 @@
209218
<Install>false</Install>
210219
</BootstrapperPackage>
211220
</ItemGroup>
221+
<ItemGroup>
222+
<None Include="asset\Paypal.png" />
223+
</ItemGroup>
212224
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
213225
</Project>

CS2ServerPicker/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
3232
' by using the '*' as shown below:
3333
' <Assembly: AssemblyVersion("1.0.*")>
3434

35-
<Assembly: AssemblyVersion("2.0.8.0")>
36-
<Assembly: AssemblyFileVersion("2.0.8.0")>
35+
<Assembly: AssemblyVersion("2.0.9.0")>
36+
<Assembly: AssemblyFileVersion("2.0.9.0")>
3737
<Assembly: NeutralResourcesLanguage("en")>

CS2ServerPicker/My Project/Resources.Designer.vb

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CS2ServerPicker/My Project/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,7 @@
121121
<data name="GitHub-Mark" type="System.Resources.ResXFileRef, System.Windows.Forms">
122122
<value>..\asset\GitHub-Mark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123123
</data>
124+
<data name="Paypal" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>..\asset\Paypal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126+
</data>
124127
</root>

CS2ServerPicker/Presets/AddPresetForm.Designer.vb

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CS2ServerPicker/Presets/AddPresetForm.vb

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Public Class AddPresetForm
1818
Private Sub AddPresetButton_Click(sender As Object, e As EventArgs) Handles AddPresetButton.Click
1919
' add/create a preset from selected servers on add preset button click
2020
Dim presetName As String = AddPresetNameTextBox.Text
21+
Dim presetNameTrimmed = presetName.Replace(" ", "")
2122
Dim regex As Text.RegularExpressions.Regex = New Text.RegularExpressions.Regex("[^a-zA-Z0-9 ]")
2223

2324
If String.IsNullOrWhiteSpace(presetName) Or regex.IsMatch(presetName) Then
@@ -33,35 +34,45 @@ Public Class AddPresetForm
3334
End If
3435

3536
Try
37+
' deserialize presets back to its complex form
3638
Dim jObj As JObject = JObject.Parse(File.ReadAllText("presets.json"))
3739

38-
If jObj.ContainsKey(presetName.Replace(" ", "")) Then
40+
If jObj.ContainsKey(presetNameTrimmed) Then
3941
MessageBox.Show("Given preset name already exists.", "Info")
4042

4143
Return
4244
End If
4345

44-
' create property using preset name trimmed as key with object as value that contains necessary props
45-
' "presetName" prop with untrimmed preset name as string value and "servers" prop contains the checked items as JArray value
46-
jObj.Add(presetName.Replace(" ", ""), New JObject(
46+
' property uses trimmed preset name, access unmodified name through child prop (presetName)
47+
jObj.Add(presetNameTrimmed, New JObject(
4748
New JProperty("presetName", presetName),
4849
New JProperty("clustered", App.Get_Is_Clustered()),
4950
New JProperty("servers", JArray.FromObject(PresetServersCheckedListBox.CheckedItems))
5051
)
5152
)
5253

53-
' serialize jObj to presets json file
54+
' serialize jObj to primitive form in presets json file
5455
File.WriteAllText("presets.json", JsonConvert.SerializeObject(jObj, Formatting.Indented))
5556

5657
' refresh/reload presets control data grids
57-
Load_Presets()
58+
Presets.Load_Presets()
59+
60+
MessageBox.Show("Succesfully added preset!", "Info")
5861
Catch ex As Exception
59-
MessageBox.Show("An error has occured while adding preset! Please report to github issue-tracker. Error: " _
62+
MessageBox.Show("An error has occured while adding preset! Error: " _
6063
+ Environment.NewLine + Environment.NewLine + ex.Message, "Add Preset Error")
64+
End Try
65+
End Sub
66+
67+
Private Sub ResetPresetSelectionButton_Click(sender As Object, e As EventArgs) Handles ResetPresetSelectionButton.Click
68+
Dim checkedIndexes As CheckedListBox.CheckedIndexCollection = PresetServersCheckedListBox.CheckedIndices
6169

70+
If checkedIndexes.Count = 0 Then
6271
Return
63-
End Try
72+
End If
6473

65-
MessageBox.Show("Succesfully added preset!")
74+
For Each selectedIndex As Integer In checkedIndexes
75+
PresetServersCheckedListBox.SetItemChecked(selectedIndex, False)
76+
Next
6677
End Sub
6778
End Class

0 commit comments

Comments
 (0)