diff --git a/TradeSkillMaster/TradeSkillMaster.toc b/TradeSkillMaster/TradeSkillMaster.toc index 579ec83..dd972fc 100644 --- a/TradeSkillMaster/TradeSkillMaster.toc +++ b/TradeSkillMaster/TradeSkillMaster.toc @@ -2,7 +2,7 @@ ## Title: |cff00fe00TradeSkillMaster: Revived|r ## Notes: Core addon for the TradeSkillMaster suite, revived for Wrath of the Lich King. Does nothing without modules installed. ## Author: Sapu94, Bart39, Gnomezilla [Warmane-Icecrown(A)], BlueAo [Warmane], andrew6180, Yoshiyuka, DimaSheiko, and other contributors... -## Version: 2.3.20 +## Version: 2.3.21 ## SavedVariables: TradeSkillMasterAppDB, AscensionTSMDB ## OptionalDeps: AccurateTime, Ace3, LibDataBroker-1.1, LibDBIcon-1.0, LibExtraTip, TipHelper, LibParse, LibCompress, LibGraph-2.0, SharedMedia, TheUndermineJournal, TheUndermineJournalGE ## X-Embeds: AccurateTime, Ace3, LibDataBroker-1.1, LibDBIcon-1.0, LibExtraTip, TipHelper, LibParse, LibCompress, LibGraph-2.0 diff --git a/TradeSkillMaster_AuctionDB/TradeSkillMaster_AuctionDB.toc b/TradeSkillMaster_AuctionDB/TradeSkillMaster_AuctionDB.toc index 350b82d..8a9adb1 100644 --- a/TradeSkillMaster_AuctionDB/TradeSkillMaster_AuctionDB.toc +++ b/TradeSkillMaster_AuctionDB/TradeSkillMaster_AuctionDB.toc @@ -2,10 +2,10 @@ ## Title: |cff00ff00TradeSkillMaster_AuctionDB|r ## Notes: Stores auction house data and calculates market prices. ## Author: Sapu94, Bart39 -## Version: 2.3.20 +## Version: 2.3.21 ## SavedVariables: AscensionTSM_AuctionDB ## Dependency: TradeSkillMaster -## X-Curse-Packaged-Version: 2.3.20 +## X-Curse-Packaged-Version: 2.3.21 ## X-Curse-Project-Name: TradeSkillMaster_AuctionDB ## X-Curse-Project-ID: tradeskillmaster_auctiondb ## X-Curse-Repository-ID: wow/tradeskillmaster_auctiondb/mainline diff --git a/TradeSkillMaster_Auctioning/TradeSkillMaster_Auctioning.lua b/TradeSkillMaster_Auctioning/TradeSkillMaster_Auctioning.lua index 68e0c04..c333571 100644 --- a/TradeSkillMaster_Auctioning/TradeSkillMaster_Auctioning.lua +++ b/TradeSkillMaster_Auctioning/TradeSkillMaster_Auctioning.lua @@ -22,6 +22,7 @@ local savedDBDefaults = { global = { optionsTreeStatus = {}, scanCompleteSound = 1, + flashClientOnComplete = false, cancelWithBid = false, matchWhitelist = true, roundNormalPrice = false, @@ -184,4 +185,4 @@ function TSM:GetAuctionPlayer(player, player_full) else return player end -end \ No newline at end of file +end diff --git a/TradeSkillMaster_Auctioning/locale/enUS.lua b/TradeSkillMaster_Auctioning/locale/enUS.lua index a4418bc..da58556 100644 --- a/TradeSkillMaster_Auctioning/locale/enUS.lua +++ b/TradeSkillMaster_Auctioning/locale/enUS.lua @@ -100,6 +100,7 @@ L["Duration"] = true L["Edit Post Price"] = true L["Enable Reset Scan"] = true L["Enable Sounds"] = true +L["Flash Client Icon"] = true L["Error creating operation. Operation with name '%s' already exists."] = true L["General Operation Options"] = true L["General Options"] = true @@ -121,6 +122,7 @@ L["If checked, TSM will not print out a chat message when you have an invalid pr L["If checked, a cancel scan will cancel any auctions which can be reposted for a higher price."] = true L["If checked, a cancel scan will cancel any auctions which have been undercut and are still above your minimum price."] = true L["If checked, groups which the opperation applies to will be included in a reset scan."] = true +L["If checked, the game client icon will flash when a scan is complete."] = true L["If checked, the minimum, normal and maximum prices of the first operation for the item will be shown in tooltips."] = true L["If checked, whenever you post an item at its normal price, the buyout will be rounded up to the nearest gold."] = true L["If enabled, instead of not posting when a whitelisted player has an auction posted, Auctioning will match their price."] = true diff --git a/TradeSkillMaster_Auctioning/modules/Options.lua b/TradeSkillMaster_Auctioning/modules/Options.lua index 0ae3349..1eb71a5 100644 --- a/TradeSkillMaster_Auctioning/modules/Options.lua +++ b/TradeSkillMaster_Auctioning/modules/Options.lua @@ -107,6 +107,12 @@ function Options:DrawGeneralSettings(container) settingInfo = { TSM.db.global, "scanCompleteSound" }, tooltip = L["Play the selected sound when a post / cancel scan is complete and items are ready to be posted / canceled (the gray bar is all the way across).Select None to disable sounds"], }, + { + type = "CheckBox", + label = L["Flash Client Icon"], + settingInfo = { TSM.db.global, "flashClientOnComplete" }, + tooltip = L["If checked, the game client icon will flash when a scan is complete."], + }, { type = "Button", text = L["Test Selected Sound"], @@ -820,4 +826,4 @@ function Options:GetScanCompleteSound(index) elseif index == 9 then return "ReadyCheck" end -end \ No newline at end of file +end diff --git a/TradeSkillMaster_Auctioning/modules/manage.lua b/TradeSkillMaster_Auctioning/modules/manage.lua index 3a240e0..b8a930b 100644 --- a/TradeSkillMaster_Auctioning/modules/manage.lua +++ b/TradeSkillMaster_Auctioning/modules/manage.lua @@ -116,11 +116,14 @@ function Manage:ScanComplete(interrupted) TSMAPI:FireEvent("AUCTIONING:SCANDONE", {num=numToManage}) if numToManage == 0 then Util:Stop() - elseif TSM.db.global.scanCompleteSound ~= 1 then - PlaySound(TSM.Options:GetScanCompleteSound(TSM.db.global.scanCompleteSound), "Master") - end + elseif TSM.db.global.scanCompleteSound ~= 1 then + PlaySound(TSM.Options:GetScanCompleteSound(TSM.db.global.scanCompleteSound), "Master") + end + if TSM.db.global.flashClientOnComplete then + FlashClientIcon() end end +end -- these functions help display the status text which goes inside the statusbar local function IsStepStarted(step) diff --git a/bin/sshfs-mounts.sh b/bin/sshfs-mounts.sh new file mode 100755 index 0000000..5fd2c12 --- /dev/null +++ b/bin/sshfs-mounts.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -euo pipefail + +USER_NAME="${USER_NAME:-$USER}" +HOST="sarvern.no" +PORT="36" +REMOTE_BASE="/home/TradeSkillMaster" +TARGET_BASE="/home/TradeSkillMaster" # edit this if you want a different mount root + +mkdir -p "$TARGET_BASE/scripts" +mkdir -p "$TARGET_BASE/TradeSkillMaster" +mkdir -p "$TARGET_BASE/TradeSkillMaster_Accounting" +mkdir -p "$TARGET_BASE/TradeSkillMaster_AuctionDB" +mkdir -p "$TARGET_BASE/TradeSkillMaster_Auctioning" +mkdir -p "$TARGET_BASE/TradeSkillMaster_Crafting" +mkdir -p "$TARGET_BASE/TradeSkillMaster_Destroying" +mkdir -p "$TARGET_BASE/TradeSkillMaster_ItemTracker" +mkdir -p "$TARGET_BASE/TradeSkillMaster_Mailing" +mkdir -p "$TARGET_BASE/TradeSkillMaster_Shopping" +mkdir -p "$TARGET_BASE/TradeSkillMaster_Warehousing" + +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/scripts" "$TARGET_BASE/scripts" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster" "$TARGET_BASE/TradeSkillMaster" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_Accounting" "$TARGET_BASE/TradeSkillMaster_Accounting" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_AuctionDB" "$TARGET_BASE/TradeSkillMaster_AuctionDB" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_Auctioning" "$TARGET_BASE/TradeSkillMaster_Auctioning" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_Crafting" "$TARGET_BASE/TradeSkillMaster_Crafting" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_Destroying" "$TARGET_BASE/TradeSkillMaster_Destroying" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_ItemTracker" "$TARGET_BASE/TradeSkillMaster_ItemTracker" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_Mailing" "$TARGET_BASE/TradeSkillMaster_Mailing" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_Shopping" "$TARGET_BASE/TradeSkillMaster_Shopping" +sshfs -p "$PORT" "$USER_NAME@$HOST:$REMOTE_BASE/TradeSkillMaster_Warehousing" "$TARGET_BASE/TradeSkillMaster_Warehousing"