Quantcast

- Fixed release for WoW 9.0.1.

HonorGoG [10-24-20 - 23:02]
- Fixed release for WoW 9.0.1.
- Fixed menu layers on right-click menu.
- Cleaned original base code.
Filename
TitanRecount/TitanRecount.lua
TitanRecount/TitanRecount.toc
TitanRecount/TitanRecount.xml
diff --git a/TitanRecount/TitanRecount.lua b/TitanRecount/TitanRecount.lua
index 2484db8..370650a 100755
--- a/TitanRecount/TitanRecount.lua
+++ b/TitanRecount/TitanRecount.lua
@@ -5,7 +5,7 @@
 -- * Adopted by HonorGoG of the Titan Panel Development Team
 -- **************************************************************************
 -- * 2019-09-25 : 5.0.0.80200 Adopted by HonorGoG WoW Classic 1.13.3
--- * 2020-03-27 : 5.0.0.11304 Decided to specialize for Classic.
+-- * 2020-03-27 : 5.0.1.90001 Fixed
 -- **************************************************************************

 -- ********************************** Ace3 **********************************
@@ -19,12 +19,6 @@ TITAN_RECOUNT_VERSION = GetAddOnMetadata("TitanRecount", "Version") or L["TITAN_
 TITAN_RECOUNT_VERSION_STRING = "|cffffd700Titan Panel [Recount] "..GREEN_FONT_COLOR_CODE..TITAN_RECOUNT_VERSION.."|cffffd700 by |cffff8c00HonorGoG";
 local TITAN_RECOUNT_DEBUG = false;

-local TPRID = "Recount"
-local TPRVersion = "4.0.0"
-local TPRC1 = "|cffffffff"
-local TPRC2 = "|cff993300"
-local TPRC3 = "|cff00ff00"
-local TPRC4 = "|cffffcc00"
 local TPRRealtime = "Realtime Graphs"
 local TPRRaid = "Raid Graphs"
 local TPRWindow = "Window Type"
@@ -34,8 +28,6 @@ local TPREnergy = "Energy Stats"
 local TPROther = "Other Stats"

 function TitanPanelRecountButton_OnLoad(self)
---    DEFAULT_CHAT_FRAME:AddMessage(TPRC1.."Titan Panel "..TPRC2.."[Recount] "..TPRC1.."v"..TPRC2..TPRVersion.." "..TPRC1.."by |cff999999Suddendeath2000")
-     TPCDefense_Debug("TitanPanelDefenseButton_OnLoad");
      if (DEFAULT_CHAT_FRAME) then
          DEFAULT_CHAT_FRAME:AddMessage(TITAN_RECOUNT_VERSION_STRING);
      end
@@ -44,7 +36,7 @@ function TitanPanelRecountButton_OnLoad(self)
 	    version = TITAN_RECOUNT_VERSION,
         menuText = TITAN_RECOUNT_ID,
         category = "Interface",
-        tooltipTitle = TPRC4..TPRID,
+        tooltipTitle = "|cffffcc00"..TITAN_RECOUNT_ID,
 		tooltipTextFunction = "TitanPanelRecountButton_GetTooltipText",
         icon = "Interface\\AddOns\\TitanRecount\\TitanRecount",
         iconButtonWidth = 16,
@@ -61,7 +53,7 @@ function TitanPanelRecountButton_OnLoad(self)
 end

 function TitanPanelRecountButton_GetTooltipText()
-    return TPRC3.."Double Left-Click to Toggle Selected Main Window\n"..TPRC3.."Right-click to Open Options"
+    return "|cff00ff00".."Double Left-Click to Toggle Selected Main Window\n".."|cff00ff00".."Right-click to Open Options"
 end

 function TitanPanelRecountButton_OnDoubleClick(button)
@@ -77,211 +69,224 @@ end
 function TitanPanelRightClickMenu_PrepareRecountMenu()
     local info = {}

-    if  ( _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 ) and ( UIDROPDOWNMENU_MENU_VALUE == TPRDPS )then
-      TitanPanelRightClickMenu_AddTitle(TPRDPS, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+    -- level 3
+	if L_UIDROPDOWNMENU_MENU_LEVEL == 3 then
+
+        if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TCRDamage" then
+            TitanPanelRightClickMenu_AddTitle(TPRDPS, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Damage Done"
-    info.checked = Recount.db.profile.MainWindowMode == 1
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(1) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Damage Done"
+            info.checked = Recount.db.profile.MainWindowMode == 1
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(1) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "DPS"
-    info.checked = Recount.db.profile.MainWindowMode == 2
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(2) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "DPS"
+            info.checked = Recount.db.profile.MainWindowMode == 2
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(2) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Friendly Fire"
-    info.checked = Recount.db.profile.MainWindowMode == 3
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(3) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Friendly Fire"
+            info.checked = Recount.db.profile.MainWindowMode == 3
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(3) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Damage Taken"
-    info.checked = Recount.db.profile.MainWindowMode == 4
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(4) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    elseif  ( _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 ) and ( UIDROPDOWNMENU_MENU_VALUE == TPRHealing )then
-      TitanPanelRightClickMenu_AddTitle(TPRHealing, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Damage Taken"
+            info.checked = Recount.db.profile.MainWindowMode == 4
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(4) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        end
+
+        if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TCRHealing" then
+            TitanPanelRightClickMenu_AddTitle(TPRHealing, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Healing Done"
-    info.checked = Recount.db.profile.MainWindowMode == 5
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(5) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Healing Done"
+            info.checked = Recount.db.profile.MainWindowMode == 5
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(5) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Healing Taken"
-    info.checked = Recount.db.profile.MainWindowMode == 6
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(6) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Healing Taken"
+            info.checked = Recount.db.profile.MainWindowMode == 6
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(6) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Overhealing Done"
-    info.checked = Recount.db.profile.MainWindowMode == 7
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(7) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    elseif  ( _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 ) and ( UIDROPDOWNMENU_MENU_VALUE == TPREnergy )then
-      TitanPanelRightClickMenu_AddTitle(TPREnergy, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    info.text = "Mana Gained"
-    info.checked = Recount.db.profile.MainWindowMode == 17
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(17) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Overhealing Done"
+            info.checked = Recount.db.profile.MainWindowMode == 7
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(7) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        end

-    info.text = "Energy Gained"
-    info.checked = Recount.db.profile.MainWindowMode == 18
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(18) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    info.text = "Rage Gained"
-    info.checked = Recount.db.profile.MainWindowMode == 19
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(19) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    info.text = "Runic PowerGained"
-    info.checked = Recount.db.profile.MainWindowMode == 20
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(20) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TCREnergy" then
+            TitanPanelRightClickMenu_AddTitle(TPREnergy, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+
+            info.text = "Mana Gained"
+            info.checked = Recount.db.profile.MainWindowMode == 17
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(17) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+
+            info.text = "Energy Gained"
+            info.checked = Recount.db.profile.MainWindowMode == 18
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(18) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    elseif  ( _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 ) and ( UIDROPDOWNMENU_MENU_VALUE == TPROther )then
-      TitanPanelRightClickMenu_AddTitle(TPROther, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Rage Gained"
+            info.checked = Recount.db.profile.MainWindowMode == 19
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(19) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+
+            info.text = "Runic PowerGained"
+            info.checked = Recount.db.profile.MainWindowMode == 20
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(20) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        end
+
+        if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TCROther" then
+            TitanPanelRightClickMenu_AddTitle(TPROther, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Deaths"
-    info.checked = Recount.db.profile.MainWindowMode == 8
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(8) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Deaths"
+            info.checked = Recount.db.profile.MainWindowMode == 8
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(8) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "DOT Uptime"
-    info.checked = Recount.db.profile.MainWindowMode == 9
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(9) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "DOT Uptime"
+            info.checked = Recount.db.profile.MainWindowMode == 9
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(9) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "HOT Uptime"
-    info.checked = Recount.db.profile.MainWindowMode == 10
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(10) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "HOT Uptime"
+            info.checked = Recount.db.profile.MainWindowMode == 10
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(10) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Activity"
-    info.checked = Recount.db.profile.MainWindowMode == 11
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(11) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Activity"
+            info.checked = Recount.db.profile.MainWindowMode == 11
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(11) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Dispels"
-    info.checked = Recount.db.profile.MainWindowMode == 12
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(12) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Dispels"
+            info.checked = Recount.db.profile.MainWindowMode == 12
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(12) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Dispelled"
-    info.checked = Recount.db.profile.MainWindowMode == 13
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(13) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Dispelled"
+            info.checked = Recount.db.profile.MainWindowMode == 13
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(13) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Interrupts"
-    info.checked = Recount.db.profile.MainWindowMode == 14
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(14) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Interrupts"
+            info.checked = Recount.db.profile.MainWindowMode == 14
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(14) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Ressers"
-    info.checked = Recount.db.profile.MainWindowMode == 15
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(15) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Ressers"
+            info.checked = Recount.db.profile.MainWindowMode == 15
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(15) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "CC Breakers"
-    info.checked = Recount.db.profile.MainWindowMode == 16
-    info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(16) end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "CC Breakers"
+            info.checked = Recount.db.profile.MainWindowMode == 16
+            info.func =  function() Recount.MainWindow:Show() Recount:SetMainWindowMode(16) end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        end
+
+    -- level 2
+    elseif  _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2  then

-    elseif  ( _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 ) and ( UIDROPDOWNMENU_MENU_VALUE == TPRRealtime )then
-      TitanPanelRightClickMenu_AddTitle(TPRRealtime, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TCRRealtime" then
+            TitanPanelRightClickMenu_AddTitle(TPRRealtime, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Realtime FPS"
-    info.func =  function() Recount:CreateRealtimeWindow("FPS","FPS","") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Realtime FPS"
+            info.func =  function() Recount:CreateRealtimeWindow("FPS","FPS","") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Realtime Latency"
-    info.func =  function() Recount:CreateRealtimeWindow("Latency","LAG","") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Realtime Latency"
+            info.func =  function() Recount:CreateRealtimeWindow("Latency","LAG","") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Upstream Traffic"
-    info.func =  function() Recount:CreateRealtimeWindow("Upstream Traffic","UP_TRAFFIC","") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Upstream Traffic"
+            info.func =  function() Recount:CreateRealtimeWindow("Upstream Traffic","UP_TRAFFIC","") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Downstream Traffic"
-    info.func =  function() Recount:CreateRealtimeWindow("Downstream Traffic","DOWN_TRAFFIC","") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Downstream Traffic"
+            info.func =  function() Recount:CreateRealtimeWindow("Downstream Traffic","DOWN_TRAFFIC","") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Available Bandwidth"
-    info.func =  function() Recount:CreateRealtimeWindow("Bandwidth Available","AVAILABLE_BANDWIDTH","") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    elseif  ( _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 ) and ( UIDROPDOWNMENU_MENU_VALUE == TPRRaid )then
-      TitanPanelRightClickMenu_AddTitle(TPRRaid, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Available Bandwidth"
+            info.func =  function() Recount:CreateRealtimeWindow("Bandwidth Available","AVAILABLE_BANDWIDTH","") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        end
+
+        if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TCRRaid" then
+            TitanPanelRightClickMenu_AddTitle(TPRRaid, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Raid Damage Per Second"
-    info.func =  function() Recount:CreateRealtimeWindow("!RAID","DAMAGE","Raid DPS") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Raid Damage Per Second"
+            info.func =  function() Recount:CreateRealtimeWindow("!RAID","DAMAGE","Raid DPS") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Raid Damage Taken Per Second"
-    info.func =  function() Recount:CreateRealtimeWindow("!RAID","DAMAGETAKEN","Raid DTPS") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Raid Damage Taken Per Second"
+            info.func =  function() Recount:CreateRealtimeWindow("!RAID","DAMAGETAKEN","Raid DTPS") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Raid Healing Per Second"
-    info.func =  function() Recount:CreateRealtimeWindow("!RAID","HEALING","Raid HPS") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Raid Healing Per Second"
+            info.func =  function() Recount:CreateRealtimeWindow("!RAID","HEALING","Raid HPS") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Raid Healing Taken Per Second"
-    info.func =  function() Recount:CreateRealtimeWindow("!RAID","HEALINGTAKEN","Raid HTPS") end
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    elseif  ( _G["L_UIDROPDOWNMENU_MENU_LEVEL"] == 2 ) and ( UIDROPDOWNMENU_MENU_VALUE == TPRWindow )then
-      TitanPanelRightClickMenu_AddTitle(TPRWindow, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Raid Healing Taken Per Second"
+            info.func =  function() Recount:CreateRealtimeWindow("!RAID","HEALINGTAKEN","Raid HTPS") end
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        end
+
+        if _G["L_UIDROPDOWNMENU_MENU_VALUE"] == "TCRWindow" then
+            TitanPanelRightClickMenu_AddTitle(TPRWindow, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Damage Stats"
-    info.value = TPRDPS
-    info.hasArrow = 2
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Damage Stats"
+            info.value = "TCRDamage"
+            info.hasArrow = 2
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Healing Stats"
-    info.value = TPRHealing
-    info.hasArrow = 2
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Healing Stats"
+            info.value = "TCRHealing"
+            info.hasArrow = 2
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

-    info.text = "Energy Stats"
-    info.value = TPREnergy
-    info.hasArrow = 2
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
-    info.text = "Other Stats"
-    info.value = TPROther
-    info.hasArrow = 2
-    L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+            info.text = "Energy Stats"
+            info.value = "TCREnergy"
+            info.hasArrow = 2
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])

+            info.text = "Other Stats"
+            info.value = "TCROther"
+            info.hasArrow = 2
+            L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
+        end
     else
-
-    TitanPanelRightClickMenu_AddTitle(TPRID)
+
+    -- level 1
+    TitanPanelRightClickMenu_AddTitle(TITAN_RECOUNT_ID)
     TitanPanelRightClickMenu_AddSpacer()
-
+
     info.text = "Realtime Graphs"
-    info.value = TPRRealtime
+    info.value = "TCRRealtime"
     info.hasArrow = 1
     L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
+
     info.text = "Raid Graphs"
-    info.value = TPRRaid
+    info.value = "TCRRaid"
     info.hasArrow = 1
     L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
+
     info.text = "Window Type"
-    info.value = TPRWindow
+    info.value = "TCRWindow"
     info.hasArrow = 1
     L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
+
     TitanPanelRightClickMenu_AddSpacer()
-
+
     info.text = "Report Window"
     info.value = nil
     info.hasArrow = nil
     info.func = function() Recount:ShowReport("Main",Recount.ReportData) end
     L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-
+
     info.text = "Config Window"
     info.value = nil
     info.hasArrow = nil
@@ -293,5 +298,6 @@ function TitanPanelRightClickMenu_PrepareRecountMenu()
     info.hasArrow = nil
     info.func = function() Recount:ShowReset() end
     L_UIDropDownMenu_AddButton(info, _G["L_UIDROPDOWNMENU_MENU_LEVEL"])
-  end
-end
\ No newline at end of file
+
+    end
+end
diff --git a/TitanRecount/TitanRecount.toc b/TitanRecount/TitanRecount.toc
index 53c698b..f15f264 100755
--- a/TitanRecount/TitanRecount.toc
+++ b/TitanRecount/TitanRecount.toc
@@ -1,11 +1,10 @@
-## Interface: 80200
-## Title: Titan Panel [|cffeda55fRecount|r] |cff00aa005.0.0.11302|r
-## Notes: Tracks WorldDef chatter and prevents zone is under attack spam.
+## Interface: 90001
+## Title: Titan Panel [|cffeda55fRecount|r] |cff00aa004.0.0.90001|r
+## Notes: Titan Panel Classic Launcher for Recount
 ## Author: HonorGoG of the Titan Panel Development Team; original version by Suddendeath20000
 ## Dependencies: Titan,Recount
-## Version: 5.0.0.11302
+## Version: 4.0.0.90001
 ## X-Website: http://www.titanpanel.org
 ## X-Email: contact@titanpanel.org
 ## X-WoWI-ID:
-
 TitanRecount.xml
diff --git a/TitanRecount/TitanRecount.xml b/TitanRecount/TitanRecount.xml
index c0b9f1d..e59c14f 100755
--- a/TitanRecount/TitanRecount.xml
+++ b/TitanRecount/TitanRecount.xml
@@ -1,6 +1,6 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
-	<Script file="TitanClassicRecount.lua"/>
+	<Script file="TitanRecount.lua"/>
 	<Frame parent="UIParent">
 		<Frames>
 			<Button name="TitanPanelRecountButton" inherits="TitanPanelIconTemplate" frameStrata="FULLSCREEN" toplevel="true">