Build 10571

Ambalus · Oct 14, 2009 · 0e2b95f · 0e2b95f
1 parent 1b199f7
commit 0e2b95f
Show file tree

Hide file tree

Showing 20 changed files with 1,708 additions and 434 deletions.
diff --git a/FrameXML/Bindings.xml b/FrameXML/Bindings.xml
@@ -690,7 +690,7 @@
 		ToggleFriendsFrame(5);
 	</Binding>
 	<Binding name="TOGGLELFGPARENT">
-		ToggleLFGParentFrame();
+		--ToggleLFDParentFrame();
 	</Binding>
 	<Binding name="TOGGLELFGTAB">
 		ToggleLFGParentFrame(1);

diff --git a/FrameXML/ChatFrame.lua b/FrameXML/ChatFrame.lua
@@ -2110,7 +2110,9 @@ end
 SlashCmdList["SET_TITLE"] = function(msg)
 	local name = SecureCmdOptionParse(msg);
 	if ( name and name ~= "") then
-		SetTitleByName(name);
+		if(not SetTitleByName(name)) then
+			UIErrorsFrame:AddMessage(TITLE_DOESNT_EXIST, 1.0, 0.1, 0.1, 1.0);
+		end
 	end
 end
 

diff --git a/FrameXML/Constants.lua b/FrameXML/Constants.lua
@@ -456,3 +456,8 @@ GMTICKET_ASSIGNEDTOGM_STATUS_ESCALATED = 2;		-- ticket is in the escalation queu
 GMTICKET_OPENEDBYGM_STATUS_NOT_OPENED = 0;		-- ticket has never been opened by a gm
 GMTICKET_OPENEDBYGM_STATUS_OPENED = 1;			-- ticket has been opened by a gm
 
+
+-- indicies for adding lights ModelFFX:Add*Light
+LIGHT_LIVE  = 0;
+LIGHT_GHOST = 1;
+
diff --git a/FrameXML/FontStyles.xml b/FrameXML/FontStyles.xml
@@ -164,6 +164,15 @@
 	<Font name="QuestTitleFont" inherits="QuestFont_Shadow_Huge" virtual="true">
 		<Color r="0" g="0" b="0"/>
 	</Font>
+	<Font name="QuestTitleFontBlackShadow" inherits="QuestFont_Shadow_Huge" virtual="true">
+		<Shadow>
+			<Offset>
+				<AbsDimension x="1" y="-1"/>
+			</Offset>
+			<Color r="0" g="0" b="0"/>
+		</Shadow>
+		<Color r="1" g=".82" b="0"/>
+	</Font>
 	<Font name="QuestFont" inherits="SystemFont_Med2" virtual="true">
 		<Color r="0" g="0" b="0"/>
 	</Font>

diff --git a/FrameXML/GlobalStrings.lua b/FrameXML/GlobalStrings.lua
diff --git a/FrameXML/ItemButtonTemplate.xml b/FrameXML/ItemButtonTemplate.xml
@@ -95,4 +95,60 @@
 		<HighlightTexture alphaMode="ADD" file="Interface\Buttons\ButtonHilight-Square"/>
 		<CheckedTexture alphaMode="ADD" file="Interface\Buttons\CheckButtonHilight"/>
 	</CheckButton>
+	<Button name="LargeItemButtonTemplate" virtual="true">
+		<Size>
+			<AbsDimension x="147" y="41"/>
+		</Size>
+		<Layers>
+			<Layer level="BACKGROUND">
+				<Texture name="$parentIconTexture">
+					<Size>
+						<AbsDimension x="39" y="39"/>
+					</Size>
+					<Anchors>
+						<Anchor point="TOPLEFT">
+							<Offset>
+								<AbsDimension x="0" y="0"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</Texture>
+				<Texture name="$parentNameFrame" file="Interface\QuestFrame\UI-QuestItemNameFrame">
+					<Size>
+						<AbsDimension x="128" y="64"/>
+					</Size>
+					<Anchors>
+						<Anchor point="LEFT" relativeTo="$parentIconTexture" relativePoint="RIGHT">
+							<Offset>
+								<AbsDimension x="-10" y="0"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</Texture>
+				<FontString name="$parentName" inherits="GameFontHighlight" justifyH="LEFT">
+					<Size>
+						<AbsDimension x="90" y="36"/>
+					</Size>
+					<Anchors>
+						<Anchor point="LEFT" relativeTo="$parentNameFrame">
+							<Offset>
+								<AbsDimension x="15" y="0"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+			</Layer>
+			<Layer level="ARTWORK">
+				<FontString name="$parentCount" inherits="NumberFontNormal" justifyH="RIGHT">
+					<Anchors>
+						<Anchor point="BOTTOMRIGHT" relativeTo="$parentIconTexture">
+							<Offset>
+								<AbsDimension x="-1" y="1"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+			</Layer>
+		</Layers>
+	</Button>
  </Ui>