overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
Dayve
2016-08-30 19:20:57 +10:00
parent 1027a196b7 c672dc77e7
commit 0ce2103288
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/ItemDBControl.lua
View File

@@ -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)

5
Modules/Main.lua
View File

@@ -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

4
manifest.xml
View File

@@ -16,7 +16,7 @@
<File sha1="89c7ffba4373b302822adc571e7fb2ed44427227" name="Classes/EditControl.lua" part="program"/>
<File sha1="c8774a6e9a39fe8f2d434889abe2533aee78fc47" name="Classes/Grid.lua" part="program"/>
<File sha1="be10e8399cb4851c2a45495698d701824f8a981d" name="Classes/ImportTab.lua" part="program"/>
<File sha1="2e56098d8d5d717db52a74f621074468fe6a9a97" name="Classes/ItemDBControl.lua" part="program"/>
<File sha1="a704592153b0c34f0c9b9f29470245ea9a06ffc2" name="Classes/ItemDBControl.lua" part="program"/>
<File sha1="ec0343ef35c65b0d17d39ec2271ba3dc5863b79c" name="Classes/ItemListControl.lua" part="program"/>
<File sha1="3f0db9229007f0a6552d64632db20621077ecc7d" name="Classes/ItemSlotControl.lua" part="program"/>
<File sha1="495561c42ed0f874bf1663cb9ad2b826cd923c48" name="Classes/ItemsTab.lua" part="program"/>
@@ -40,7 +40,7 @@
<File sha1="d594ac3a7c8fd823664891db1874b29666bf1915" name="Modules/Common.lua" part="program"/>
<File sha1="cb25bd581587ba5b35f77ca7b245334be1e5186a" name="Modules/Data.lua" part="program"/>
<File sha1="08fe9f68d83d35f3d4b3ce88d294ca673bc6b7e2" name="Modules/ItemTools.lua" part="program"/>
<File sha1="14eba8c1cc66cd5c5e8257382df695a14c58d969" name="Modules/Main.lua" part="program"/>
<File sha1="3366e2e4f95db6254bcfb413d5a58b8d307dae17" name="Modules/Main.lua" part="program"/>
<File sha1="e600cee89ec17a491d185897e86826e44d64d2b4" name="Modules/ModParser.lua" part="program"/>
<File sha1="bc49ce1b5e15da40476a9c99c4c690b323c0e7ad" name="Modules/ModTools.lua" part="program"/>
<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>