v1.55.3 merge

- updater: important versions are now highlighted orange in the version-list
- stash-ninja: added bookmarking to permanently highlight specific items

Author: Lailloken

Lailloken UI.ahk

@@ -288,9 +288,9 @@ HelpToolTip(HWND_key)
 			For index, text in val
 				If (index > 1)
 				{
-					Gui, %GUI_name%: Add, Text, % "x0 y-1000 Hidden w"tooltip_width - settings.general.fWidth, % StrReplace(text, "&", "&&")
+					Gui, %GUI_name%: Add, Text, % "x0 y-1000 Hidden w"tooltip_width - settings.general.fWidth, % StrReplace(StrReplace(text, "&", "&&"), "(/highlight)")
 					Gui, %GUI_name%: Add, Text, % (index = 2 ? "x0 y0" : "xs") " Section Border BackgroundTrans hp+"settings.general.fWidth " w"tooltip_width, % ""
-					Gui, %GUI_name%: Add, Text, % "HWNDhwnd xp+"settings.general.fWidth/2 " yp+"settings.general.fWidth/2 " w"tooltip_width - settings.general.fWidth, % StrReplace(text, "&", "&&")
+					Gui, %GUI_name%: Add, Text, % "HWNDhwnd xp+"settings.general.fWidth/2 " yp+"settings.general.fWidth/2 " w"tooltip_width - settings.general.fWidth . (InStr(text, "(/highlight)") ? " cFF8000" : ""), % StrReplace(StrReplace(text, "&", "&&"), "(/highlight)")
 				}
 		}
 	Else

data/changelog.json

