refactoring

This commit is contained in:
Manuel Simon Hirsig
2016-09-30 22:01:39 +02:00
parent f03acf43d6
commit 0fb920834c
3 changed files with 43 additions and 43 deletions
+24 -24
View File
@@ -6,7 +6,7 @@ local FILTER_SPACING = 28.5
function public.create()
setfenv(1, getfenv(2))
private.frame = CreateFrame('Frame', nil, AuxFrame)
public.frame = CreateFrame('Frame', nil, AuxFrame)
frame:SetAllPoints()
frame:SetScript('OnUpdate', on_update)
frame:Hide()
@@ -327,19 +327,19 @@ function public.create()
btn1:SetPoint('TOPLEFT', status_bar_frame, 'TOPRIGHT', 5, 0)
btn1:SetText('Search')
btn1:SetScript('OnClick', function()
export_filter_string()
aux_search_tab_filter.export_filter_string()
execute()
end)
local btn2 = gui.button(frame.filter)
btn2:SetPoint('LEFT', btn1, 'RIGHT', 5, 0)
btn2:SetText('Export')
btn2:SetScript('OnClick', export_filter_string)
btn2:SetScript('OnClick', aux_search_tab_filter.export_filter_string)
local btn3 = gui.button(frame.filter)
btn3:SetPoint('LEFT', btn2, 'RIGHT', 5, 0)
btn3:SetText('Import')
btn3:SetScript('OnClick', import_filter_string)
btn3:SetScript('OnClick', aux_search_tab_filter.import_filter_string)
end
do
local editbox = gui.editbox(frame.filter)
@@ -347,12 +347,12 @@ function public.create()
editbox:SetPoint('TOPLEFT', 14, -FILTER_SPACING)
editbox:SetWidth(260)
editbox.char = function()
if blizzard_query.exact then
if aux_search_tab_filter.blizzard_query.exact then
this:complete_item()
end
end
editbox:SetScript('OnTabPressed', function()
if blizzard_query.exact then
if aux_search_tab_filter.blizzard_query.exact then
return
end
if IsShiftKeyDown() then
@@ -361,7 +361,7 @@ function public.create()
min_level_input:SetFocus()
end
end)
editbox.change = update_form
editbox.change = aux_search_tab_filter.update_form
editbox.enter = papply(editbox.ClearFocus, editbox)
local label = gui.label(editbox, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
@@ -371,7 +371,7 @@ function public.create()
do
local checkbox = gui.checkbox(frame.filter)
checkbox:SetPoint('TOPLEFT', name_input, 'TOPRIGHT', 16, 0)
checkbox:SetScript('OnClick', update_form)
checkbox:SetScript('OnClick', aux_search_tab_filter.update_form)
local label = gui.label(checkbox, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', checkbox, 'TOPLEFT', -2, 1)
label:SetText('Exact')
@@ -391,11 +391,11 @@ function public.create()
end)
editbox.enter = papply(editbox.ClearFocus, editbox)
editbox.change = function()
local valid_level = valid_level(this:GetText())
local valid_level = aux_search_tab_filter.valid_level(this:GetText())
if tostring(valid_level) ~= this:GetText() then
this:SetText(valid_level or '')
end
update_form()
aux_search_tab_filter.update_form()
end
local label = gui.label(editbox, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', editbox, 'TOPLEFT', -2, 1)
@@ -416,11 +416,11 @@ function public.create()
end)
editbox.enter = papply(editbox.ClearFocus, editbox)
editbox.change = function()
local valid_level = valid_level(this:GetText())
local valid_level = aux_search_tab_filter.valid_level(this:GetText())
if tostring(valid_level) ~= this:GetText() then
this:SetText(valid_level or '')
end
update_form()
aux_search_tab_filter.update_form()
end
local label = gui.label(editbox, gui.font_size.medium)
label:SetPoint('RIGHT', editbox, 'LEFT', -3, 0)
@@ -430,7 +430,7 @@ function public.create()
do
local checkbox = gui.checkbox(frame.filter)
checkbox:SetPoint('TOPLEFT', max_level_input, 'TOPRIGHT', 16, 0)
checkbox:SetScript('OnClick', update_form)
checkbox:SetScript('OnClick', aux_search_tab_filter.update_form)
local label = gui.label(checkbox, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', checkbox, 'TOPLEFT', -2, 1)
label:SetText('Usable')
@@ -444,9 +444,9 @@ function public.create()
local label = gui.label(dropdown, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', dropdown, 'TOPLEFT', -2, -3)
label:SetText('Item Class')
UIDropDownMenu_Initialize(dropdown, initialize_class_dropdown)
UIDropDownMenu_Initialize(dropdown, aux_search_tab_filter.initialize_class_dropdown)
dropdown:SetScript('OnShow', function()
UIDropDownMenu_Initialize(this, initialize_class_dropdown)
UIDropDownMenu_Initialize(this, aux_search_tab_filter.initialize_class_dropdown)
end)
end
do
@@ -457,9 +457,9 @@ function public.create()
local label = gui.label(dropdown, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', dropdown, 'TOPLEFT', -2, -3)
label:SetText('Item Subclass')
UIDropDownMenu_Initialize(dropdown, initialize_subclass_dropdown)
UIDropDownMenu_Initialize(dropdown, aux_search_tab_filter.initialize_subclass_dropdown)
dropdown:SetScript('OnShow', function()
UIDropDownMenu_Initialize(this, initialize_subclass_dropdown)
UIDropDownMenu_Initialize(this, aux_search_tab_filter.initialize_subclass_dropdown)
end)
end
do
@@ -470,9 +470,9 @@ function public.create()
local label = gui.label(dropdown, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', dropdown, 'TOPLEFT', -2, -3)
label:SetText('Item Slot')
UIDropDownMenu_Initialize(dropdown, initialize_slot_dropdown)
UIDropDownMenu_Initialize(dropdown, aux_search_tab_filter.initialize_slot_dropdown)
dropdown:SetScript('OnShow', function()
UIDropDownMenu_Initialize(this, initialize_slot_dropdown)
UIDropDownMenu_Initialize(this, aux_search_tab_filter.initialize_slot_dropdown)
end)
end
do
@@ -483,9 +483,9 @@ function public.create()
local label = gui.label(dropdown, gui.font_size.small)
label:SetPoint('BOTTOMLEFT', dropdown, 'TOPLEFT', -2, -3)
label:SetText('Min Quality')
UIDropDownMenu_Initialize(dropdown, initialize_quality_dropdown)
UIDropDownMenu_Initialize(dropdown, aux_search_tab_filter.initialize_quality_dropdown)
dropdown:SetScript('OnShow', function()
UIDropDownMenu_Initialize(this, initialize_quality_dropdown)
UIDropDownMenu_Initialize(this, aux_search_tab_filter.initialize_quality_dropdown)
end)
end
gui.vertical_line(frame.filter, 332)
@@ -493,9 +493,9 @@ function public.create()
local dropdown = gui.dropdown(frame.filter)
dropdown:SetPoint('TOPRIGHT', -174.5, -10)
dropdown:SetWidth(150)
UIDropDownMenu_Initialize(dropdown, initialize_filter_dropdown)
UIDropDownMenu_Initialize(dropdown, aux_search_tab_filter.initialize_filter_dropdown)
dropdown:SetScript('OnShow', function()
UIDropDownMenu_Initialize(this, initialize_filter_dropdown)
UIDropDownMenu_Initialize(this, aux_search_tab_filter.initialize_filter_dropdown)
end)
_G[dropdown:GetName() .. 'Text']:Hide()
local label = gui.label(dropdown, gui.font_size.medium)
@@ -552,7 +552,7 @@ function public.create()
scroll_frame:SetScript('OnMouseWheel', function()
local child = this:GetScrollChild()
child:SetFont('p', [[Fonts\ARIALN.TTF]], bounded(11, 23, select(2, child:GetFont()) + arg1*2))
update_filter_display()
aux_search_tab_filter.update_filter_display()
end)
scroll_frame:RegisterForDrag('LeftButton')
scroll_frame:SetScript('OnDragStart', function()