Skip to content

Commit

Permalink
Changed moving function for bags, now shift+left click for moving. De…
Browse files Browse the repository at this point in the history
…leted "checkable" in minimap dropdown menu. Deleted "Set Focus" in unitframe dropdown menu. Same cleanup.
  • Loading branch information
Shestak committed Nov 19, 2010
1 parent c3eac7d commit fb29d17
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 43 deletions.
3 changes: 3 additions & 0 deletions ShestakUI/modules/commands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ SlashCmdList["HEAL"] = function()
ReloadUI()
end
SLASH_HEAL1 = "/heal"
SLASH_HEAL2 = "/руфд"

----------------------------------------------------------------------------------------
-- Switch to dps layout
Expand All @@ -115,6 +116,7 @@ SlashCmdList["DPS"] = function()
ReloadUI()
end
SLASH_DPS1 = "/dps"
SLASH_DPS2 = "/взы"

----------------------------------------------------------------------------------------
-- Command to show frame you currently have mouseovered
Expand Down Expand Up @@ -155,6 +157,7 @@ SlashCmdList["FRAME"] = function(arg)
end
end
SLASH_FRAME1 = "/frame"
SLASH_FRAME2 = "/акфьу"

----------------------------------------------------------------------------------------
-- Addons group
Expand Down
10 changes: 10 additions & 0 deletions ShestakUI/modules/functions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1232,4 +1232,14 @@ do

self.AuraWatch = auras
end

for k, v in pairs(UnitPopupMenus) do
for x, y in pairs(UnitPopupMenus[k]) do
if y == "SET_FOCUS" then
table.remove(UnitPopupMenus[k], x)
elseif y == "CLEAR_FOCUS" then
table.remove(UnitPopupMenus[k], x)
end
end
end
end
18 changes: 0 additions & 18 deletions ShestakUI/modules/temp.lua
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
----------------------------------------------------------------------------------------
-- Temporary stuff
----------------------------------------------------------------------------------------
--[[hooksecurefunc("WatchFrame_Update", function()
local nextline = 1
WatchFrameTitle:SetFont(SettingsCF["media"].pixel_font, SettingsCF["media"].pixel_font_size, SettingsCF["media"].pixel_font_style)
WatchFrameTitle:SetJustifyH("RIGHT")
WatchFrameTitle:SetShadowColor(0,0,0,0)
for i = nextline, 50 do
line = _G["WatchFrameLine"..i]
if line then
line.text:SetFont(SettingsCF["media"].pixel_font, SettingsCF["media"].pixel_font_size, SettingsCF["media"].pixel_font_style)
line.dash:SetFont(SettingsCF["media"].pixel_font, SettingsCF["media"].pixel_font_size, SettingsCF["media"].pixel_font_style)
line.text:SetShadowColor(0,0,0,0)
line.dash:SetShadowColor(0,0,0,0)
else
nextline = ik
break
end
end
end)]]
11 changes: 7 additions & 4 deletions ShestakUI/scripts/bags.lua
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,13 @@ function Stuffing:CreateBagFrame(w)
f:EnableMouse(1)
f:SetMovable(1)
f:SetToplevel(1)
f:SetFrameStrata("HIGH")
f:SetFrameStrata("MEDIUM")
f:SetFrameLevel(5)
f:SetScript("OnMouseDown", f.StartMoving)
f:SetScript("OnMouseDown", function(self, button)
if IsShiftKeyDown() and button == "LeftButton" then
self:StartMoving()
end
end)
f:SetScript("OnMouseUp", f.StopMovingOrSizing)

if w == "Bank" then
Expand Down Expand Up @@ -393,7 +397,6 @@ function Stuffing:InitBags()
local f = self:CreateBagFrame("Bags")
f:SetScript("OnShow", Stuffing_OnShow)
f:SetScript("OnHide", Stuffing_OnHide)
f:RegisterForDrag("LeftButton")

-- Search editbox (tekKonfigAboutPanel.lua)
local editbox = CreateFrame("EditBox", nil, f)
Expand Down Expand Up @@ -494,7 +497,7 @@ function Stuffing:Layout(lb)
f.detail:SetFont(BAGSFONT, BAGSFONTSIZE, BAGSFONTSTYLE)

f.detail:ClearAllPoints()
f.detail:SetPoint("TOPLEFT", f, SettingsDB.Scale(12), SettingsDB.Scale(-10))
f.detail:SetPoint("TOPLEFT", f, SettingsDB.Scale(12), SettingsDB.Scale(-8))
f.detail:SetPoint("RIGHT", SettingsDB.Scale(-140), 0)
end

