Skip to content

Commit

Permalink
Added custom rom directories
Browse files Browse the repository at this point in the history
Added ability to add custom directories, which are automatically sorted by the app.

Added ability to show full file path of roms

Fixed 'list alerady imported' error upon cancelling import
  • Loading branch information
ParthK117 committed May 8, 2020
1 parent 90bbb2e commit 68735a8
Show file tree
Hide file tree
Showing 13 changed files with 169 additions and 8 deletions.
Binary file modified .vs/W Emuloader/v16/.suo
Binary file not shown.
Binary file modified W Emuloader/bin/Debug/W Emuloader.pdb
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 38 additions & 1 deletion W Emuloader/main.Designer.vb

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

27 changes: 27 additions & 0 deletions W Emuloader/main.resx
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,33 @@
5wyGqdlelBPtAF4lbbECYFm2qvcpKYB2aFiupuZ/ldTTDt408rL1DXeTetmaL1nEU+LXDjRBGzRyL1v/
Ng3baGlFojqL0WSMdjL+HaFp/GL8ZmRCwnG6YOYD0QRt0Ait0CzdvyNk1stoMnNZLBp/AXmXuv1J4688
AAAAAElFTkSuQmCC
</value>
</data>
<data name="btn_import_roms.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAIsAAAAkCAYAAAC5U8nEAAAABGdBTUEAALGPC/xhBQAABPNJREFUeF7t
nL9OG1kYxWmQFpR0YB4gSYUEaF8B8QZAVrTQ8gpIUK0pqHcTeAJqJBqEKJCSKgs9/bLbktUmzeT+rDnR
8fCNMfKY4Pge6cjM/T/fOXPvnfGYiYyMjIzmMTk52RcvLi5eJL5N/CPxQ+Jt4v+JRebIEL3QDf3QET1f
FEUx0Q9DYzhTY68T35+dnd3t7+8X6+vrxeLiYtFqtYrp6ekilckcEaIXuqEfOqInuqIvOkcGcYYGgany
L4m/n5ycfNna2ipmZmbCAWSONmdnZwv0ReekdxvdI6PAOqO8Svy0t7dXzM3NhZ1k/lxEZ/RG98RwlomM
8uv5+fnfq6urYaOZPzfRHf3xQU+z4KhU8J/l5eWwoczxIPrjg+oM40aZSvxrbW0tbCBzvIgPkh+u8EVk
ljZrllfIHG+We5h2l1lSwqu0G/6aN7OZTm6z8UXyR2c5klneb25uhhUyx5v4IvnjsGOW9MdLHszk5yiZ
EfFF+eDuJWZ5y5O8qOAgFLa3t8P850TGKET5zgh3d3fF6elpMT8/f688bV9eXpYli+Lm5qY4OjoKywnV
/IODgzKnO570R7/0D+raHpT4A59glnfDuAMSxsEswvX1dVfZ4+PjMuc+ENbN5WNAfOXxKTMAjydtRGja
MOWd0TvM8mFpaSksNAgFPzmBk9GJEuCNjY3vgb29ve1cSarjQSSdwMEoIDs7O532BK5o2la+t0U6fXma
UBXdKfh5+ZW/srLSSfN2faykS3zO2dMdqsOnQ/0yfkHGIs/bbIr4A59gln+HsV8RdHKeVoVfOYBj1akG
0c3ggcEoAmUwAqAtGcbbUp+k+RVK3V4BF/y8onQtPVFbMlfdefrY+FvHQO27WTCUz1JNE3/gE8zyZWpq
Kiw0CAUPqhBdNZy8B0D1PIgYwut5sBVQtQ0lGJ8ce1uawQiyp6tuHQU/L59ZJJrg5ZyC8n0MHhfgx96e
XzgA0zMW5TdF/IFPfohZogA9pky1nJvMy1Tr+rHaj8r1Yi/4LCJ4P05B+dUxaGbEAFF5ESNV9y5+wTRB
N8uTL0N1Aeq3TLVcXRmlawZ6qBzw9Ih1qAqkWY27FU+HDy1Dfswnx4KOq2RGoy/g7TZBX4aefIOrNAUE
9FOmugwB1XvsMqQyUXqv9V/Q+LQU8OnlfA/lY6JeNNZobL6kCOqXMTKj0IbGG5mwCfoG98lunQWlRQES
ojLA12mf9n3fQBA1NRO46A5F9SD5jqrwTkHjQ6hIfKgrPYKWF7FubKJQFxdHdRyD0m+dn+yhnBCdcD9l
CALCwCggXM2+fjOj6E4IRv2JGK9X26Kg8UGfRbw/5bnBGV+0Ce01Nih4v/ztD+XY5zRtFOgP5Z714/6H
gpg5XOKL5I/P+ERfJB4+1y8Ss1l+LLu+SEwJmOU1X0W3Wq2wQuZ4Ej+Uryi8+W4WmBLyy0+ZXSxfftrH
KFWz8Frl1TDujDJHj+UdEK9VTt8zC0wZ+YXtzIdf2BZTgfxTkDFm3z8FEXFU4tXu7m7+kdmYkM0seqM7
+leNUmsWmCrw89U2u2Fun57rc5jMwYiu6Fve9Tz+56vOVPlNIj+M/9xutzsbn4WFhc5vZIfxbXXm8Ihe
6IZ+6IieSdf/kr6H6BwZxBkaJGJqjH+58Vvin4kfE9kA4UamrszRIHqhG/qhI3r2/y83MjIyMhrGxMQ3
p7vr1BzWNiIAAAAASUVORK5CYII=
</value>
</data>
<data name="btn_import.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
Expand Down
111 changes: 104 additions & 7 deletions W Emuloader/main.vb
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ Public Class main
lbl_twitter.Font = gothamfont11
lbl_patreon.Font = gothamfont11
checkbox_fullscreen.Font = gothamfont11
checkbox_filepath.Font = gothamfont11
End Sub
Public Sub loadconfig()

