WoWInterface SVN Xcalc

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 14 to Rev 15
    ↔ Reverse comparison
  •

Rev 14 → Rev 15

trunk/xcalcgui.lua
5,6 → 5,33
in generating a base form and set of files to update from.
]]
 
 
--Display Main calculator Window
function xcalc_windowdisplay()
if (xcalc_window == nil) then
xcalc_windowframe()
elseif (xcalc_window:IsVisible() and xcalc_optionwindow:IsVisible()) then
xcalc_optionwindow:Hide()
xcalc_window:Hide()
elseif (xcalc_window:IsVisible()) then
xcalc_window:Hide()
else
xcalc_window:Show()
xcalc_clear()
end
end
 
--Display options window
function xcalc_optiondisplay()
if (xcalc_optionwindow == nil) then
xcalc_optionframe()
elseif (xcalc_optionwindow:IsVisible()) then
xcalc_optionwindow:Hide()
else
xcalc_optionwindow:Show()
end
end
 
function xcalc_windowframe()
--Main Window Frame (container) and title bar
local frame = CreateFrame("Frame","xcalc_window",UIParent)
366,4 → 393,50
54 - (78 * cos(Xcalc_Settings.Minimappos)),
(78 * sin(Xcalc_Settings.Minimappos)) - 55)
 
end
 
--Tooltip display
function xcalc_tooltip(mouseover)
if ( mouseover == "minimap" ) then
GameTooltip:SetOwner(xcalc_minimap_button , "ANCHOR_BOTTOMLEFT")
GameTooltip:SetText("Show/Hide xcalc")
else
GameTooltip : Hide ()
end
end
 
--Function for handeling Binding checkbox
function xcalc_options_binding()
if (xcalc_options_bindcheckbox:GetChecked() == 1) then
Xcalc_Settings.Binding = 1
else
xcalc_unbind()
Xcalc_Settings.Binding = 0
end
end
 
-- Function for Handeling Minimap Display checkbox
function xcalc_options_minimapdisplay()
if (xcalc_options_minimapcheckbox:GetChecked() == 1) then
Xcalc_Settings.Minimapdisplay = 1
if (xcalc_minimap_button == nil) then
xcalc_minimap_init()
else
xcalc_minimap_button:Show()
end
else
Xcalc_Settings.Minimapdisplay = 0
xcalc_minimap_button:Hide()
end
end
 
-- Function for managing options slider
function xcalc_options_minimapslidercontrol()
if (Xcalc_Settings.Minimapdisplay == 1) then
Xcalc_Settings.Minimappos = xcalc_options_minimapslider:GetValue()
xcalc_minimapbutton_updateposition()
else
xcalc_options_minimapslider:SetValue(Xcalc_Settings.Minimappos)
return
end
end
\ No newline at end of file
trunk/xcalc.lua
89,65 → 89,6
ChatFrame1:AddMessage("Xcalc Result: " .. expression .. " = " .. result, 1.0, 1.0, 0.5)
end
 
--Display Main calculator Window
function xcalc_windowdisplay()
if (xcalc_window == nil) then
xcalc_windowframe()
elseif (xcalc_window:IsVisible()) then
xcalc_window:Hide()
else
xcalc_window:Show()
xcalc_clear()
end
end
 
--Display options window
function xcalc_optiondisplay()
if (xcalc_optionwindow == nil) then
xcalc_optionframe()
elseif (xcalc_optionwindow:IsVisible()) then
xcalc_optionwindow:Hide()
else
xcalc_optionwindow:Show()
end
end
 
--Function for handeling Binding checkbox
function xcalc_options_binding()
if (xcalc_options_bindcheckbox:GetChecked() == 1) then
Xcalc_Settings.Binding = 1
else
xcalc_unbind()
Xcalc_Settings.Binding = 0
end
end
 
-- Function for Handeling Minimap Display checkbox
function xcalc_options_minimapdisplay()
if (xcalc_options_minimapcheckbox:GetChecked() == 1) then
Xcalc_Settings.Minimapdisplay = 1
if (xcalc_minimap_button == nil) then
xcalc_minimap_init()
else
xcalc_minimap_button:Show()
end
else
Xcalc_Settings.Minimapdisplay = 0
xcalc_minimap_button:Hide()
end
end
 
-- Function for managing options slider
function xcalc_options_minimapslidercontrol()
if (Xcalc_Settings.Minimapdisplay == 1) then
Xcalc_Settings.Minimappos = xcalc_options_minimapslider:GetValue()
xcalc_minimapbutton_updateposition()
else
xcalc_options_minimapslider:SetValue(Xcalc_Settings.Minimappos)
return
end
end
 
--Processes for binding and unbinding numberpad keys to Xcalc
function xcalc_rebind()
if (Xcalc_Settings.Binding == 1) then
186,7 → 127,7
end
 
--Bound Key management
function xcalc_onkeydown()
--[[function xcalc_onkeydown()
key = arg1
--message(key)
 
214,6 → 155,7
xcalc_numkey("9")
end
end
]]
 
--Button Clear
function xcalc_clear()
404,15 → 346,6
end
end
 
--Tooltip display
function xcalc_tooltip(mouseover)
if ( mouseover == "minimap" ) then
GameTooltip:SetOwner(xcalc_minimap_button , "ANCHOR_BOTTOMLEFT")
GameTooltip:SetText("Show/Hide xcalc")
else
GameTooltip : Hide ()
end
end
 
--[[-----------------------------------------------------------------------------------
Where the Calculations occur