From c672dc77e76b437f8ba7d452275ada565b6baa7e Mon Sep 17 00:00:00 2001 From: Openarl Date: Tue, 30 Aug 2016 19:16:58 +1000 Subject: [PATCH] More minor fixes --- Classes/ItemDBControl.lua | 4 +++- Modules/Main.lua | 5 ++++- manifest.xml | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Classes/ItemDBControl.lua b/Classes/ItemDBControl.lua index d5cccb4c..9d9dcb5d 100644 --- a/Classes/ItemDBControl.lua +++ b/Classes/ItemDBControl.lua @@ -60,7 +60,9 @@ local ItemDBClass = common.NewClass("ItemDB", "Control", "ControlHost", function self.controls.league.shown = function() return #self.leagueList > 2 end - self.controls.search = common.New("EditControl", {"BOTTOMLEFT",self,"TOPLEFT"}, 0, -2, 258, 18, "", "Search", "[%C]") + self.controls.search = common.New("EditControl", {"BOTTOMLEFT",self,"TOPLEFT"}, 0, -2, 258, 18, "", "Search", "[%C]", 100, function() + self:BuildOrderList() + end) self.controls.searchMode = common.New("DropDownControl", {"LEFT",self.controls.search,"RIGHT"}, 2, 0, 100, 18, { "Anywhere", "Names", "Modifiers" }, function() self:BuildOrderList() end) diff --git a/Modules/Main.lua b/Modules/Main.lua index aca45687..9dc1cb1a 100644 --- a/Modules/Main.lua +++ b/Modules/Main.lua @@ -106,12 +106,15 @@ function main:Init() self.controls.applyUpdate.shown = function() return launch.updateAvailable and launch.updateAvailable ~= "none" end - self.controls.checkUpdate = common.New("ButtonControl", {"BOTTOMLEFT",self.anchorUpdate,"BOTTOMLEFT"}, 0, 0, 110, 18, "Check for Update", function() + self.controls.checkUpdate = common.New("ButtonControl", {"BOTTOMLEFT",self.anchorUpdate,"BOTTOMLEFT"}, 0, 0, 110, 18, "", function() launch:CheckForUpdate() end) self.controls.checkUpdate.shown = function() return not launch.devMode and (not launch.updateAvailable or launch.updateAvailable == "none") end + self.controls.checkUpdate.label = function() + return launch.subScriptType == "UPDATE" and "Checking..." or "Check for Update" + end self.controls.checkUpdate.enabled = function() return not IsSubScriptRunning() end diff --git a/manifest.xml b/manifest.xml index f04e4245..c4796862 100644 --- a/manifest.xml +++ b/manifest.xml @@ -16,7 +16,7 @@ - + @@ -40,7 +40,7 @@ - +