Expand Down Expand Up @@ -472,17 +473,17 @@ Public Class main

If currenttab_metadata(1) = "GBA" Then

Dim rom_path As String = System.IO.Path.GetFullPath(".\roms\GBA\" & listbox_installedroms.FocusedItem.SubItems(0).Text)
Dim rom_path As String = System.IO.Path.GetFullPath(listbox_installedroms.FocusedItem.SubItems(2).Text)
p.Arguments = ("""" & rom_path & """")
ElseIf currenttab_metadata(1) = "3DS" Then


Dim rom_path As String = System.IO.Path.GetFullPath(".\roms\3DS\" & listbox_installedroms.FocusedItem.SubItems(0).Text)
Dim rom_path As String = System.IO.Path.GetFullPath(listbox_installedroms.FocusedItem.SubItems(2).Text)
p.Arguments = ("""" & rom_path & """")
ElseIf currenttab_metadata(1) = "NDS" Then


Dim rom_path As String = System.IO.Path.GetFullPath(".\roms\NDS\" & listbox_installedroms.FocusedItem.SubItems(0).Text)
Dim rom_path As String = System.IO.Path.GetFullPath(listbox_installedroms.FocusedItem.SubItems(2).Text)
p.Arguments = ("""" & rom_path & """")
End If

Expand Down Expand Up @@ -549,6 +550,7 @@ Public Class main


System.IO.File.Copy(import_list.FileName, ".\lists\" & System.IO.Path.GetFileName(import_list.FileName))
ElseIf Windows.Forms.DialogResult.Cancel Then
Else
MessageBox.Show("List already imported")
End If
Expand Down Expand Up @@ -646,6 +648,11 @@ Public Class main

Public Sub load_installed_roms()
listbox_installedroms.Items.Clear()
If File.Exists(".\custom.eldr") = False Then
System.IO.File.Create(".\custom.eldr").Dispose()
End If

Dim customromlist As String() = File.ReadAllLines(".\custom.eldr")

If currenttab_metadata(1) = "GBA" Then
If Directory.Exists(".\roms\GBA") = False Then
Expand All @@ -656,10 +663,24 @@ Public Class main
If f.ToString.Contains("sav") Then

ElseIf f.ToString.Contains("gba") Then
listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "GBA"}))
listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "GBA", System.IO.Path.GetFullPath(f.FullName)}))
End If

Next

For Each x In customromlist
Dim custom_directory As New DirectoryInfo(x)
For Each f In custom_directory.GetFiles
If f.ToString.Contains("gba") Then

listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "GBA", System.IO.Path.GetFullPath(f.FullName)}))
End If

Next
Next



ElseIf currenttab_metadata(1) = "3DS" Then
If Directory.Exists(".\roms\3DS") = False Then
Directory.CreateDirectory(".\roms\3DS")
Expand All @@ -668,10 +689,21 @@ Public Class main
For Each f In rom_directory.GetFiles
If f.ToString.Contains("XT") Then
ElseIf f.ToString.Contains("3ds") Then
listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "3DS"}))
listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "3DS", System.IO.Path.GetFullPath(f.FullName)}))
End If