Expand Down
40 changes: 20 additions & 20 deletions ShestakUI/scripts/minimap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -127,49 +127,49 @@ end)
local menuFrame = CreateFrame("Frame", "MinimapRightClickMenu", UIParent, "UIDropDownMenuTemplate")
local micromenu = {
{text = CHARACTER_BUTTON,
func = function() ToggleCharacter("PaperDollFrame") end},
func = function() ToggleCharacter("PaperDollFrame") self.notCheckable = 1 end, notCheckable = 1},
{text = SPELLBOOK_ABILITIES_BUTTON,
func = function() ToggleFrame(SpellBookFrame) end},
func = function() ToggleFrame(SpellBookFrame) end, notCheckable = 1},
{text = TALENTS_BUTTON,
func = function() if not PlayerTalentFrame then LoadAddOn("Blizzard_TalentUI") end PlayerTalentFrame_Toggle() end},
func = function() if not PlayerTalentFrame then LoadAddOn("Blizzard_TalentUI") end PlayerTalentFrame_Toggle() end, notCheckable = 1},
{text = ACHIEVEMENT_BUTTON,
func = function() ToggleAchievementFrame() end},
func = function() ToggleAchievementFrame() end, notCheckable = 1},
{text = QUESTLOG_BUTTON,
func = function() ToggleFrame(QuestLogFrame) end},
func = function() ToggleFrame(QuestLogFrame) end, notCheckable = 1},
{text = SOCIAL_BUTTON,
func = function() ToggleFriendsFrame(1) end},
func = function() ToggleFriendsFrame(1) end, notCheckable = 1},
{text = PLAYER_V_PLAYER,
func = function() ToggleFrame(PVPFrame) end},
func = function() ToggleFrame(PVPFrame) end, notCheckable = 1},
{text = ACHIEVEMENTS_GUILD_TAB,
func = function() if IsInGuild() then if not GuildFrame then LoadAddOn("Blizzard_GuildUI") end GuildFrame_Toggle() end end},
func = function() if IsInGuild() then if not GuildFrame then LoadAddOn("Blizzard_GuildUI") end GuildFrame_Toggle() end end, notCheckable = 1},
{text = LFG_TITLE,
func = function() ToggleFrame(LFDParentFrame) end},
func = function() ToggleFrame(LFDParentFrame) end, notCheckable = 1},
{text = LOOKING_FOR_RAID,
func = function() ToggleFrame(LFRParentFrame) end},
func = function() ToggleFrame(LFRParentFrame) end, notCheckable = 1},
{text = HELP_BUTTON,
func = function() ToggleHelpFrame() end},
func = function() ToggleHelpFrame() end, notCheckable = 1},
{text = L_MINIMAP_CALENDAR,
func = function()
if not CalendarFrame then LoadAddOn("Blizzard_Calendar") end Calendar_Toggle() end},
if not CalendarFrame then LoadAddOn("Blizzard_Calendar") end Calendar_Toggle() end, notCheckable = 1},
}

local addonmenu = {
{text = "AtlasLoot",
func = function() if IsAddOnLoaded("AtlasLoot") then AtlasLootDefaultFrame:Show() end end},
func = function() if IsAddOnLoaded("AtlasLoot") then AtlasLootDefaultFrame:Show() end end, notCheckable = 1},
{text = "DBM",
func = function() if IsAddOnLoaded("DBM-Core") then DBM:LoadGUI() end end},
func = function() if IsAddOnLoaded("DBM-Core") then DBM:LoadGUI() end end, notCheckable = 1},
{text = "DXE",
func = function() if IsAddOnLoaded("DXE") then DXE:ToggleConfig() end end},
func = function() if IsAddOnLoaded("DXE") then DXE:ToggleConfig() end end, notCheckable = 1},
{text = "Skada",
func = function() if IsAddOnLoaded("Skada") then Skada:ToggleWindow() end end},
func = function() if IsAddOnLoaded("Skada") then Skada:ToggleWindow() end end, notCheckable = 1},
{text = "WIM",
func = function() if IsAddOnLoaded("WIM") then WIM.ShowAllWindows() end end},
func = function() if IsAddOnLoaded("WIM") then WIM.ShowAllWindows() end end, notCheckable = 1},
{text = "Omen",
func = function() if IsAddOnLoaded("Omen") then Omen:Toggle() end end},
func = function() if IsAddOnLoaded("Omen") then Omen:Toggle() end end, notCheckable = 1},
{text = "Recount",
func = function() if IsAddOnLoaded("Recount") then Recount.MainWindow:Show() end end},
func = function() if IsAddOnLoaded("Recount") then Recount.MainWindow:Show() end end, notCheckable = 1},
{text = "TinyDPS",
func = function() if IsAddOnLoaded("TinyDPS") then tdpsFrame:Show() end end},
func = function() if IsAddOnLoaded("TinyDPS") then tdpsFrame:Show() end end, notCheckable = 1},
}

Minimap:SetScript("OnMouseUp", function(self, button)
Expand Down
1 change: 0 additions & 1 deletion ShestakUI/scripts/skin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ SkinBlizzUI:SetScript("OnEvent", function(self, event, addon)
"ColorPickerFrame",
"ConsolidatedBuffsTooltip",
"LFDRoleCheckPopup",
--"VoiceChatTalkers",
"ChannelPulloutBackground",
"FriendsTooltip",
"LFDDungeonReadyDialog",
Expand Down

0 comments on commit fb29d17

Please sign in to comment.