WoWInterface SVN MapNotesFansUpdate

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk
    from Rev 2 to Rev 3
    ↔ Reverse comparison
  •

Rev 2 → Rev 3

MapNotes/Readme.txt
1,5 → 1,5
******************************************
MapNotes (Fan's Update) README v5.11.30000
MapNotes (Fan's Update) README v5.14.30000
******************************************
 
Maintainer: Telic <telic@hotmail.co.uk>
520,6 → 520,43
**********
 
=======================================
Changes in v5.14.30000 from v5.13.30000
=======================================
 
- fix to stop new notes being turned on as Mininotes by accident
 
 
 
 
 
=======================================
Changes in v5.13.30000 from v5.12.30000
=======================================
 
- fix to slash command handler
"Sorry about that now." - Dougal looks sheepish
 
- update to TomTom and Cartographer pointer support
 
 
 
=======================================
Changes in v5.12.30000 from v5.11.30000
=======================================
 
- fix to some legacy slash commands which were not toc 30000 compliant
 
- datafix script for users who fell foul of the legacy slash command bug
 
/script MN_IntegrityCheck()
 
- option to set MapNotes as Cartographer Waypoint arrow from note right click menu (Beta functionality)
 
- option to set MapNotes as TomTom arrow from note right click menu (Beta functionality)
 
 
 
=======================================
Changes in v5.11.30000 from v5.10.30000
=======================================
 
533,8 → 570,6
 
 
 
 
 
=======================================
Changes in v5.10.30000 from v5.02.30000
=======================================
MapNotes/Utilities.lua
51,7 → 51,69
MapNotes = {};
MapNotes.dd = CreateFrame("Frame", "MapNotes_DropDown", nil, "UIDropDownMenuTemplate");
MapNotes.pluginKeys = {};
MapNotes.scaleFrames = {
[1] = MapNotesOptionsFrame,
[2] = MapNotesEditFrame,
[3] = MapNotesSendFrame,
};
 
local function MN_PointyPointyPointy() -- ;P
local text, ignore = MN_WAYPOINT, true;
 
MapNotes.pointy = nil;
MapNotes.pointyP = {};
 
local Plugin = MapNotes.pluginKeys[ MapNotes.dd.key ];
if ( ( not Plugin ) or ( Plugin.wmflag ) ) then
 
local note = MapNotes_Data_Notes[MapNotes.dd.key];
if ( note ) then
note = note[MapNotes.dd.id];
if ( note ) then
if ( PointyPointy ) then -- in development
MapNotes.pointy = PP.Set;
MapNotes.pointyP[1] = MapNotes.dd.key;
MapNotes.pointyP[2] = MapNotes.dd.id;
MapNotes.pointyP[3] = MapNotes.dd.x;
MapNotes.pointyP[4] = MapNotes.dd.y;
text = "PointyPointy";
ignore = nil;
 
elseif ( ( Cartographer_Waypoints ) and ( type(Cartographer_Waypoints.AddLHWaypoint) == "function" ) ) then
MapNotes.pointy = Cartographer_Waypoints.AddLHWaypoint;
local c, z = MapNotes_Keys[MapNotes.dd.key].c, MapNotes_Keys[MapNotes.dd.key].z;
if ( ( c ) and ( z ) ) then
MapNotes.pointyP[1] = Cartographer_Waypoints;
MapNotes.pointyP[2] = c;
MapNotes.pointyP[3] = z;
MapNotes.pointyP[4] = MapNotes.dd.x;
MapNotes.pointyP[5] = MapNotes.dd.y;
MapNotes.pointyP[6] = note.name;
text = "Cartographer: "..MN_WAYPOINT;
ignore = nil;
end
 
elseif ( TomTom ) then
MapNotes.pointy = TomTom.AddZWaypoint;
local c, z = MapNotes_Keys[MapNotes.dd.key].c, MapNotes_Keys[MapNotes.dd.key].z;
if ( ( c ) and ( z ) ) then
MapNotes.pointyP[1] = TomTom; -- pass 'self' as first parameter
MapNotes.pointyP[2] = c;
MapNotes.pointyP[3] = z;
MapNotes.pointyP[4] = MapNotes.dd.x*100;
MapNotes.pointyP[5] = MapNotes.dd.y*100;
MapNotes.pointyP[6] = note.name;
text = "TomTom: "..MN_WAYPOINT;
ignore = nil;
end
end
end
end
end
 
return text, _, _, ignore;
end
 
local function MN_Wasted()
if ( MapNotes_Undelete_Info.key ) then
return;
355,6 → 417,13
end
end,
},
{ -- PointyPointy
text = MN_WAYPOINT,
dynamicFunc = MN_PointyPointyPointy;
func = function()
MapNotes.pointy( unpack(MapNotes.pointyP) );
end,
},
{ -- Options
text = MAPNOTES_OPTIONS,
func = function()
414,6 → 483,13
end
end,
},
{ -- PointyPointy
text = MN_WAYPOINT,
dynamicFunc = MN_PointyPointyPointy;
func = function()
MapNotes.pointy( unpack(MapNotes.pointyP) );
end,
},
{ -- Special Actions
text = MAPNOTES_SPECIAL_ACTIONS,
hasArrow = true,
570,6 → 646,13
end
end,
},
{ -- PointyPointy
text = MN_WAYPOINT,
dynamicFunc = MN_PointyPointyPointy;
func = function()
MapNotes.pointy( unpack(MapNotes.pointyP) );
end,
},
{ -- Delete
text = MAPNOTES_DELETE_NOTE,
func = function()
945,11 → 1028,13
MapNotes_Keys[key] = {};
MapNotes_Keys[key].name = MAPNOTES_COSMIC;
MapNotes_Keys[key].longName = MAPNOTES_COSMIC;
MapNotes_Keys[key].c = -1;
 
local key = "WM WorldMap"; -- Manually set when GetMapInfo() returns nil
MapNotes_Keys[key] = {};
MapNotes_Keys[key].name = WORLD_MAP; -- Blizzard provided constant
MapNotes_Keys[key].longName = WORLD_MAP;
MapNotes_Keys[key].c = 0;
 
key = "WM AlteracValley";
MapNotes_Keys[key] = {};
1588,4 → 1673,22
MapNotes_WorldMapButton_OnUpdate();
end
 
function MN_IntegrityCheck()
local totNotes, totFixed = 0, 0;
 
for key, notes in pairs(MapNotes_Data_Notes) do
for note, details in ipairs(notes) do
totNotes = totNotes + 1;
if ( type(details.inf1) == "table" ) then
details.inf1 = "";
totFixed = totFixed + 1;
end
end
end
 
MapNotes_mntloc();
 
DEFAULT_CHAT_FRAME:AddMessage("MapNotes -> "..totFixed, 0.9, 0.1, 0.1);
end
 
 
MapNotes/localization.de.lua
176,4 → 176,6
 
MN_STYLE_AUTOMATIC = "Automatic";
 
MN_WAYPOINT = "Zielpunktpfeil";
 
end
MapNotes/MapNotesConstants.lua
4,7 → 4,7
See the README file for more information.
]]
 
