Skip to content

Commit cf08019

Browse files
qiangqiang101qiangqiang101
committed
solved #3 and add matrix generator
1 parent 35edd68 commit cf08019

File tree

73 files changed

+1704
-2058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1704
-2058
lines changed

‎SignalRGB-CompGen/.vs/SignalRGB-CompGen/DesignTimeBuild/.dtbcache.v2‎

82 Bytes
Binary file not shown.

‎SignalRGB-CompGen/.vs/SignalRGB-CompGen/v17/.futdcache.v2‎

169 Bytes
Binary file not shown.

‎SignalRGB-CompGen/.vs/SignalRGB-CompGen/v17/.suo‎

25 KB
Binary file not shown.

‎SignalRGB-CompGen/.vs/SignalRGB-CompGen/v17/DocumentLayout.json‎

Lines changed: 214 additions & 125 deletions
Large diffs are not rendered by default.

‎SignalRGB-CompGen/Class/Helper.vb‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,22 @@ Module Helper
1515
New DropdownListItem(Of String)("Strip", "strip"), New DropdownListItem(Of String)("Water Block", "water block"), New DropdownListItem(Of String)("Tower", "tower"),
1616
New DropdownListItem(Of String)("Heatsink", "heatsink"), New DropdownListItem(Of String)("Desk", "desk")}
1717
Public DirectionDropdownList As New List(Of DropdownListItem(Of eDirection)) From {
18-
New DropdownListItem(Of eDirection)("Top", eDirection.Top), New DropdownListItem(Of eDirection)("Right", eDirection.Right),
19-
New DropdownListItem(Of eDirection)("Bottom", eDirection.Bottom), New DropdownListItem(Of eDirection)("Left", eDirection.Left)}
20-
Public LanguageDropdownList As New List(Of DropdownListItem(Of String)) From {
21-
New DropdownListItem(Of String)("English", "en-US"), New DropdownListItem(Of String)("Chinese Simplified", "zh-CN"), New DropdownListItem(Of String)("Chinese Traditional", "zh-TW")}
18+
New DropdownListItem(Of eDirection)("Up", eDirection.Up), New DropdownListItem(Of eDirection)("Right", eDirection.Right),
19+
New DropdownListItem(Of eDirection)("Down", eDirection.Down), New DropdownListItem(Of eDirection)("Left", eDirection.Left)}
20+
Public LanguageDropdownList As New List(Of DropdownListItem(Of String))
21+
'Public LanguageDropdownList As New List(Of DropdownListItem(Of String)) From {
22+
' New DropdownListItem(Of String)("English", "en-US"), New DropdownListItem(Of String)("Chinese Simplified", "zh-CN"), New DropdownListItem(Of String)("Chinese Traditional", "zh-TW")}
23+
Public MatrixDropdownList As New List(Of DropdownListItem(Of eMatrixOrder)) From {
24+
New DropdownListItem(Of eMatrixOrder)("Horizontal Top Left", eMatrixOrder.HorizontalTopLeft),
25+
New DropdownListItem(Of eMatrixOrder)("Horizontal Top Right", eMatrixOrder.HorizontalTopRight),
26+
New DropdownListItem(Of eMatrixOrder)("Horizontal Bottom Left", eMatrixOrder.HorizontalBottomLeft),
27+
New DropdownListItem(Of eMatrixOrder)("Horizontal Bottom Right", eMatrixOrder.HorizontalBottomRight),
28+
New DropdownListItem(Of eMatrixOrder)("Vertical Top Left", eMatrixOrder.VerticalTopLeft),
29+
New DropdownListItem(Of eMatrixOrder)("Vertical Top Right", eMatrixOrder.VerticalTopRight),
30+
New DropdownListItem(Of eMatrixOrder)("Vertical Bottom Left", eMatrixOrder.VerticalBottomLeft),
31+
New DropdownListItem(Of eMatrixOrder)("Vertical Bottom Right", eMatrixOrder.VerticalBottomRight)}
2232
Public Translation As MyLanguage = New MyLanguage()
33+
Public UserMemory As New Memory()
2334

2435
<Extension>
2536
Public Function StringToBase64(text As String) As String
@@ -187,17 +198,30 @@ Module Helper
187198
End Module
188199

189200
Public Enum eMode
190-
Add
201+
AddLinear
202+
AddMatrix
203+
Edit
191204
Remove
192205
End Enum
193206