Next

For Each x In customromlist
Dim custom_directory As New DirectoryInfo(x)
For Each f In custom_directory.GetFiles
If f.ToString.Contains("3ds") Then

listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "3DS", System.IO.Path.GetFullPath(f.FullName)}))
End If

Next
Next
ElseIf currenttab_metadata(1) = "NDS" Then
If Directory.Exists(".\roms\NDS") = False Then
Directory.CreateDirectory(".\roms\NDS")
Expand All @@ -680,17 +712,32 @@ Public Class main
For Each f In rom_directory.GetFiles
If f.ToString.Contains("XT") Then
ElseIf f.ToString.Contains("nds") Then
listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "NDS"}))
listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "NDS", System.IO.Path.GetFullPath(f.FullName)}))
End If

Next

For Each x In customromlist
Dim custom_directory As New DirectoryInfo(x)
For Each f In custom_directory.GetFiles
If f.ToString.Contains("nds") Then

listbox_installedroms.Items.Add(New ListViewItem(New String() {f.ToString, "NDS", System.IO.Path.GetFullPath(f.FullName)}))
End If

Next
Next
End If



If listbox_installedroms.Items.Count = 0 Then
listbox_installedroms.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize)

Else
listbox_installedroms.AutoResizeColumns(ColumnHeaderAutoResizeStyle.ColumnContent)
End If

listbox_installedroms.Columns.Item(2).Width = 0
listbox_installedroms.AutoResizeColumn(1, ColumnHeaderAutoResizeStyle.HeaderSize)

End Sub
Expand All @@ -714,4 +761,54 @@ Public Class main
lbl_status.Location = New Point((panel_top.Width - lbl_status.Width) \ 2, (panel_top.Height - lbl_status.Height) \ 2)
End If
End Sub



Private Sub btn_import_roms_MouseEnter(sender As Object, e As EventArgs) Handles btn_import_roms.MouseEnter
btn_import_roms.BackgroundImage = System.Drawing.Image.FromFile(".\resources\importromswhite.png")
End Sub

Private Sub btn_import_roms_MouseLeave(sender As Object, e As EventArgs) Handles btn_import_roms.MouseLeave
btn_import_roms.BackgroundImage = System.Drawing.Image.FromFile(".\resources\importromsblack.png")
End Sub

Private Sub btn_import_roms_MouseDown(sender As Object, e As MouseEventArgs) Handles btn_import_roms.MouseDown
btn_import_roms.BackgroundImage = System.Drawing.Image.FromFile(".\resources\importromsclick.png")

Dim folderBrowser As New OpenFileDialog()

folderBrowser.ValidateNames = False
folderBrowser.CheckFileExists = False
folderBrowser.CheckPathExists = True
folderBrowser.FileName = "This folder."
If folderBrowser.ShowDialog() = DialogResult.OK Then

Dim folderPath As String = Path.GetDirectoryName(folderBrowser.FileName)


If File.Exists(".\custom.eldr") = False Then
System.IO.File.Create(".\custom.eldr").Dispose()
End If

My.Computer.FileSystem.WriteAllText(".\custom.eldr", folderPath, True)




Call load_installed_roms()
End If

End Sub

Private Sub btn_import_roms_MouseUp(sender As Object, e As MouseEventArgs) Handles btn_import_roms.MouseUp
btn_import_roms.BackgroundImage = System.Drawing.Image.FromFile(".\resources\importromswhite.png")
End Sub

Private Sub checkbox_filepath_CheckedChanged(sender As Object, e As EventArgs) Handles checkbox_filepath.CheckedChanged
If checkbox_filepath.Enabled = True Then
listbox_installedroms.Columns.Item(2).Width = 200
Else
listbox_installedroms.Columns.Item(2).Width = 0
End If
End Sub
End Class
Binary file modified W Emuloader/obj/Debug/W Emuloader.exe
Binary file not shown.
Binary file modified W Emuloader/obj/Debug/W Emuloader.pdb
Binary file not shown.
Binary file modified W Emuloader/obj/Debug/W Emuloader.vbproj.GenerateResource.cache
Binary file not shown.
Binary file modified W Emuloader/obj/Debug/W Emuloader.vbprojAssemblyReference.cache
Binary file not shown.
Binary file modified W Emuloader/obj/Debug/W_Emuloader.main.resources
Binary file not shown.

0 comments on commit 68735a8

Please sign in to comment.