MAPNOTES_VERSION = "5.11.30000";
MAPNOTES_VERSION = "5.14.30000";
MAPNOTES_EDITION = "Fan's Update";
 
MN_DEFAULT_SCALE = 0.75;
MapNotes/MapNotes.lua
23,6 → 23,7
MapNotes_Data_Lines = {};
MapNotes_MiniNote_Data = {};
MapNotes_Undelete_Info = {};
MapNotes_Globals = {};
 
MapNotes_MiniNote_IsInCity = false;
MapNotes_MiniNote_MapzoomInit = false;
143,17 → 144,17
setglobal("SLASH_MN_MININOTEOFF"..i, MAPNOTES_MININOTEOFF_COMMANDS[i]);
end
 
SlashCmdList["MN_TLOC"] = MapNotes_mntloc;
SlashCmdList["MN_TLOC"] = function(txt, editBox) MapNotes_mntloc(txt); end
for i = 1, table.getn(MAPNOTES_MNTLOC_COMMANDS) do
setglobal("SLASH_MN_TLOC"..i, MAPNOTES_MNTLOC_COMMANDS[i]);
end
 
SlashCmdList["MN_QUICKNOTE"] = MapNotes_CreateQuickNote;
SlashCmdList["MN_QUICKNOTE"] = function(txt, editBox) MapNotes_CreateQuickNote(txt); end
for i = 1, table.getn(MAPNOTES_QUICKNOTE_COMMANDS) do
setglobal("SLASH_MN_QUICKNOTE"..i, MAPNOTES_QUICKNOTE_COMMANDS[i]);
end
 
