# HG changeset patch
# User EmFor
# Date 1313316607 -7200
# Node ID 663f782bd90339f518f8bea1d4a62ff5499e6530
# Parent 95760e155db2fb3bf250e93ae244c9f69532299b
rebase on CensusPlus-40000-5.0.2.zip ; toc update
diff -r 95760e155db2 -r 663f782bd903 CensusButton.lua
--- a/CensusButton.lua Fri Dec 10 17:19:53 2010 +0100
+++ b/CensusButton.lua Sun Aug 14 12:10:07 2011 +0200
@@ -113,14 +113,12 @@
function CensusPlus_CloseDropDown()
CloseDropDownMenus();
end
-
function CensusPlus_Button_OnMouseDown( self, arg1 )
if ( ( ( not CensusButtonFrame.isLocked ) or ( CensusButtonFrame.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
CensusButtonFrame:StartMoving();
CensusButtonFrame.isMoving = true;
end
end
-
function CensusPlus_Button_OnClick( self, arg1, arg2 )
if( not CensusButtonFrame.isMoving ) then
CensusPlusButton_OnClick(arg1, arg2);
diff -r 95760e155db2 -r 663f782bd903 CensusButton.xml
--- a/CensusButton.xml Fri Dec 10 17:19:53 2010 +0100
+++ b/CensusButton.xml Sun Aug 14 12:10:07 2011 +0200
@@ -56,7 +56,6 @@
GameTooltip_SetDefaultAnchor(GameTooltip, UIParent);
-
GameTooltip:SetText(CENSUS_BUTTON_TOOLTIP);
diff -r 95760e155db2 -r 663f782bd903 CensusPlayerList.lua
--- a/CensusPlayerList.lua Fri Dec 10 17:19:53 2010 +0100
+++ b/CensusPlayerList.lua Sun Aug 14 12:10:07 2011 +0200
@@ -300,4 +300,3 @@
self.isMoving = true;
end
end
-
diff -r 95760e155db2 -r 663f782bd903 CensusPlus.lua
--- a/CensusPlus.lua Fri Dec 10 17:19:53 2010 +0100
+++ b/CensusPlus.lua Sun Aug 14 12:10:07 2011 +0200
@@ -48,13 +48,13 @@
--local CensusPlus_MYGUILD = "The Last Journey";
local CensusPlus_MYGUILD = "Worgengrauen";
---------------------------------------------------------------------------------
-local CensusPlus_VERSION = "4.3.2"; -- version
+local CensusPlus_VERSION = "5.0.2"; -- version
local CensusPlus_MAXBARHEIGHT = 128; -- Length of blue bars
local CensusPlus_NUMGUILDBUTTONS = 10; -- How many guild buttons are on the UI?
local MAX_CHARACTER_LEVEL = 85; -- Maximum level a PC can attain
--rm
local MAX_LEVEL_DISPLAY = 255; -- Maximum level a PC can attain
-local MAX_WHO_RESULTS = 48; -- Maximum number of who results the server will return
+local MAX_WHO_RESULTS = 49; -- Maximum number of who results the server will return
CensusPlus_GUILDBUTTONSIZEY = 16;
local CensusPlus_UPDATEDELAY = 5; -- Delay time between /who messages
local CP_MAX_TIMES = 50;
@@ -205,8 +205,9 @@
g_RaceClassList[CENSUSPlus_UNDEAD] = 27;
g_RaceClassList[CENSUSPlus_DRAENEI] = 28;
g_RaceClassList[CENSUSPlus_BLOODELF] = 29;
-g_RaceClassList[CENSUSPlus_WORGEN] = 31;
-g_RaceClassList[CENSUSPlus_GOBLIN] = 32;
+g_RaceClassList[CENSUSPlus_WORGEN] = 32;
+g_RaceClassList[CENSUSPlus_GOBLIN] = 31;
+
g_TimeDatabase[CENSUSPlus_DRUID] = 0;
g_TimeDatabase[CENSUSPlus_HUNTER] = 0;
@@ -499,8 +500,8 @@
--
-----------------------------------------------------------------------------------
local function GetNameLetters()
+-- return { "a", "b", "c", "d", "e", "f", "g", "i", "o", "p", "r", "s", "t", "u", "y" };
--rm
--- return { "a", "b", "c", "d", "e", "f", "g", "i", "o", "p", "r", "s", "t", "u", "y" };
-- return { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "\195\134", "\195\164", "\195\182", "\195\188", "\195\152" };
return { "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "\195\134", "\195\164", "\195\182", "\195\188", "\195\152", "\195\184" };
end
@@ -676,7 +677,6 @@
g_WaitingForWhoUpdate = false;
CP_Pre_OnEvent(...);
-
--
-- If we opened the who window, do a manual pause and open a dialog
--
@@ -1517,7 +1517,9 @@
end
end
+
CensusPlusTakeButton:SetText( CENSUSPlus_PAUSE );
+
end
-----------------------------------------------------------------------------------
@@ -2955,6 +2957,7 @@
for i = 1, numRaces, 1 do
local race = thisFactionRaces[i];
local buttonName = "CensusPlusRaceBar"..i;
+
local button = getglobal(buttonName);
local thisCount = g_RaceCount[i];
if ((thisCount ~= nil) and (thisCount > 0) and (maxCount > 0)) then
@@ -2966,6 +2969,8 @@
button:Hide();
end
local normalTextureName="Interface\\AddOns\\CensusPlus\\Skin\\CensusPlus_"..g_RaceClassList[race];
+
+
local legendName = "CensusPlusRaceLegend"..i;
local legend = getglobal(legendName);
legend:SetNormalTexture(normalTextureName);
@@ -4019,33 +4024,28 @@
SendWho( msg );
end
end
-
function CensusPlus_Options_OnMouseUp(self,...)
CensusPlus_Msg('Mouse up');
-
if ( self.isMoving ) then
self:StopMovingOrSizing();
self.isMoving = false;
end
end
-
function CensusPlus_Options_OnMouseDown(self,arg1,arg2,arg3,...)
if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
self:StartMoving();
self.isMoving = true;
end
end
-
function CensusPlus_Mini_OnMouseDown( self, arg1 )
if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
self:StartMoving();
self.isMoving = true;
end
end
-
function CensusPlus_Census_OnMouseDown( self, arg1 )
if ( ( ( not self.isLocked ) or ( self.isLocked == 0 ) ) and ( arg1 == "LeftButton" ) ) then
self:StartMoving();
self.isMoving = true;
end
-end
+end
\ No newline at end of file
diff -r 95760e155db2 -r 663f782bd903 CensusPlus.toc
--- a/CensusPlus.toc Fri Dec 10 17:19:53 2010 +0100
+++ b/CensusPlus.toc Sun Aug 14 12:10:07 2011 +0200
@@ -1,17 +1,20 @@
-## Interface: 40000
-## Version: 4.3.2
+## Interface: 40200
+## Version: 5.0.2
## Title: CensusPlus EmSpeçial
## Notes: Collects and displays census information. This AddOn is licenced under the GNU GPL, see GPL.txt for details.
## Original Author: Ian Pieragostini
## Modified By: Cooper Sellers - www.warcraftrealms.com
-## Modified By: Em based on CensusPlus-30300-4.2.2.zip
+## Modified By: sylvanaar
+## Modified By: Em based on CensusPlus-30300-4.2.2.zip , rebase on CensusPlus-40000-5.0.2.zip
## SavedVariables: CensusPlus_Database,CensusPlus_BGInfo,CensusPlus_Unhandled
## SavedVariablesPerCharacter: CensusPlus_DoThisCharacter,CensusPlus_PerCharInfo
## X-Website: http://www.warcraftrealms.com
-## X-Curse-Packaged-Version: TLJ Spezial 1.4.0.3a0
-## X-Curse-Project-Name: Census+ (event guild search)
-## X-Curse-Project-ID: emfor1
-## X-Curse-Repository-ID: wow/emfor1/mainline
+
+#@no-lib-strip@
+libs\LibStub\LibStub.lua
+libs\CallbackHandler-1.0\CallbackHandler-1.0.lua
+libs\LibWho-2.0\LibWho-2.0.lua
+#@end-no-lib-strip@
CensusPlus.xml
CensusButton.xml
diff -r 95760e155db2 -r 663f782bd903 CensusPlus.wuuver
--- a/CensusPlus.wuuver Fri Dec 10 17:19:53 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-20100204
\ No newline at end of file
diff -r 95760e155db2 -r 663f782bd903 Skin/CensusPlus_31.tga
Binary file Skin/CensusPlus_31.tga has changed
diff -r 95760e155db2 -r 663f782bd903 Skin/CensusPlus_32.tga
Binary file Skin/CensusPlus_32.tga has changed