fixes; support for pathof.info (again) ; Incursion league preparation…

…s; prophecy details; poeninja option (#720)

* additional macros hotkeys are only set at init if enabled

* fix

* testing windows high contrast support

* added pathof.info support again, cahnged antiquary hotkey

* added dvorak support (changed scancodes)

* comments

* preparations for partial poe ninja

* more high contrast (win theme) support

* band-aid fix to parse new vaal gems (item name)

* fixed some issues with event leagues (availability checks, setting defaults, writing fallbacks to ini)

* Implement secondary 'have' currency, used when 'want' equals primary 'have' (#505)

For example, if chaos is selected as the 'have' currency, when searching
for chaos price ('want'), a useless chaos:chaos listing is produced. With
this patch, a secondary 'have' currency can be defined, which is used when
'want' currency equals the primary 'have' currency.

Fixes #503

* UI adjustments for alternative search currency

* added ItemInfo details for prophecies

* paying respects to TB

* added "exact currency option"

* fixed poeninja event league currency urls

* finished "open items on poe.ninja" option

* data file updates; updated notes/version

* added enchants to poeninja hotkey

lib/PoEScripts_Update.ahk

@@ -101,6 +101,7 @@ GetLatestRelease(user, repo, ReleaseVersion, ShowUpdateNotification, userDirecto
 
 				}
 			}
+			Gui, UpdateNotification:Color, ffffff, ffffff
 			Gui, UpdateNotification:Font,, Consolas
 
 			Gui, UpdateNotification:Add, GroupBox, w630 h80 cGreen, Update available!			

resources/VersionTrade.txt

@@ -1,2 +1,2 @@
-TradeReleaseVersion := "v2.9.0"
+TradeReleaseVersion := "v2.10.0"
 TradeAHKVersionRequired := "1.1.26.00"

resources/ahk/AdditionalMacros.ahk

@@ -131,10 +131,14 @@ AM_SetAfkMessage_HKey:
 	setAfkMessage()						; Pastes afk message to your chat and marks "X" so you can type in the estimated time.
 Return
 
-AM_OpenPoEAntiquary_HKey:
+AM_OpenOnPoEAntiquary_HKey:
 	OpenItemOnPoEAntiquary()					; Opens an item on http://poe-antiquary.xyz to lookup a price history from last leagues.
 Return
 
+AM_AdvancedItemInfo_HKey:
+	AdvancedItemInfoExt()					; Opens an item on pathof.info for an advanced affix breakdown.
+Return
+
 AM_WhoisLastWhisper_HKey:
 	KeyWait, Ctrl							; Sends "/whois lastWhisperCharacterName" when keys are released (not when pressed).
 	KeyWait, Alt
@@ -170,7 +174,7 @@ setAfkMessage(){
 }
 
 AM_SetHotkeys() {
-	Global AM_Config
+	Global AM_Config	
 
 	If (AM_Config.General.EnableState) {
 		For labelIndex, labelName in StrSplit(AM_Config.GetSections("|", "C"), "|") {
@@ -180,13 +184,23 @@ AM_SetHotkeys() {
 						AM_Config[labelName].State := AM_ConvertState(AM_Config[labelName].State)						
 						stateValue := AM_Config[labelName].State ? "on" : "off"
 
-						; TODO: Fix hotkeys not being set without restart						
-						Hotkey, % KeyNameToKeyCode(labelKeyName, AM_KeyToSCState), AM_%labelName%_HKey, % stateValue
-						;console.log(labelKeyName ", " KeyNameToKeyCode(labelKeyName, AM_KeyToSCState) ", " "AM_" labelName "_HKey, " stateValue ", " ErrorLevel)
+						; TODO: Fix hotkeys not being set without restart
+						If (stateValue = "on" and not AM_Config.General.finishedInit) {
+							; set hotkeys on init, only set enabled hotkeys to prevent key conflicts with other macros/applications
+							Hotkey, % KeyNameToKeyCode(labelKeyName, AM_KeyToSCState), AM_%labelName%_HKey, % stateValue
+						} Else If (AM_Config.General.finishedInit) {
+							; change hotkey states/keys without a restart (currently not working without the restart)
+							Hotkey, % KeyNameToKeyCode(labelKeyName, AM_KeyToSCState), AM_%labelName%_HKey, % stateValue							
+							;console.log(labelKeyName ", " KeyNameToKeyCode(labelKeyName, AM_KeyToSCState) ", " "AM_" labelName "_HKey, " stateValue ", " ErrorLevel)
+						}		
 					}
 				}
 			}
 		}
+
+		If (not AM_Config.General.finishedInit) {
+			AM_Config.General.finishedInit := true	
+		}		
 	}
 }