194207
Public Enum eDirection
195-
Top
208+
Up
196209
Right
197-
Bottom
210+
Down
198211
Left
199212
End Enum
200213

214+
Public Enum eMatrixOrder
215+
HorizontalTopLeft
216+
HorizontalTopRight
217+
HorizontalBottomLeft
218+
HorizontalBottomRight
219+
VerticalTopLeft
220+
VerticalTopRight
221+
VerticalBottomLeft
222+
VerticalBottomRight
223+
End Enum
224+
201225
Public Enum DWMWINDOWATTRIBUTE
202226
DWMWA_ALLOW_NCPAINT = 4
203227
DWMWA_CAPTION_BUTTON_BOUNDS = 5

‎SignalRGB-CompGen/Class/Memory.vb‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Public Class Memory
2+
3+
Public Direction As eDirection
4+
Public LEDAmount As Integer
5+
Public MatrixOrder As eMatrixOrder
6+
Public MatrixSerpentine As Boolean
7+
Public MatrixSize As Size
8+
9+
Public Sub New()
10+
Direction = eDirection.Up
11+
LEDAmount = 1
12+
MatrixOrder = eMatrixOrder.HorizontalTopLeft
13+
MatrixSerpentine = False
14+
MatrixSize = New Size(1, 1)
15+
End Sub
16+
17+
End Class

‎SignalRGB-CompGen/Class/MySettings.vb‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,15 @@ Public Class Localization
8282

8383
Public LEDInfo As String = "Index: {1}{0}Name: {2}{0}Position: {3}, {4}"
8484
Public AddLED As String = "Add LED"
85-
Public AddLEDs As String = "Add LEDs"
8685
Public RemoveLastLED As String = "Remove last LED"
8786
Public RemoveLastLEDs As String = "Remove last LEDs"
8887

8988
Public NumberOfLEDs As String = "Number of LEDs"
9089
Public Direction As String = "Direction"
9190
Public Confirm As String = "Confirm"
92-
Public Top As String = "Top"
91+
Public Up As String = "Up"
9392
Public Right As String = "Right"
94-
Public Bottom As String = "Bottom"
93+
Public Down As String = "Down"
9594
Public Left As String = "Left"
9695

9796
Public Language As String = "Language"
@@ -110,4 +109,20 @@ Public Class Localization
110109
Public Location As String = "Location"
111110
Public Zone As String = "Zone"
112111

112+
'Added on 09/03/2025
113+
Public Size As String = "Size"
114+
Public Order As String = "Order"
115+
Public Serpentine As String = "Serpentine"
116+
Public HorizontalTopLeft As String = "Horizontal Top Left"
117+
Public HorizontalTopRight As String = "Horizontal Top Right"
118+
Public HorizontalBottomLeft As String = "Horizontal Bottom Left"
119+
Public HorizontalBottomRight As String = "Horizontal Bottom Right"
120+
Public VerticalTopLeft As String = "Vertical Top Left"
121+
Public VerticalTopRight As String = "Vertical Top Right"
122+
Public VerticalBottomLeft As String = "Vertical Bottom Left"
123+
Public VerticalBottomRight As String = "Vertical Bottom Right"
124+
Public Generate As String = "Generate"
125+
Public Matrix As String = "Matrix"
126+
Public Linear As String = "Linear"
127+
113128
End Class

