Commit 99277350 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-27934patch8.1.0_PTR

parent a33e3bc9
......@@ -144,5 +144,5 @@ WowTokenUIDocumentation.lua
ZoneAbilityDocumentation.lua
CalendarDocumentation.lua
ClubDocumentation.lua
FriendsDocumentation.lua
FriendListDocumentation.lua
# End documentation files here
local Friends =
local FriendList =
{
Name = "Friends",
Name = "FriendList",
Type = "System",
Namespace = "C_Friends",
Namespace = "C_FriendList",
Functions =
{
{
Name = "AddFriend",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "notes", Type = "string", Nilable = true },
},
},
{
Name = "AddIgnore",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "added", Type = "bool", Nilable = false },
},
},
{
Name = "AddOrDelIgnore",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
},
},
{
Name = "AddOrRemoveFriend",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "notes", Type = "string", Nilable = false },
},
},
{
Name = "DelIgnore",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "removed", Type = "bool", Nilable = false },
},
},
{
Name = "DelIgnoreByIndex",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
},
{
Name = "GetFriendInfo",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "info", Type = "FriendInfo", Nilable = false },
},
},
{
Name = "GetFriendInfoByIndex",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "info", Type = "FriendInfo", Nilable = false },
},
},
{
Name = "GetIgnoreName",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "name", Type = "string", Nilable = true },
},
},
{
Name = "GetNumFriends",
Type = "Function",
Returns =
{
{ Name = "numFriends", Type = "number", Nilable = false },
},
},
{
Name = "GetNumIgnores",
Type = "Function",
Returns =
{
{ Name = "numIgnores", Type = "number", Nilable = false },
},
},
{
Name = "GetNumOnlineFriends",
Type = "Function",
Returns =
{
{ Name = "numOnline", Type = "number", Nilable = false },
},
},
{
Name = "GetNumWhoResults",
Type = "Function",
Returns =
{
{ Name = "numWhos", Type = "number", Nilable = false },
{ Name = "totalNumWhos", Type = "number", Nilable = false },
},
},
{
Name = "GetSelectedFriend",
Type = "Function",
Returns =
{
{ Name = "index", Type = "number", Nilable = true },
},
},
{
Name = "GetSelectedIgnore",
Type = "Function",
Returns =
{
{ Name = "index", Type = "number", Nilable = true },
},
},
{
Name = "GetWhoInfo",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "info", Type = "WhoInfo", Nilable = false },
},
},
{
Name = "IsFriend",
Type = "Function",
Arguments =
{
{ Name = "guid", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "isFriend", Type = "bool", Nilable = false },
},
},
{
Name = "IsIgnored",
Type = "Function",
Arguments =
{
{ Name = "token", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "isIgnored", Type = "bool", Nilable = false },
},
},
{
Name = "IsIgnoredByGuid",
Type = "Function",
Arguments =
{
{ Name = "guid", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "isIgnored", Type = "bool", Nilable = false },
},
},
{
Name = "RemoveFriend",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "removed", Type = "bool", Nilable = false },
},
},
{
Name = "RemoveFriendByIndex",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
},
{
Name = "SendWho",
Type = "Function",
Arguments =
{
{ Name = "filter", Type = "string", Nilable = false },
},
},
{
Name = "SetFriendNotes",
Type = "Function",
Arguments =
{
{ Name = "name", Type = "string", Nilable = false },
{ Name = "notes", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "found", Type = "bool", Nilable = false },
},
},
{
Name = "SetFriendNotesByIndex",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
{ Name = "notes", Type = "string", Nilable = false },
},
},
{
Name = "SetSelectedFriend",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
},
{
Name = "SetSelectedIgnore",
Type = "Function",
Arguments =
{
{ Name = "index", Type = "number", Nilable = false },
},
},
{
Name = "SetWhoToUi",
Type = "Function",
Arguments =
{
{ Name = "whoToUi", Type = "bool", Nilable = false },
},
},
{
Name = "ShowFriends",
Type = "Function",
},
{
Name = "SortWho",
Type = "Function",
Arguments =
{
{ Name = "sorting", Type = "string", Nilable = false },
},
},
},
Events =
......@@ -163,7 +479,39 @@ local Friends =
Tables =
{
{
Name = "FriendInfo",
Type = "Structure",
Fields =
{
{ Name = "connected", Type = "bool", Nilable = false },
{ Name = "name", Type = "string", Nilable = false },
{ Name = "className", Type = "string", Nilable = true },
{ Name = "area", Type = "string", Nilable = true },
{ Name = "notes", Type = "string", Nilable = true },
{ Name = "guid", Type = "string", Nilable = false },
{ Name = "level", Type = "number", Nilable = false },
{ Name = "dnd", Type = "bool", Nilable = false },
{ Name = "afk", Type = "bool", Nilable = false },
{ Name = "referAFriend", Type = "bool", Nilable = false },
},
},
{
Name = "WhoInfo",
Type = "Structure",
Fields =
{
{ Name = "fullName", Type = "string", Nilable = false },
{ Name = "fullGuildName", Type = "string", Nilable = false },
{ Name = "level", Type = "number", Nilable = false },
{ Name = "raceStr", Type = "string", Nilable = false },
{ Name = "classStr", Type = "string", Nilable = false },
{ Name = "area", Type = "string", Nilable = false },
{ Name = "filename", Type = "string", Nilable = true },
{ Name = "gender", Type = "number", Nilable = false },
},
},
},
};
APIDocumentation:AddDocumentationTable(Friends);
\ No newline at end of file
APIDocumentation:AddDocumentationTable(FriendList);
\ No newline at end of file
......@@ -805,7 +805,7 @@ function CommunitiesFrameMaximizeMinimizeButton_OnLoad(self)
communitiesFrame.StreamDropDownMenu:ClearAllPoints();
communitiesFrame.StreamDropDownMenu:SetPoint("TOPLEFT", 188, -28);
UIDropDownMenu_SetWidth(communitiesFrame.StreamDropDownMenu, 160);
ButtonFrameTemplate_ShowPortrait(communitiesFrame);
PortraitFrameTemplate_SetPortraitShown(communitiesFrame, true);
communitiesFrame.PortraitOverlay:Show();
communitiesFrame.VoiceChatHeadset:SetPoint("TOPRIGHT", -8, -26);
UpdateUIPanelPositions();
......@@ -829,7 +829,7 @@ function CommunitiesFrameMaximizeMinimizeButton_OnLoad(self)
communitiesFrame.StreamDropDownMenu:ClearAllPoints();
communitiesFrame.StreamDropDownMenu:SetPoint("LEFT", communitiesFrame.CommunitiesListDropDownMenu, "RIGHT", -25, 0);
UIDropDownMenu_SetWidth(communitiesFrame.StreamDropDownMenu, 115);
ButtonFrameTemplate_HidePortrait(communitiesFrame);
PortraitFrameTemplate_SetPortraitShown(communitiesFrame, false);
communitiesFrame.PortraitOverlay:Hide();
communitiesFrame.VoiceChatHeadset:SetPoint("TOPRIGHT", -10, -26);
UpdateUIPanelPositions();
......
......@@ -217,7 +217,7 @@
</Scripts>
</Frame>
<Frame name="CommunitiesFrame" toplevel="true" parent="UIParent" movable="true" enableMouse="true" hidden="true" inherits="ButtonFrameTemplate" mixin="CommunitiesFrameMixin">
<Frame name="CommunitiesFrame" toplevel="true" parent="UIParent" movable="true" enableMouse="true" hidden="true" inherits="ButtonFrameTemplateMinimizable" mixin="CommunitiesFrameMixin">
<Size x="814" y="426"/>
<Anchors>
<Anchor point="CENTER"/>
......@@ -272,15 +272,6 @@
<Anchors>
<Anchor point="RIGHT" relativeKey="$parent.CloseButton" relativePoint="LEFT" x="10" y="0"/>
</Anchors>
<Layers>
<Layer level="BACKGROUND">
<Texture atlas="UI-OuterBorderButtonPatch" useAtlasSize="true">
<Anchors>
<Anchor point="CENTER" relativePoint="LEFT" x="6" y="0"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Scripts>
<OnLoad function="CommunitiesFrameMaximizeMinimizeButton_OnLoad" inherit="append"/>
</Scripts>
......
......@@ -2,7 +2,7 @@
..\..\FrameXML\UI.xsd">
<Script file="CommunitiesTabs.lua"/>
<CheckButton name="CommunitiesFrameTabTemplate" virtual="true">
<CheckButton name="CommunitiesFrameTabTemplate" frameLevel="510" virtual="true">
<Size x="32" y="32"/>
<Layers>
<Layer level="BORDER">
......
......@@ -720,7 +720,7 @@
</Scripts>
</Button>
<Button name="EncounterTabTemplate" virtual="true">
<Button name="EncounterTabTemplate" frameLevel="510" virtual="true">
<Size x="63" y="57"/>
<NormalTexture inherits="UI-EJ-Tab-UnSelected"/>
<PushedTexture inherits="UI-EJ-Tab-Selected"/>
......@@ -2184,7 +2184,7 @@
<OnClick function="EncounterJournalInstanceButton_OnClick"/>
</Scripts>
</Button>
<Button name="$parentOverviewTab" inherits="EncounterTabTemplate" useParentLevel="true" parentKey="overviewTab" id="1">
<Button name="$parentOverviewTab" inherits="EncounterTabTemplate" parentKey="overviewTab" id="1">
<Anchors>
<Anchor point="TOPLEFT" relativePoint="TOPRIGHT" x="-12" y="-35"/>
</Anchors>
......@@ -2214,7 +2214,7 @@
</OnClick>
</Scripts>
</Button>
<Button name="$parentLootTab" inherits="EncounterTabTemplate" useParentLevel="true" parentKey="lootTab" id="2">
<Button name="$parentLootTab" inherits="EncounterTabTemplate" parentKey="lootTab" id="2">
<Anchors>
<Anchor point="TOP" relativeTo="$parentOverviewTab" relativePoint="BOTTOM" x="0" y="2"/>
</Anchors>
......@@ -2238,7 +2238,7 @@
</OnLoad>
</Scripts>
</Button>
<Button name="$parentBossTab" inherits="EncounterTabTemplate" useParentLevel="true" parentKey="bossTab" id="3">
<Button name="$parentBossTab" inherits="EncounterTabTemplate" parentKey="bossTab" id="3">
<Anchors>
<Anchor point="TOP" relativeTo="$parentLootTab" relativePoint="BOTTOM" x="0" y="2"/>
</Anchors>
......@@ -2268,7 +2268,7 @@
</OnClick>
</Scripts>
</Button>
<Button name="$parentModelTab" inherits="EncounterTabTemplate" useParentLevel="true" parentKey="modelTab" id="4">
<Button name="$parentModelTab" inherits="EncounterTabTemplate" parentKey="modelTab" id="4">
<Anchors>
<Anchor point="TOP" relativeTo="$parentBossTab" relativePoint="BOTTOM" x="0" y="2"/>
</Anchors>
......
......@@ -371,7 +371,7 @@ function CommunitiesGuildRecruitmentDropDown_Initialize(self)
info.text = ADD_FRIEND;
info.arg1 = "addfriend";
if ( GetFriendInfo(name) ) then
if ( C_FriendList.GetFriendInfo(name) ) then
info.disabled = 1;
end
UIDropDownMenu_AddButton(info, UIDROPDOWN_MENU_LEVEL);
......@@ -392,7 +392,7 @@ function CommunitiesGuildRecruitmentDropDown_OnClick(self, button, action)
elseif ( action == "whisper" ) then
ChatFrame_SendTell(name);
elseif ( action == "addfriend" ) then
AddOrRemoveFriend(name);
C_FriendList.AddOrRemoveFriend(name);
elseif ( action == "decline" ) then
DeclineGuildApplicant(self.index);
end
......
......@@ -472,7 +472,7 @@ function GuildRecruitmentDropDown_Initialize(self)
info.text = ADD_FRIEND;
info.arg1 = "addfriend";
if ( GetFriendInfo(name) ) then
if ( C_FriendList.GetFriendInfo(name) ) then
info.disabled = 1;
end
UIDropDownMenu_AddButton(info, UIDROPDOWN_MENU_LEVEL);
......@@ -493,7 +493,7 @@ function GuildRecruitmentDropDown_OnClick(button, action)
elseif ( action == "whisper" ) then
ChatFrame_SendTell(name);
elseif ( action == "addfriend" ) then
AddOrRemoveFriend(name);
C_FriendList.AddOrRemoveFriend(name);
elseif ( action == "decline" ) then
DeclineGuildApplicant(GuildRecruitmentDropDown.index);
end
......
......@@ -864,7 +864,7 @@
</Frames>
</Button>
<!-- Casual -->
<Frame name="HonorFrame" toplevel="true">
<Frame name="HonorFrame">
<Size x="402" y="403"/>
<Anchors>
<Anchor point="TOPLEFT" x="220" y="-22"/>
......@@ -1008,7 +1008,7 @@
</OnClick>
</Scripts>
</Button>
<Frame parentKey="BrawlHelpBox" inherits="GlowBoxTemplate" hidden="false" frameStrata="DIALOG" >
<Frame parentKey="BrawlHelpBox" inherits="GlowBoxTemplate" hidden="false" frameStrata="DIALOG">
<Size x="230" y="65"/>
<Anchors>
<Anchor point="LEFT" relativePoint="RIGHT" relativeKey="$parent.BrawlButton" x="15" y="0"/>
......
......@@ -2599,7 +2599,7 @@
self:GetParent().ValidationDescription:Hide();
self:GetParent().ContinueButton:SetEnabled(self:GetText() ~= "");
</OnTextChanged>
<OnEnter function="VASCharacterSelectionNewCharacterName_OnEnter"/>
<OnEnter function="VASCharacterSelection_NewCharacterName_OnEnter"/>
<OnLeave>
StoreTooltip:Hide();
</OnLeave>
......@@ -2632,7 +2632,7 @@
<Anchor point="TOPRIGHT" relativeKey="$parent.SelectedCharacterFrame" relativePoint="BOTTOMRIGHT" x="8" y="-12"/>
</Anchors>
<Scripts>
<OnTextChanged function="VASCharacterSelection_GuildFactionChangeEditbox_OnTextChanged"/>
<OnTextChanged function="VASCharacterSelection_GuildVASEditbox_OnTextChanged"/>
<OnEnter function="VASCharacterSelection_NewGuildName_OnEnter"/>
<OnLeave function="VASCharacterSelection_ClearStoreTooltip"/>
</Scripts>
......@@ -2642,7 +2642,7 @@
<Anchor point="TOPRIGHT" relativeKey="$parent.SelectedCharacterFrame" relativePoint="BOTTOMRIGHT" x="8" y="-52"/>
</Anchors>
<Scripts>
<OnTextChanged function="VASCharacterSelection_GuildFactionChangeEditbox_OnTextChanged"/>
<OnTextChanged function="VASCharacterSelection_GuildVASEditbox_OnTextChanged"/>
<OnEnter function="VASCharacterSelection_NewGuildMaster_OnEnter"/>
<OnLeave function="VASCharacterSelection_ClearStoreTooltip"/>
</Scripts>
......@@ -2652,7 +2652,7 @@
<Anchor point="TOPRIGHT" relativeKey="$parent.SelectedCharacterFrame" relativePoint="BOTTOMRIGHT" x="8" y="-92"/>
</Anchors>
<Scripts>
<OnTextChanged function="VASCharacterSelection_GuildFactionChangeEditbox_OnTextChanged"/>
<OnTextChanged function="VASCharacterSelection_GuildVASEditbox_OnTextChanged"/>
<OnEnter function="VASCharacterSelection_OldGuildNewName_OnEnter"/>
<OnLeave function="VASCharacterSelection_ClearStoreTooltip"/>
</Scripts>
......@@ -2665,14 +2665,15 @@
<OnClick function="TransferRealmCheckbox_OnClick"/>
</Scripts>
</CheckButton>
<EditBox parentKey="TransferRealmEditbox" letters="100" inherits="StoreEditBoxTemplate">
<Size x="140" y="22"/>
<EditBox parentKey="TransferRealmEditbox" letters="100" inherits="StoreEditBoxHorizontalLabelTemplate">
<Anchors>
<Anchor point="TOPRIGHT" relativeKey="$parent.SelectedCharacterFrame" relativePoint="BOTTOMRIGHT" x="8" y="-10"/>
</Anchors>
<Scripts>
<OnCursorChanged function="VASCharacterSelectionTransferRealmEditBox_OnCursorChanged"/>
<OnTextChanged function="VASCharacterSelectionTransferRealmEditBox_OnTextChanged"/>
<OnEnter function="VASCharacterSelection_TransferRealmEditbox_OnEnter"/>
<OnLeave function="VASCharacterSelection_ClearStoreTooltip"/>
<OnShow>
self:SetFrameLevel(self:GetParent():GetFrameLevel()+7);
</OnShow>
......@@ -2769,6 +2770,8 @@
</Frame>
</Frames>