SlashCmdList["MN_QUICKTLOC"] = MapNotes_Quicktloc;
SlashCmdList["MN_QUICKTLOC"] = function(txt, editBox) MapNotes_Quicktloc(txt); end
for i = 1, table.getn(MAPNOTES_QUICKTLOC_COMMANDS) do
setglobal("SLASH_MN_QUICKTLOC"..i, MAPNOTES_QUICKTLOC_COMMANDS[i]);
end
243,12 → 244,6
MapNotes_Options.miniC = true;
end
 
MapNotes.scaleFrames = {
[1] = MapNotesOptionsFrame,
[2] = MapNotesEditFrame,
[3] = MapNotesSendFrame,
};
 
MapNotes_ResetHighlightsOnLoad();
 
if ( MapNotes_MiniNote_Data.icon ~= nil ) then
2509,6 → 2504,10
MN_Info2WideEditBox:SetText("");
MN_CreatorWideEditBox:SetText(MapNotes_TempData_Creator);
MapNotes_HideAll();
MapNotes_TempData_miniNote = nil;
if ( MapNotes_SetNextAsMiniNote == 1 ) or ( MapNotes_SetNextAsMiniNote == 2 ) then
MapNotes_TempData_miniNote = true;
end
MapNotesEditFrame:Show();
end
 
3310,6 → 3309,9
-- £££1
function MN_MinimapCoords_OnUpdate(self)
local x,y = GetPlayerMapPosition("player");
if ( recordingData ) then
 
end
if ( ( x ) and ( y ) ) then
x = x*100;
y = y*100;
MapNotes/localization.cn.lua
171,4 → 171,6
MN_AREANOTES = "%d 标记于 %d 地区";
MN_DUPS_IGNORED = "忽视副本";
 
MN_WAYPOINT = "路径箭头";
 
end
MapNotes/localization.en.lua
59,7 → 59,7
MAPNOTES_OWNNOTES = "Show notes created by your character";
MAPNOTES_OTHERNOTES = "Show notes received from other characters";
MAPNOTES_HIGHLIGHT_LASTCREATED = "Highlight last created note in |cFFFF0000red|r";
MAPNOTES_HIGHLIGHT_MININOTE = "Highlight note selected for MiniNote in |cFF6666FFblue|r";
MAPNOTES_HIGHLIGHT_MININOTE = "Highlight note selected for MiniNote";
MAPNOTES_ACCEPTINCOMING = "Accept incoming notes from other players";
MAPNOTES_INCOMING_CAP = "Decline notes if they would leave less than 5 notes free";
MAPNOTES_AUTOPARTYASMININOTE = "Automatically set party notes as MiniNote.";
208,4 → 208,7
MN_ALLZONES = "All Maps";
 
MN_DELETED_WITH_TEXT = "Deleted all "..MAPNOTES_NAME.." with text |cFFFFD100%s|r.";
 
MN_WAYPOINT = "WayPoint Arrow";
 
--end
MapNotes/MapNotes.toc
1,8 → 1,8
## Interface: 30000
## Title: MapNotes |c0000FF00(5.11.30000)|r
## Title: MapNotes |c0000FF00(5.14.30000)|r
## Author: Telic (originally ciphersimian)
## eMail: telic@hotmail.co.uk
## Version: 5.11.30000
## Version: 5.14.30000
## URL: See README for download sites
## Notes: Adds a note system to the WorldMap - Other AddOns can also now 'Plug In' and allow notes to be made on their frames eg AlphaMap
## Notes-deDE: Ermöglicht es Notizen auf der Karte zu platzieren.
12,7 → 12,7
## RequiredDeps:
## OptionalDeps: Thottbot, myAddOns, SilverTrack
## DefaultState: enabled
## SavedVariables: MapNotes_Data_Notes, MapNotes_Data_Lines, MapNotes_Data, MapNotes_Lines, MapNotes_Options, MapNotes_Undelete_Info
## SavedVariables: MapNotes_Data_Notes, MapNotes_Data_Lines, MapNotes_Data, MapNotes_Lines, MapNotes_Options, MapNotes_Undelete_Info, MapNotes_Globals
MapNotesTemplates.xml
MapNotesEditFrame.xml
MapNotesMiniNoteFrame.xml