‎SignalRGB-CompGen/My Project/PublishProfiles/FolderProfile.pubxml.user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
44
-->
55
<Project>
66
<PropertyGroup>
7-
<History>True|2024-12-23T09:34:43.2535721Z;True|2024-10-16T02:18:03.2199911+08:00;True|2024-10-16T02:17:51.2300983+08:00;True|2024-10-15T21:17:17.0840999+08:00;True|2024-09-19T00:33:09.9794940+08:00;True|2024-08-31T18:14:04.5034137+08:00;True|2024-07-16T00:27:24.9657973+08:00;True|2024-06-25T00:13:10.4175729+08:00;True|2024-06-24T23:39:03.8475950+08:00;True|2024-06-24T23:34:28.1022342+08:00;True|2024-06-22T18:10:37.7445723+08:00;True|2024-06-17T01:37:21.0918122+08:00;True|2024-06-09T21:18:57.2685493+08:00;True|2024-06-05T23:58:49.9321488+08:00;True|2024-06-05T00:57:39.0888880+08:00;True|2024-06-05T00:55:45.6306878+08:00;True|2024-06-05T00:53:15.0344017+08:00;True|2024-06-05T00:52:38.3559013+08:00;True|2024-06-04T23:52:22.0299558+08:00;</History>
7+
<History>True|2025-03-09T14:56:07.4818911Z||;True|2024-12-23T17:34:43.2535721+08:00||;True|2024-10-16T02:18:03.2199911+08:00||;True|2024-10-16T02:17:51.2300983+08:00||;True|2024-10-15T21:17:17.0840999+08:00||;True|2024-09-19T00:33:09.9794940+08:00||;True|2024-08-31T18:14:04.5034137+08:00||;True|2024-07-16T00:27:24.9657973+08:00||;True|2024-06-25T00:13:10.4175729+08:00||;True|2024-06-24T23:39:03.8475950+08:00||;True|2024-06-24T23:34:28.1022342+08:00||;True|2024-06-22T18:10:37.7445723+08:00||;True|2024-06-17T01:37:21.0918122+08:00||;True|2024-06-09T21:18:57.2685493+08:00||;True|2024-06-05T23:58:49.9321488+08:00||;True|2024-06-05T00:57:39.0888880+08:00||;True|2024-06-05T00:55:45.6306878+08:00||;True|2024-06-05T00:53:15.0344017+08:00||;True|2024-06-05T00:52:38.3559013+08:00||;True|2024-06-04T23:52:22.0299558+08:00||;</History>
88
<LastFailureDetails />
99
</PropertyGroup>
1010
</Project>

‎SignalRGB-CompGen/SignalRGB-CompGen.vbproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
<MyType>WindowsForms</MyType>
1010
<AssemblyName>compeditor</AssemblyName>
1111
<ApplicationIcon>1.ico</ApplicationIcon>
12-
<Version>1.8.2</Version>
12+
<Version>1.9</Version>
1313
<Authors>I'm Not MentaL</Authors>
1414
<Company>Haikou Nuoli Trading Co., Ltd.</Company>
1515
<PackageProjectUrl>https://nolliergb.cn</PackageProjectUrl>
1616
<PackageIcon>nollie.png</PackageIcon>
1717
<RepositoryUrl>https://github.com/qiangqiang101/SignalRGB-CompGen</RepositoryUrl>
1818
<RepositoryType>git</RepositoryType>
19-
<AssemblyVersion>1.8.2</AssemblyVersion>
20-
<FileVersion>1.8.2</FileVersion>
19+
<AssemblyVersion>1.9</AssemblyVersion>
20+
<FileVersion>1.9</FileVersion>
2121
</PropertyGroup>
2222

2323
<ItemGroup>

‎SignalRGB-CompGen/SignalRGB-CompGen.vbproj.user‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<_LastSelectedProfileId>C:\Users\WePro\Documents\GitHub\SignalRGB-CompGen\SignalRGB-CompGen\My Project\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
4+
<_LastSelectedProfileId>C:\Users\ADMIN\Documents\GitHub\Nollie-SignalRGB-Component-Editor\SignalRGB-CompGen\My Project\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
55
</PropertyGroup>
66
<ItemGroup>
77
<Compile Update="Class\FormEx.vb">
@@ -16,9 +16,6 @@
1616
<Compile Update="Class\ThemeBase.vb">
1717
<SubType>Component</SubType>
1818
</Compile>
19-
<Compile Update="frmEdit.vb">
20-
<SubType>Form</SubType>
21-
</Compile>
2219
<Compile Update="frmImport.vb">
2320
<SubType>Form</SubType>
2421
</Compile>
@@ -31,7 +28,19 @@
3128
<Compile Update="frmSettings.vb">
3229
<SubType>Form</SubType>
3330
</Compile>
34-
<Compile Update="ucComponent.vb">
31+
<Compile Update="User Components\ucDelete.vb">
32+
<SubType>UserControl</SubType>
33+
</Compile>
34+
<Compile Update="User Components\ucComponent.vb">
35+
<SubType>UserControl</SubType>
36+
</Compile>
37+
<Compile Update="User Components\ucEdit.vb">
38+
<SubType>UserControl</SubType>
39+
</Compile>
40+
<Compile Update="User Components\ucLinear.vb">
41+
<SubType>UserControl</SubType>
42+
</Compile>
43+
<Compile Update="User Components\ucMatrix.vb">
3544
<SubType>UserControl</SubType>
3645
</Compile>
3746
</ItemGroup>

0 commit comments

Comments
 (0)