diff --git a/DevZone/MoveScreenshots.ps1 b/DevZone/MoveScreenshots.ps1 index 013e379..6767b1a 100644 --- a/DevZone/MoveScreenshots.ps1 +++ b/DevZone/MoveScreenshots.ps1 @@ -1,25 +1,21 @@ -# move most recent screenshot into Images with specific name -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\11_options.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\10_options-menu.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\09_favorites-menu.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\08_notes.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\07_filter-rarity.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\06_filter-color.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\05_filter-family.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\04_filter-type.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\03_filter-source.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\02_sort.jpg -Force } -gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last 1 | ForEach-Object { move ..\..\..\Screenshots\$_ .\Images\01_special.jpg -Force } +# move most recent screenshot into ./Images with specific name +$files = ("01_special.jpg", '02_sort.jpg', '03_filter-source.jpg', '04_filter-type.jpg', '05_filter-family.jpg', '06_filter-color.jpg', '07_filter-rarity.jpg', '08_notes.jpg', '09_favorites-menu.jpg', '10_options-menu.jpg', '11_options.jpg') +gci ..\..\..\Screenshots\ | sort LastWriteTime |select -last $files.Count | ForEach-Object -Begin{ $i=0 } -Process { $f=$files[$i++]; move ..\..\..\Screenshots\$_ .\Images\$f -Force } -# using imagick convert -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 01_special.jpg 01_special.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 02_sort.jpg 02_sort.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 03_filter-source.jpg 03_filter-source.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 04_filter-type.jpg 04_filter-type.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x1050+10+130 05_filter-family.jpg 05_filter-family.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 06_filter-color.jpg 06_filter-color.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 07_filter-rarity.jpg 07_filter-rarity.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 08_notes.jpg 08_notes.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 880x800+10+130 09_favorites-menu.jpg 09_favorites-menu.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 390x395+800+130 10_options-menu.jpg 10_options-menu.jpg -docker run --rm -v .\Images\:/imgs dpokidov/imagemagick:latest -crop 870x895+1745+140 11_options.jpg 11_options.jpg +# using imagick convert to crop images +# https://imagemagick.org/script/command-line-options.php#crop +function convert +{ + docker run --rm -d -v .\Images\:/imgs dpokidov/imagemagick:latest @args +} +convert -crop 880x800+10+130 01_special.jpg 01_special.jpg +convert -crop 880x800+10+130 02_sort.jpg 02_sort.jpg +convert -crop 880x800+10+130 03_filter-source.jpg 03_filter-source.jpg +convert -crop 880x800+10+130 04_filter-type.jpg 04_filter-type.jpg +convert -crop 880x1050+10+130 05_filter-family.jpg 05_filter-family.jpg +convert -crop 880x800+10+130 06_filter-color.jpg 06_filter-color.jpg +convert -crop 880x800+10+130 07_filter-rarity.jpg 07_filter-rarity.jpg +convert -crop 880x800+10+130 08_notes.jpg 08_notes.jpg +convert -crop 880x800+10+130 09_favorites-menu.jpg 09_favorites-menu.jpg +convert -crop 415x415+800+130 10_options-menu.jpg 10_options-menu.jpg +convert -crop 870x895+1745+140 11_options.jpg 11_options.jpg diff --git a/DevZone/Screenshot.lua b/DevZone/Screenshot.lua index 24223d5..e1cdf64 100644 --- a/DevZone/Screenshot.lua +++ b/DevZone/Screenshot.lua @@ -13,10 +13,12 @@ function ADDON:TakeScreenshots() frame:Hide() end + C_CVar.SetCVar("mountJournalShowPlayer", 0) -- hide player + if WeakAuras then WeakAuras:Toggle() -- turn off WA end - MountJournalEnhanced_Open() + ToggleCollectionsJournal(COLLECTIONS_JOURNAL_TAB_INDEX_MOUNTS) -- give time to load properly C_Timer.After(0.5, function() @@ -121,6 +123,8 @@ function ADDON:TakeScreenshots() if WeakAuras then WeakAuras:Toggle() -- turn on WA end + + C_CVar.SetCVar("mountJournalShowPlayer", 1) -- show player end ) end) diff --git a/Images/01_special.jpg b/Images/01_special.jpg index 75e2e5a..de2b77c 100644 Binary files a/Images/01_special.jpg and b/Images/01_special.jpg differ diff --git a/Images/02_sort.jpg b/Images/02_sort.jpg index 7666bac..1631f7d 100644 Binary files a/Images/02_sort.jpg and b/Images/02_sort.jpg differ diff --git a/Images/03_filter-source.jpg b/Images/03_filter-source.jpg index 3e92c66..4d77180 100644 Binary files a/Images/03_filter-source.jpg and b/Images/03_filter-source.jpg differ diff --git a/Images/04_filter-type.jpg b/Images/04_filter-type.jpg index 52779b1..60a7e70 100644 Binary files a/Images/04_filter-type.jpg and b/Images/04_filter-type.jpg differ diff --git a/Images/05_filter-family.jpg b/Images/05_filter-family.jpg index 1ad4a4b..a20cb91 100644 Binary files a/Images/05_filter-family.jpg and b/Images/05_filter-family.jpg differ diff --git a/Images/06_filter-color.jpg b/Images/06_filter-color.jpg index db46561..8f3cc80 100644 Binary files a/Images/06_filter-color.jpg and b/Images/06_filter-color.jpg differ diff --git a/Images/07_filter-rarity.jpg b/Images/07_filter-rarity.jpg index bf5b95c..46eaf84 100644 Binary files a/Images/07_filter-rarity.jpg and b/Images/07_filter-rarity.jpg differ diff --git a/Images/08_notes.jpg b/Images/08_notes.jpg index d668679..16b1166 100644 Binary files a/Images/08_notes.jpg and b/Images/08_notes.jpg differ diff --git a/Images/09_favorites-menu.jpg b/Images/09_favorites-menu.jpg index 45df7bf..a9ef4c4 100644 Binary files a/Images/09_favorites-menu.jpg and b/Images/09_favorites-menu.jpg differ diff --git a/Images/10_options-menu.jpg b/Images/10_options-menu.jpg index 23b5f8f..7625ece 100644 Binary files a/Images/10_options-menu.jpg and b/Images/10_options-menu.jpg differ diff --git a/Images/11_options.jpg b/Images/11_options.jpg index 5e7feeb..c58c479 100644 Binary files a/Images/11_options.jpg and b/Images/11_options.jpg differ diff --git a/SlashCommand.lua b/SlashCommand.lua index f972938..05d0a78 100644 --- a/SlashCommand.lua +++ b/SlashCommand.lua @@ -18,7 +18,7 @@ function SlashCmdList.MOUNTJOURNALENHANCED(input) elseif loweredInput == "debug off" then ADDON.settings.ui.debugMode = false print("MountJournalEnhanced: debug mode deactivated.") - elseif ADDON.TakeScreenshots and loweredInput == "sreenshots" then + elseif ADDON.TakeScreenshots and loweredInput == "screenshot" then ADDON:TakeScreenshots() elseif loweredInput == "reset size" then ADDON.UI:RestoreWindowSize()