Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 1 #39

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions LoLMasteryManager/Admin.vb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ Public Class Admin

Dim oMasteryCoordinatesFile As New MasteryCoordinatesFile

Dim sMenuScreenshotPath As String = "D:\Google Drive\LoL Mastery Manager\Client - Menu.png"
Dim sChampionSelectScreenshotPath As String = "D:\Google Drive\LoL Mastery Manager\Client - Champion Select.png"
Dim sMasteryIconDirectory As String = "D:\Google Drive\LoL Mastery Manager\Masteries"
Dim sMenuScreenshotPath As String = "D:\LoL Mastery Manager\Client - Menu.png"
Dim sChampionSelectScreenshotPath As String = "D:\LoL Mastery Manager\Client - Champion Select.png"
Dim sMasteryIconDirectory As String = "D:\LoL Mastery Manager\Masteries"

Dim oLocator As New MasteryLocator
Dim oMasteryCoordinateFile As New MasteryCoordinatesFile
Expand Down Expand Up @@ -73,7 +73,7 @@ Public Class Admin

Try

Dim sMasteryCoordinatesPath As String = Path.Combine("D:\Google Drive\LoL Mastery Manager", "Coordinates.json")
Dim sMasteryCoordinatesPath As String = Path.Combine("D:\LoL Mastery Manager", "Coordinates.json")
Dim sMasteryCoordinatesJson As String = JsonConvert.SerializeObject(masteryCoordinateListFile)

Using oStreamWriter As New StreamWriter(sMasteryCoordinatesPath)
Expand Down
6 changes: 3 additions & 3 deletions LoLMasteryManager/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup>
</configuration>
</configuration>
4 changes: 2 additions & 2 deletions LoLMasteryManager/ClientControls/ClientControls.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

Public Structure Medium

Public Const Width As Integer = 1280
Public Const Height As Integer = 800
Public Const Width As Integer = 1152
Public Const Height As Integer = 720

End Structure

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,22 @@
Public Const Width As Integer = 165
Public Const Height As Integer = 20

Public Structure ChampionSelect
Public Structure ChampionSelect_Old

Public Structure Small

Public Const X As Double = ClientSize.Small.Width / 112
Public Const Y As Double = ClientSize.Small.Height / 165
Public Const X As Double = ClientSize.Medium.Width / 128
Public Const Y As Double = ClientSize.Medium.Height / 190

End Structure

Public Structure Medium

Public Const X As Double = ClientSize.Medium.Width / 132
Public Const Y As Double = ClientSize.Medium.Height / 172
End Structure
Public Structure ChampionSelect

End Structure

Public Structure Large
Public Const X As Double = ClientSize.Medium.Width / 115
Public Const Y As Double = ClientSize.Medium.Height / 103

Public Const X As Double = ClientSize.Large.Width / 70
Public Const Y As Double = ClientSize.Medium.Height / 150

End Structure

End Structure

Expand Down
25 changes: 7 additions & 18 deletions LoLMasteryManager/ClientControls/ClientReturnPointsButton.vb
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,20 @@
Public Const Width As Integer = 175
Public Const Height As Integer = 25

Public Structure ChampionSelect

Public Structure Small

Public Const X As Double = ClientSize.Small.Width / 120
Public Const Y As Double = ClientSize.Small.Height / 285

End Structure
Public Structure ChampionSelect_Old

Public Structure Medium
Public Const X As Double = ClientSize.Medium.Width / 139
Public Const Y As Double = ClientSize.Medium.Height / 325

Public Const X As Double = ClientSize.Medium.Width / 145
Public Const Y As Double = ClientSize.Medium.Height / 325

End Structure

Public Structure Large
End Structure
Public Structure ChampionSelect

Public Const X As Double = ClientSize.Large.Width / 85
Public Const Y As Double = ClientSize.Large.Height / 320
Public Const X As Double = ClientSize.Medium.Width / 126
Public Const Y As Double = ClientSize.Medium.Height / 245

End Structure

End Structure

Public Structure Menu

Public Const X As Double = ClientSize.Small.Width / 105
Expand Down
26 changes: 7 additions & 19 deletions LoLMasteryManager/ClientControls/ClientSaveMasteriesButton.vb
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,16 @@
Public Const Width As Integer = 175
Public Const Height As Integer = 25

Public Structure ChampionSelect

Public Structure Small

Public Const X As Double = ClientSize.Small.Width / 120
Public Const Y As Double = ClientSize.Small.Height / 265

End Structure

Public Structure Medium
Public Structure ChampionSelect_Old

Public Const X As Double = ClientSize.Medium.Width / 145
Public Const Y As Double = ClientSize.Medium.Height / 295
Public Const X As Double = ClientSize.Medium.Width / 145
Public Const Y As Double = ClientSize.Medium.Height / 300

End Structure

Public Structure Large

Public Const X As Double = ClientSize.Large.Width / 85
Public Const Y As Double = ClientSize.Large.Height / 285
End Structure
Public Structure ChampionSelect

End Structure
Public Const X As Double = ClientSize.Medium.Width / 126
Public Const Y As Double = ClientSize.Medium.Height / 217

End Structure

Expand Down
6 changes: 5 additions & 1 deletion LoLMasteryManager/LoLMasteryManager.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
<AssemblyName>LoLMasteryManager</AssemblyName>
<FileAlignment>512</FileAlignment>
<MyType>WindowsForms</MyType>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -25,6 +27,7 @@
<NoWarn>
</NoWarn>
<WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -55,6 +58,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<ApplicationManifest>app.manifest</ApplicationManifest>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
Expand Down
Loading