Update to cooldown panel

- Removed cooldowns from game interface
- Using UIProgressRect

modules/game_interface/gameinterface.lua

@@ -10,7 +10,6 @@ mouseGrabberWidget = nil
 countWindow = nil
 logoutWindow = nil
 exitWindow = nil
-cooldownPanel = nil
 
 function init()
   g_ui.importStyle('styles/countwindow.otui')
@@ -23,8 +22,6 @@ function init()
   gameRootPanel:hide()
   gameRootPanel:lower()
 
-  cooldownPanel = gameRootPanel:getChildById('spellPanel')
-  
   mouseGrabberWidget = gameRootPanel:getChildById('mouseGrabber')
   mouseGrabberWidget.onMouseRelease = onMouseGrabberRelease
 
@@ -82,8 +79,6 @@ function terminate()
                        onLoginAdvice = onLoginAdvice })
   disconnect(gameLeftPanel, { onVisibilityChange = onLeftPanelVisibilityChange })
 
-  cooldownPanel:destroy()
-  
   logoutButton:destroy()
   gameRootPanel:destroy()
 end
@@ -95,8 +90,6 @@ function show()
   gameRootPanel:show()
   gameRootPanel:focus()
   gameMapPanel:followCreature(g_game.getLocalPlayer())
-  
-  cooldownPanel:setVisible((g_game.getClientVersion() >= 870))
 end
 
 function hide()
@@ -551,31 +544,4 @@ function onLeftPanelVisibilityChange(leftPanel, visible)
       children[i]:setParent(gameRightPanel)
     end
   end
-end
-
-function setGroupCooldown(groupId, duration)
-  if not SpellGroups[groupId] then return end
-  
-  local icon = gameRootPanel:getChildById('groupIcon' .. SpellGroups[groupId])
-  if icon then
-    icon:setOn(true)
-    removeEvent(icon.event)
-	icon.event = scheduleEvent(function() icon:setOn(false) end, duration)
-  end
-end
-
-function setCooldown(iconFile, iconId, spellformula, duration)
-  local icon = cooldownPanel:getChildById(spellformula)
-
-  if icon then
-    removeEvent(icon.event)
-	icon.event = scheduleEvent(function() icon:destroy() end, duration)
-  else
-    icon = g_ui.createWidget('SpellIcon', cooldownPanel)
-    icon:setId(spellformula)
-    icon:setImageSource('/game_spelllist/icons/' .. iconFile)
-    icon:setTooltip(spellformula)
-    icon:setImageClip(modules.game_spelllist.getIconImageClip(iconId))
-	icon.event = scheduleEvent(function() icon:destroy() end, duration)
-  end
-end
+end

modules/game_interface/gameinterface.otui

@@ -1,19 +1,4 @@
-SpellGroupIcon < UIWidget
-  size: 22 22
-  image-size: 22 22
-  image-source: /game_spelllist/icons/cooldownIcons.png
-  focusable: false
 
-SpellIcon < UIWidget
-  size: 22 22 
-  image-size: 22 22
-  margin-right: 3
-  margin-top: 6
-  margin-left: 3
-  focusable: false
-  $first:
-    margin-left: 100
-  
 GameSidePanel < UIMiniWindowContainer
   image-source: /images/sidepanel.png
   image-border: 4
@@ -71,67 +56,6 @@ UIWidget
     focusable: false
     on: true
 
-  Panel
-    id: spellPanel
-    layout:
-      type: horizontalBox
-    height: 32
-    width: 250
-    anchors.left: gameLeftPanel.right
-    anchors.bottom: parent.bottom
-    relative-margin: bottom
-    margin-bottom: 187
-    margin-left: 10
-    border-width: 1
-    border-color: #00000077
-    background-color: #ffffff11
-    focusable: false
-
-  SpellGroupIcon
-    id: groupIconAttack
-    parent: spellPanel
-    image-clip: 0 32 32 32
-    anchors.top: spellPanel.top
-    anchors.left: spellPanel.left
-    !tooltip: tr('Attack')
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 0 0 32 32
-
-  SpellGroupIcon
-    id: groupIconHealing
-    image-clip: 32 32 32 32
-    anchors.top: spellPanel.top
-    anchors.left: groupIconAttack.right
-    !tooltip: tr('Healing')
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 32 0 32 32
-
-  SpellGroupIcon
-    id: groupIconSupport
-    image-clip: 64 32 32 32
-    anchors.top: spellPanel.top
-    anchors.left: groupIconHealing.right
-    !tooltip: tr('Support')
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 64 0 32 32
-
-  SpellGroupIcon
-    id: groupIconSpecial
-    image-clip: 96 32 32 32
-    anchors.top: spellPanel.top
-    anchors.left: groupIconSupport.right
-    !tooltip: tr('Special')
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 96 0 32 32
-
   Splitter
     id: bottomSplitter
     anchors.left: gameLeftPanel.right
@@ -140,9 +64,9 @@ UIWidget
     relative-margin: bottom
     margin-bottom: 172
     @canUpdateMargin: function(self, newMargin) return math.max(math.min(newMargin, self:getParent():getHeight() - 300), 100) end
-    @onGeometryChange: function(self) self:setMarginBottom(math.min(math.max(self:getParent():getHeight() - 300, 100), self:getMarginBottom())) self:getParent():getChildById('spellPanel'):setMarginBottom(15 + math.min(math.max(self:getParent():getHeight() - 300, 100), self:getMarginBottom())) end
+    @onGeometryChange: function(self) self:setMarginBottom(math.min(math.max(self:getParent():getHeight() - 300, 100), self:getMarginBottom())) end
 
   UIWidget
     id: mouseGrabber
     focusable: false
-    visible: false
+    visible: false