@@ -1,4 +1,8 @@
 [
+  [
+	["1.55.3", 15503],
+	"stash-ninja: added bookmarking to permanently highlight specific items"
+  ],
   [
 	["1.55.2", 15502],
 	"recombination: added item-slot locking, improved mod detection, updated fractured behavior",
@@ -26,8 +30,8 @@
 	"minor fixes and improvements"
   ],
   [
-	["1.54.6", 15406],
-	"omni-key consistency improvements (inventory pixel-check is now mandatory)",
+	["1.54.6", 15406, 1],
+	"omni-key consistency improvements (inventory pixel-check is now mandatory)(/highlight)",
 	"fixes: cheat-sheets, item-info class-specific highlighting, map-info magic monsters",
 	"item-info: improved ilvl detection for mods, changed highlighting"
   ],

data/english/UI.txt

@@ -167,6 +167,8 @@
 		global_time			=	"time"
 		global_refresh			=	"refresh"
 		global_settings			=	"settings"
+		global_regex			=	"copy regex"
+		global_clipboard		=	"copied to clipboard"
 
 		mechanic_bestiary		=	"bestiary"
 		mechanic_betrayal		=	"betrayal"
@@ -566,6 +568,7 @@
 		stash_solo			=	"solo"				;## as in a single person/thing/reason
 		stash_sell			=	"sell"
 		stash_sell			=	"for"				;## these two belong together, i.e. "sell X for Y"
+		stash_bookmark			=	"bookmark-profile"
 
 
 ;#####################################################
@@ -890,6 +893,7 @@
 		m_stash_bulk			=	"enable bulk-sale management"
 		m_stash_margins			=	"margins (%):"
 		m_stash_active			=	"active tab:"
+		m_stash_bookmarking		=	"enable bookmarking"
 
 
 

data/english/help tooltips.json

@@ -603,6 +603,9 @@
     "stash color tag2": [
       "this is what price tags with exchange-prices look like"
     ],
+    "stash color tag3": [
+      "this is what bookmarked price tags look like"
+    ],
     "stash enable": [
       "stash feature that highlights items in specific stash tabs according to rough market prices",
       "long-press the omni-key (default: middle mouse-button) while hovering over an item in a tab to activate the feature",
@@ -647,6 +650,12 @@
       "the overlay's position has to be offset if this specific tab is in a stash folder",
       "check this box if this tab is in a folder"
     ],
+    "stash bookmarking": [
+      "adds a bookmark-list next to the price-profile panel",
+      "press space while hovering over an item to add 1x to the current list, or press alt to remove 1x",
+      "bookmarked items will always be highlighted on the grid, regardless of active price-profile",
+      "each tab has 5 separate lists: hold control or shift, and press number-keys to switch"
+    ],
     "stash limits": [
       "you can configure up to 5 price-range profiles for each individual tab",
       "input-box structure:\nprofile # | max value\nunit: c, e, d, % | min value        ",
@@ -664,7 +673,8 @@
     "update versions": [
       "the list below shows the available versions to switch between or reinstall",
       "each line represents a major version and has buttons to select the minor version",
-      "hover over a button to see that version's summarized changelog"
+      "versions with important changes are highlighted in orange",
+      "hover over a button to see a summarized changelog, click it to prepare the download"
     ],
     "update full changelog": [
       "opens the github page with the detailed changelog of the selected version"

data/versions.json

@@ -1,3 +1,3 @@
 {
-  "_release": [15502, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
+  "_release": [15503, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
 }

modules/hotkeys.ahk

@@ -339,9 +339,14 @@ HotkeysTab()
 #If WinActive("ahk_group poe_ahk_window") && vars.hwnd.leveltracker.main ;pre-defined context for hotkey command
 #If (vars.log.areaID = vars.maptracker.map.id) && settings.features.maptracker && settings.maptracker.mechanics && settings.maptracker.portal_reminder && vars.maptracker.map.content.Count() && WinActive("ahk_id " vars.hwnd.poe_client) ;pre-defined context for hotkey command
 
-#If WinActive("ahk_group poe_ahk_window") && InStr(vars.stash.hover, "tab_")
+#If vars.hwnd.stash.main && WinExist("ahk_id " vars.hwnd.stash.main) && InStr(vars.stash.hover, "tab_")
 *~LButton::Stash_(StrReplace(vars.stash.hover, "tab_"))
 
+#If vars.hwnd.stash.main && WinExist("ahk_id " vars.hwnd.stash.main) && IsObject(vars.stash.regex)
+&& LLK_IsBetween(vars.general.xMouse, vars.client.x + vars.stash.regex.x, vars.client.x + vars.stash.regex.x + vars.stash.regex.w)
+&& LLK_IsBetween(vars.general.yMouse, vars.client.y + vars.stash.regex.y, vars.client.y + vars.stash.regex.y + vars.stash.regex.h)
+LButton::Stash_Hotkeys("regex")
+
 #If settings.features.sanctum && vars.sanctum.active && WinExist("ahk_id " vars.hwnd.sanctum.second) && !vars.sanctum.lock ;last condition needed to make the space-key usable again after initial lock
 *Space::Sanctum_("lock")
 
@@ -358,12 +363,14 @@ WheelUp::Stash_PricePicker("+")
 WheelDown::Stash_PricePicker("-")
 MButton::Stash_PricePicker("reset")
 
-#If WinActive("ahk_id " vars.hwnd.poe_client) && WinExist("ahk_id " vars.hwnd.stash.main)
+#If vars.hwnd.stash.main && WinActive("ahk_id " vars.hwnd.poe_client) && WinExist("ahk_id " vars.hwnd.stash.main)
 *SC002::
 *SC003::
 *SC004::
 *SC005::
 *SC006::
+Space::
+LAlt::
 ~+LButton::
 ~*RButton::Stash_Hotkeys()
 
@@ -379,7 +386,7 @@ MButton::Stash_PricePicker("reset")
 *WheelUp::vars.OCR.wGUI += ((vars.OCR.wGUI + 30) * 2 >= vars.client.w || (vars.OCR.hGUI + 15) * 2 >= vars.client.h) ? 0 : 30, vars.OCR.hGUI += ((vars.OCR.wGUI + 30) * 2 >= vars.client.w || (vars.OCR.hGUI + 15) * 2 >= vars.client.h) ? 0 : 15
 *WheelDown::vars.OCR.wGUI -= (vars.OCR.wGUI - 30 >= vars.client.h / 10 + 30 && vars.OCR.hGUI - 15 >= vars.client.h / 10 + 15) ? 30 : 0, vars.OCR.hGUI -= (vars.OCR.wGUI - 30 >= vars.client.h / 10 + 30 && vars.OCR.hGUI - 15 >= vars.client.h / 10 + 15) ? 15 : 0
 
-#If vars.general.wMouse && (vars.general.wMouse = vars.hwnd.ocr_tooltip.main) ;hovering over the ocr tooltip
+#If vars.hwnd.ocr_tooltip.main && vars.general.wMouse && (vars.general.wMouse = vars.hwnd.ocr_tooltip.main) ;hovering over the ocr tooltip
 *LButton::OCR_Close()
 *Space::
 *SC002::

modules/settings menu.ahk

@@ -3250,19 +3250,19 @@ Settings_stash()
 
 	Gui, %GUI%: Add, Text, % "xs Section", % LangTrans("stash_pricetags")
 	colors := settings.stash.colors.Clone()
-	Loop 2
+	Loop 3
 	{
-		color1 := colors[Floor(A_Index * 1.5)], color2 := colors[A_Index * 2]
+		color1 := colors[A_Index * 2 - 1], color2 := colors[A_Index * 2]
 		Gui, %GUI%: Add, Text, % "ys Border Center HWNDhwndtext BackgroundTrans c" color1, % " 69.42 "
 		Gui, %GUI%: Add, Progress, % "xp yp wp hp Border BackgroundBlack HWNDhwndback c" color2, 100
 		Gui, %GUI%: Add, Text, % "ys x+-1 Border BackgroundTrans gSettings_stash2 HWNDhwnd00", % "  "
 		Gui, %GUI%: Add, Progress, % "xp yp wp hp Border BackgroundBlack HWNDhwnd01 c" color1, 100
 		Gui, %GUI%: Add, Text, % "ys x+-1 Border BackgroundTrans gSettings_stash2 HWNDhwnd10", % "  "
 		Gui, %GUI%: Add, Progress, % "xp yp wp hp Border BackgroundBlack HWNDhwnd11 c" color2, 100
-		vars.hwnd.settings["color_" Floor(A_Index * 1.5)] := hwnd00, vars.hwnd.settings["color_" Floor(A_Index * 1.5) "_panel"] := hwnd01, vars.hwnd.settings["color_" Floor(A_Index * 1.5) "_text"] := hwndtext
+		vars.hwnd.settings["color_" A_Index * 2 - 1] := hwnd00, vars.hwnd.settings["color_" A_Index * 2 - 1 "_panel"] := hwnd01, vars.hwnd.settings["color_" A_Index * 2 - 1 "_text"] := hwndtext
 		vars.hwnd.settings["color_" A_Index * 2] := hwnd10, vars.hwnd.settings["color_" A_Index * 2 "_panel"] := hwnd11, vars.hwnd.settings["color_" A_Index * 2 "_text"] := hwndback
-		vars.hwnd.help_tooltips["settings_generic color double" (A_Index = 2 ? "|" : "")] := hwnd01, vars.hwnd.help_tooltips["settings_generic color double1" (A_Index = 2 ? "|" : "")] := hwnd11
-		vars.hwnd.help_tooltips["settings_stash color tag" A_Index] := hwndback
+		vars.hwnd.help_tooltips["settings_generic color double" handle] := hwnd01, vars.hwnd.help_tooltips["settings_generic color double1" handle] := hwnd11
+		vars.hwnd.help_tooltips["settings_stash color tag" A_Index] := hwndback, handle .= "|"
 	}
 
 
@@ -3291,10 +3291,11 @@ Settings_stash()
 	Gui, %GUI%: Add, Text, % "ys HWNDhwnd3 gSettings_stash2 Center Border w" settings.general.fWidth * 2, % "–"
 	Gui, %GUI%: Add, Text, % "ys HWNDhwnd4 gSettings_stash2 Center Border wp x+" settings.general.fWidth//2, % "+"
 	Gui, %GUI%: Add, Checkbox, % "xs Section HWNDhwnd5 gSettings_stash2 Checked" settings.stash[vars.stash.active].in_folder, % LangTrans("m_stash_folder")
-	;vars.hwnd.settings["cal_" tab] := vars.hwnd.help_tooltips["settings_stash calibrate"] := hwnd
+	Gui, %GUI%: Add, Checkbox, % "xs Section HWNDhwnd6 gSettings_stash2 Checked" settings.stash[vars.stash.active].bookmarking, % LangTrans("m_stash_bookmarking")
 	vars.hwnd.settings.test := vars.hwnd.help_tooltips["settings_stash test"] := hwnd1, tab := vars.settings.selected_tab
 	vars.hwnd.settings["gap-_" tab] := hwnd3, vars.hwnd.settings["gap+_" tab] vars.hwnd.help_tooltips["settings_stash gap"] := hwnd2
 	vars.hwnd.settings["gap+_" tab] := hwnd4, vars.hwnd.settings["infolder_" tab] := vars.hwnd.help_tooltips["settings_stash in folder"] := hwnd5
+	vars.hwnd.settings["bookmarking_" tab] := vars.hwnd.help_tooltips["settings_stash bookmarking"] := hwnd6
 
 	Gui, %GUI%: Add, Text, % "xs Section", % LangTrans("m_stash_limits")
 	Gui, %GUI%: Add, Pic, % "ys HWNDhwnd hp w-1", % "HBitmap:*" vars.pics.global.help
@@ -3316,20 +3317,6 @@ Settings_stash()
 
 		vars.hwnd.settings["limits" A_Index "top_" tab] := hwnd, vars.hwnd.settings["limits" A_Index "bot_" tab] := hwnd1, vars.hwnd.settings["limits" A_Index "cur_" tab] := hwnd2
 	}
-	/*
-	Loop 5
-	{
-		style := (A_Index != 5) && settings.stash.bulk_trade && settings.stash.min_trade && settings.stash.autoprofiles ? "Disabled " : ""
-		Gui, %GUI%: Add, Text, % (A_Index = 1 ? "xs Section" : "ys x+" settings.general.fWidth//2) " Border Center 0x200 h" settings.general.fHeight * 2 - 1 " w" settings.general.fWidth * 2, % A_Index
-		Gui, %GUI%: Font, % "s" settings.general.fSize - 4 " cBlack"
-		Gui, %GUI%: Add, Edit, % style "ys x+-1 Section Center HWNDhwnd gSettings_stash2 Limit w" settings.general.fWidth * 3 " h" settings.general.fHeight, % settings.stash[tab].limits[A_Index].2
-		ControlGetPos, x, y,,,, ahk_id %hwnd%
-		Gui, %GUI%: Add, Edit, % style "xs y+-1 Center HWNDhwnd1 Limit gSettings_stash2 wp h" settings.general.fHeight, % settings.stash[tab].limits[A_Index].1
-		Gui, %GUI%: Add, Edit, % style "ys Center x+0 HWNDhwnd2 gSettings_stash2 Limit1 y" y + settings.general.fHeight/2 - 1 " w" settings.general.fWidth * 2, % currencies[settings.stash[tab].limits[A_Index].3]
-		Gui, %GUI%: Font, % "s" settings.general.fSize " cWhite"
-		vars.hwnd.settings["limits" A_Index "top_" tab] := hwnd, vars.hwnd.settings["limits" A_Index "bot_" tab] := hwnd1, vars.hwnd.settings["limits" A_Index "cur_" tab] := hwnd2
-	}
-	*/
 }
 
 Settings_stash2(cHWND)
@@ -3385,8 +3372,8 @@ Settings_stash2(cHWND)
 			Else
 			{
 				Hotkey, IfWinActive, ahk_group poe_window
-				Hotkey, % settings.stash.hotkey, Stash_Selection, Off
-				Hotkey, % (settings.stash.hotkey := input0), Stash_Selection, On
+				Hotkey, % "~" settings.stash.hotkey, Stash_Selection, Off
+				Hotkey, % "~" (settings.stash.hotkey := input0), Stash_Selection, On
 				IniWrite, % """" input0 """", ini\stash-ninja.ini, settings, hotkey
 				GuiControl, +cBlack, % vars.hwnd.settings.hotkey
 				GuiControl, movedraw, % vars.hwnd.settings.hotkey
@@ -3450,7 +3437,7 @@ Settings_stash2(cHWND)
 	}
 	Else If InStr(check, "color_")
 	{
-		color := (vars.system.click = 1) ? RGB_Picker(settings.stash.colors[control]) : (InStr("13", control) ? "000000" : (control = 2) ? "00FF00" : "FF8000")
+		color := (vars.system.click = 1) ? RGB_Picker(settings.stash.colors[control]) : (InStr("135", control) ? "000000" : (control = 2) ? "00FF00" : (control = 4) ? "FF8000" : "00FFFF")
 		If Blank(color)
 		{
 			in_progress := 0
@@ -3459,7 +3446,7 @@ Settings_stash2(cHWND)
 		GuiControl, % "+c" color, % vars.hwnd.settings["color_" control "_panel"]
 		GuiControl, % "+c" color, % vars.hwnd.settings["color_" control "_text"]
 		GuiControl, % "movedraw", % vars.hwnd.settings["color_" control "_text"]
-		IniWrite, % (settings.stash.colors[control] := color), ini\stash-ninja.ini, UI, % (InStr("13", control) ? "text" : "background") " color" (control > 2 ? "2" : "")
+		IniWrite, % (settings.stash.colors[control] := color), ini\stash-ninja.ini, UI, % (InStr("135", control) ? "text" : "background") " color" (control > 2 ? Ceil(control/2) : "")
 	}
 	Else If InStr(check, "gap")
 	{
@@ -3479,6 +3466,8 @@ Settings_stash2(cHWND)
 			IniWrite, % (settings.stash[tab].in_folder := LLK_ControlGet(cHWND)), ini\stash-ninja.ini, % tab, tab is in folder
 		Init_stash(1)
 	}
+	Else If InStr(check, "bookmarking")
+		IniWrite, % (settings.stash[vars.stash.active].bookmarking := LLK_ControlGet(cHWND)), ini\stash-ninja.ini, % vars.stash.active, bookmarking
 	Else If InStr(check, "limits")
 	{
 		types := {"bot": 1, "top": 2, "cur": 3}
@@ -3513,7 +3502,7 @@ Settings_stash2(cHWND)
 		Stash_(vars.settings.selected_stash, 1)
 	Else LLK_ToolTip("no action")
 
-	For index, val in ["limits", "gap", "color_", "font_", "league_", "history", "folder"]
+	For index, val in ["limits", "gap", "color_", "font_", "league_", "history", "folder", "bookmarking_"]
 		If InStr(check, val) && WinExist("ahk_id " vars.hwnd.stash.main)
 			Stash_("refresh", (val = "gap") ? 1 : 0)
 	in_progress := 0
@@ -3590,16 +3579,13 @@ Settings_updater()
 		For index, val in vars.updater.changelog
 		{
 			major := SubStr(val.1.1, 1, 5)
-			If (val.1.2 < 15300) || added[major]
+			If (val.1.2 < 15300)
 				Continue
-			added[major] := 1, version_match := InStr(selected, major) ? 1 : 0
-			Gui, %GUI%: Add, Text, % "Section xs", % major
-			Loop, % SubStr(val.1.2, -1) + 1
-			{
-				minor := SubStr(val.1.2, -1) + 1 - A_Index, color := (version_match && selected_sub = minor) ? " cFuchsia" : ""
-				Gui, %GUI%: Add, Text, % "ys Border HWNDhwnd gSettings_updater2 Center w" settings.general.fWidth * 2 . color . (A_Index = 1 ? " x+0" : " x+" settings.general.fWidth/2), % minor
-				vars.hwnd.settings["versionselect_" major . minor] := vars.hwnd.help_tooltips["settings_update changelog " major . minor] := hwnd
-			}
+			If !added[major]
+				Gui, %GUI%: Add, Text, % "Section xs", % major
+			minor := SubStr(val.1.2, -1) + 0, color := (selected = major . minor) ? " cFuchsia" : val.1.3 ? " cFF8000" : ""
+			Gui, %GUI%: Add, Text, % "ys Border HWNDhwnd gSettings_updater2 Center w" settings.general.fWidth * 2 . color . (!added[major] ? " x+0" : " x+" settings.general.fWidth/2), % minor
+			vars.hwnd.settings["versionselect_" major . minor] := vars.hwnd.help_tooltips["settings_update changelog " major . minor] := hwnd, added[major] := 1
 		}
 	}