From 7f864003d8355179fb1c49fbe0ef7038f6015489 Mon Sep 17 00:00:00 2001
From: Samuel <sum9900@web.de>
Date: Sat, 13 Oct 2012 21:33:04 +0200
Subject: [PATCH] Converted cooldownbar to miniwindow

---
 modules/game_combatcontrols/Thumbs.db | Bin 0 -> 2560 bytes
 modules/game_cooldown/Thumbs.db       | Bin 0 -> 3584 bytes
 modules/game_cooldown/cooldown.lua    |  48 ++++++---
 modules/game_cooldown/cooldown.otui   | 142 +++++++++++++-------------
 modules/game_cooldown/cooldown.png    | Bin 0 -> 675 bytes
 5 files changed, 106 insertions(+), 84 deletions(-)
 create mode 100644 modules/game_combatcontrols/Thumbs.db
 create mode 100644 modules/game_cooldown/Thumbs.db
 create mode 100644 modules/game_cooldown/cooldown.png

diff --git a/modules/game_combatcontrols/Thumbs.db b/modules/game_combatcontrols/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..178320923e23cc3cc5f3033a1af5b2b14b39e6fe
GIT binary patch
literal 2560
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4%9zsqZbt)A?Ac!F!2um0g7+e|hfOHW<B`hlwMT;@8!t*@5Y`~#2Ky+tZ
z#mcjc%s}}AP{l?JrVM5b@j#r)U<|}*K++UQ8!#jT=@cN(04QdL!$bxKEe0k=<Y2(5
z5KW?okYmx*<KvQJKR)wFm7~OdP%wbXaZsGF05K~NgUWnRc`yowe+Wnb;~EtACD8nE
zv_QV+RsoN2XMmqOFP9V-P>R>n!zBnv18aN+0S-{&kpKKY5lAr>2e~^jtUD+363Agm
zcl32+VA$Bt{U;Hah#2KOT^vI!{F4(Hn#$kbYc$-rVDVz+b@Mn^y|kb3&%Z}e;jF^e
zfHMqc3D?#{8l3(p#dLYjv}tWGBNnK581p1+Fl4%gHDBGmgXiG#nSys!CMbINrL<J>
z>#3=zv@B$wUHtH#;)|S^!1iad0V|SOA4E9#vtPL2cCkU`=!sX64y(eh-fGHa@Jje0
zDZ+NafU%PMP5q221z|zC<?6TovOna}XWj8X(a+%<pO35$UmnwmoBVudf6RZQ$3D&Y
ztbL2nErsTTMQ@yVP9=VpXxzvc#?H^YBW(dw#Et_wj6WrpRK7ds&ckDW-|$ZCR2Kh@
z3Cv-pl?Qyy&)#6z_Ve8%hKdu1Zy0a0O=yv1y3{OmYVAxu4JL*CheQ-MJ0`uzDm-FP
fc!+^<@7E_ucQjrALyp1I)z4*}Q$iDnO>Y1Ivlnh|

literal 0
HcmV?d00001

diff --git a/modules/game_cooldown/Thumbs.db b/modules/game_cooldown/Thumbs.db
new file mode 100644
index 0000000000000000000000000000000000000000..6f6117433a237d304544fe5f853661281d3301b6
GIT binary patch
literal 3584
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*3Bx2!nwD0|OI~0pkDr|NlQkkbwcn90fxt
z1pWfu3W`4vW&uVbD>OcbkQYXsN<jz&G2{bb34;QID?=WTE@G&JWo4phF<^>;Sr0E8
zaOvFbD_6PlEF&{e{s1Vk0f7;NDT5h9JP@Zc7z1${kTeC-1`NqSIt9ox0E(GG6k{Q^
z7?>DA<q*sbSd?HD>VY~IW<SI(3kFMuB%qC{K$rq1&4F|>e*58egWQ1CGBiPUApaW3
z(NqF3zY}XevbCUK067H|C$RhvD)T|*0SA!g1Y#~A<_2OOAm#;PJ|N}?Vqg`(APB@l
zKnzkp3Wi<?NC4vw6!#_2{4ggY?BdY~WxLJ*KX+a(DNxk&dV0770clWl3vhrEhy3UN
zi9m|6ILO_JVcj{Imp~3nx}&cn1H;CC?mvmZN`z6))5S5w!aq5Ip{e}+y+*^03l=YC
zUN?_()l2&c|NMIt70xPb4LHMKmT+xNq`~QrQcRcUOq<sBGGc*>hcQpG21BM>So780
zJ9rK*pDB1(WrCuIUrI|Azn+?kO3Om_*~Jg<DZa>w32c8R8?Yjo^+AM#Kl_CXZWkM5
zj-GfG>98v7>aC_+2Csx4k|Jyu3>Yi9-_*~jQV<rDTdscVFZ)9tebycS6a5^%@%hO5
z@Z~X`xXI6V_Q(7;dhFAT&)T;L-BM^iSoFq;=TzcniN=kLVeI_OJJJ>~MeI0`!}wEj
zN#(n9?mRs9_YLpFPG#}mn7|xnT6w_N{Ok>eZ9m^VVyHNA_=fQ|+k_TLrc2F2r`FEo
z(_m8Ae@H}Ovt!bWtimG(g@+gz_kMknbVuU_Fyt6KUHx3vIVCiK*rWnj{OyC5Cw}I9
z3r?&%Q$uO|F=asFZ|S7Hc~=}nTF;-k5m&u;_bpWoLC1v*7hBa_RpzybFIc>!c~<%Z
zMh%Ax7cRRfXnbY}`O~QrX?CEh{Eu<{oSQ6@q;zg3-~3+p{Z6s|hxyYxe)7xRtB-m8
zbKiDtjg$WO4zn_|wBMC}>Rz!`FL_S$dmXE6!&`Su%ir7XntVjQJ8M_G#%}eaTnCT2
zC<JphaqKAdeH(e%>EMAf(OqtfOS$yp_7@w5A3L69==w-I<&pZ7`HroYzbd;E^$ea_
zo_r>;`uq(a`^2X26~!kaPCC^y+}j$cu*oFBL}Q}3<uBKI-}pIaCLR;NcWr4!Wd*C}
zDupMzzO7`+XX+`<h+>}kEno`sw!{ZHttU@Bcy&%}iq^*`3tT3!hUBxT>oHuLqp+y_
zgQL>fHjm%4C)iBCDzrJ@y`pNtglCqgPMS6CI?|N=|GdbB*n`(~v}fK?c6C+}dU}jc
z@BW_N=lShDJ`?zld;Ah!QNyzGQn5oqmCVfTygtE)x5{mc-00t!zCL5yoDJ^<8Kp0*
zmMV=6bS&p{ShHTk);H1e5T9j9vgKUX+gxud8<t2MD*D&hww&eojs3bTX7YO;oNZN9
znD8!(JG%H=Ag4?e)9bFwN-nK@L2Ir*xYF$KSt<6l>aD7itrvL~^f@(IpX7aWW8UME
zV^jF%{E0X)gS%S5vX3!p{k6v-M;V&ZtnwdfSSIbNI%t^PqS9>EvgyT6CcRb5mAqS*
zElyaMb(=+}F0;v&#nx=u;qNy^cE!1#zHoX|@qugKO0%Dy_?dHBcX#9Osx@~n`s{vO
z`FPpqTeUxo%0+W8y6s4P9D7OHYFqKLhao5J<M%U`_<I<Yt+oCLO8J!J1X6R(sCrNc
F003vXg**TN

literal 0
HcmV?d00001

diff --git a/modules/game_cooldown/cooldown.lua b/modules/game_cooldown/cooldown.lua
index da12fbec..01fc0375 100644
--- a/modules/game_cooldown/cooldown.lua
+++ b/modules/game_cooldown/cooldown.lua
@@ -1,4 +1,6 @@
-cooldownPanel = nil
+cooldownWindow = nil
+cooldownButton = nil
+contentsPanel = nil
 spellCooldownPanel = nil
 
 function init()
@@ -7,11 +9,17 @@ function init()
                     onSpellGroupCooldown = onSpellGroupCooldown,
                     onSpellCooldown = onSpellCooldown })
 
-  cooldownPanel = g_ui.displayUI('cooldown.otui')
-  cooldownPanel:hide()
-  
-  spellCooldownPanel = cooldownPanel:getChildById('spellCooldownPanel')
+  cooldownButton = TopMenu.addRightGameToggleButton('cooldownButton', tr('Cooldowns'), 'cooldown.png', toggle)
+  cooldownButton:setOn(true)
+  cooldownButton:hide()
 
+  cooldownWindow = g_ui.loadUI('cooldown.otui', modules.game_interface.getRightPanel())
+  cooldownWindow:disableResize()
+  cooldownWindow:setup() 
+  
+  contentsPanel = cooldownWindow:getChildById('contentsPanel')
+  spellCooldownPanel = contentsPanel:getChildById('spellCooldownPanel')
+  
   if g_game.isOnline() then
     show()
   end
@@ -23,18 +31,34 @@ function terminate()
                        onSpellGroupCooldown = onSpellGroupCooldown,
                        onSpellCooldown = onSpellCooldown })
 
-  spellCooldownPanel:destroy()
-  cooldownPanel:destroy()
+  cooldownButton:destroy()
+  cooldownWindow:destroy()
+end
+
+function onMiniWindowClose()
+  cooldownButton:setOn(false)
+end
+
+function toggle()
+  if cooldownButton:isOn() then
+    cooldownWindow:close()
+    cooldownButton:setOn(false)
+  else
+    cooldownWindow:open()
+    cooldownButton:setOn(true)
+  end
 end
 
 function show()
   if g_game.getFeature(GameSpellList) then
-    cooldownPanel:show()
+    cooldownWindow:show()
+    cooldownButton:show()
   end
 end
 
 function hide()
-  cooldownPanel:hide()
+  cooldownWindow:hide()
+  cooldownButton:hide()
 end
 
 function updateProgressRect(progressRect, interval, init)
@@ -61,7 +85,7 @@ function onSpellCooldown(iconId, duration)
   
   if not otcIconId then return end
   
-  local icon = cooldownPanel:getChildById(spellName)
+  local icon = spellCooldownPanel:getChildById(spellName)
   if not icon then
     icon = g_ui.createWidget('SpellIcon', spellCooldownPanel)
     icon:setId(spellName)
@@ -78,8 +102,8 @@ end
 function onSpellGroupCooldown(groupId, duration)
   if not SpellGroups[groupId] then return end
   
-  local icon = cooldownPanel:getChildById('groupIcon' .. SpellGroups[groupId])
-  local progressRect = cooldownPanel:getChildById('progressRect' .. SpellGroups[groupId])
+  local icon = contentsPanel:getChildById('groupIcon' .. SpellGroups[groupId])
+  local progressRect = contentsPanel:getChildById('progressRect' .. SpellGroups[groupId])
   if icon then
     icon:setOn(true)
     removeEvent(icon.event)
diff --git a/modules/game_cooldown/cooldown.otui b/modules/game_cooldown/cooldown.otui
index c7378df4..b66e0dad 100644
--- a/modules/game_cooldown/cooldown.otui
+++ b/modules/game_cooldown/cooldown.otui
@@ -3,6 +3,7 @@ SpellGroupIcon < UIWidget
   image-size: 22 22
   image-source: /game_cooldown/icons/cooldownIcons.png
   focusable: false
+  margin-top: 3
 
 SpellIcon < UIWidget
   size: 22 22 
@@ -18,87 +19,84 @@ SpellIcon < UIWidget
     anchors.left: parent.left
 
 SpellProgressRect < UIProgressRect
-  anchors.fill: parent
   background: #585858AA
   percent: 100
   focusable: false
   
-Panel
-  id: spellPanel
-  layout:
-    type: anchor
-  height: 28
-  width: 250
-  anchors.top: parent.top
-  anchors.left: parent.left
-  margin-top: 70
-  margin-left: 10
-  border-width: 1
-  border-color: #00000077
-  background-color: #ffffff11
-  focusable: false
-
-  SpellGroupIcon
-    id: groupIconAttack
-    image-clip: 0 0 20 20
-    anchors.top: parent.top
-    anchors.left: parent.left
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 0 20 20 20
+MiniWindow
+  id: cooldownWindow
+  !text: tr('Spell Cooldowns')
+  height: 85
+  icon: cooldown.png
+  @onClose: modules.game_cooldown.onMiniWindowClose()
+  &save: true
+  
+  MiniWindowContents
+    SpellGroupIcon
+      id: groupIconAttack
+      image-clip: 0 0 20 20
+      anchors.top: parent.top
+      anchors.left: parent.left
+      margin-left: 3
+      $on:
+        image-clip: 0 20 20 20
 
-  SpellProgressRect
-    id: progressRectAttack
-    anchors.fill: groupIconAttack
-    !tooltip: tr('Attack')
+    SpellProgressRect
+      id: progressRectAttack
+      anchors.fill: groupIconAttack
+      !tooltip: tr('Attack')
 
-  SpellGroupIcon
-    id: groupIconHealing
-    image-clip: 20 0 20 20
-    anchors.top: parent.top
-    anchors.left: groupIconAttack.right
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 20 20 20 20
+    SpellGroupIcon
+      id: groupIconHealing
+      image-clip: 20 0 20 20
+      anchors.top: parent.top
+      anchors.left: groupIconAttack.right
+      margin-left: 3
+      $on:
+        image-clip: 20 20 20 20
 
-  SpellProgressRect
-    id: progressRectHealing
-    anchors.fill: groupIconHealing
-    !tooltip: tr('Healing')
+    SpellProgressRect
+      id: progressRectHealing
+      anchors.fill: groupIconHealing
+      !tooltip: tr('Healing')
 
-  SpellGroupIcon
-    id: groupIconSupport
-    image-clip: 40 0 20 20
-    anchors.top: parent.top
-    anchors.left: groupIconHealing.right
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 40 20 20 20
+    SpellGroupIcon
+      id: groupIconSupport
+      image-clip: 40 0 20 20
+      anchors.top: parent.top
+      anchors.left: groupIconHealing.right
+      margin-left: 3
+      $on:
+        image-clip: 40 20 20 20
 
-  SpellProgressRect
-    id: progressRectSupport
-    anchors.fill: groupIconSupport
-    !tooltip: tr('Support')
+    SpellProgressRect
+      id: progressRectSupport
+      anchors.fill: groupIconSupport
+      !tooltip: tr('Support')
 
-  SpellGroupIcon
-    id: groupIconSpecial
-    image-clip: 60 0 20 20
-    anchors.top: parent.top
-    anchors.left: groupIconSupport.right
-    margin-top: 3
-    margin-left: 3
-    $on:
-      image-clip: 60 20 20 20
+    SpellGroupIcon
+      id: groupIconSpecial
+      image-clip: 60 0 20 20
+      anchors.top: parent.top
+      anchors.left: groupIconSupport.right
+      margin-left: 3
+      $on:
+        image-clip: 60 20 20 20
 
-  SpellProgressRect
-    id: progressRectSpecial
-    anchors.fill: groupIconSpecial
-    !tooltip: tr('Special')
+    SpellProgressRect
+      id: progressRectSpecial
+      anchors.fill: groupIconSpecial
+      !tooltip: tr('Special')
 
-  Panel
-    id: spellCooldownPanel
-    anchors.fill: parent
-    margin-left: 102
\ No newline at end of file
+    Panel
+      id: spellCooldownPanel
+      margin-top: 5
+      anchors.top: groupIconSpecial.bottom
+      anchors.left: parent.left
+      anchors.right: parent.right
+      height: 30
+      padding: 1
+      margin-left: 2
+      margin-right: 2
+      border: 1 #444444
+      
\ No newline at end of file
diff --git a/modules/game_cooldown/cooldown.png b/modules/game_cooldown/cooldown.png
new file mode 100644
index 0000000000000000000000000000000000000000..802aaf379e68b02f51494c0b7c4e797a32a0d9ea
GIT binary patch
literal 675
zcmV;U0$lxxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4`BcR4`BhQKc{H`000McNliru+zJg793iEQ=Ar-q0x(HL
zK~y-)t&qKr990lT&#l|Hf2OC$yBOKR#snZ|CUIcNPvRFKBP261&%gr^*un`piG>8A
z-+_pQ)vnFVbkB6(s=5v=u|o`BSSlTT-+}*_0Py_VZ@xcFS5I6=q6BcqN`_)Q`lA0G
zj{sydd{GuvHg_K7ufG27Sp~4&T|DWcK9(?2G(&+pR+Lcq^0W9@^Gqb8%Z}wZF<a!-
zFTWW;1u$+e7;ZIG;T`G|Aav~+Lc>`*W8n(1zmc?MJYMta&8O5N00@BF3}ot5*sOcn
zu4UD&5MX<KMUoGnYKfoTd_t8X;a`AU$Z8ztjHHIHUqi{5?l|9M?mxIoj6FZR?kUm{
zn++CD03c8T?%+j8^*~zPLF$41ZqMbPfAHdUB(*L5`8`Vfh^*msf)Nnvx+m2Q_(Z6L
z{`Lbte)yChe;q(7+To09bxv$INKE`Au@Imbu1E4QLQE7HiCxRfpAF=kDvh+mz_>qf
zn3b%{4FCcXg_IInpwQw+Me>#yd#YwliGr$9Y$i!XN~aCnDIO>u2?dHSm_|HiN;Q&J
zYv!ZkHWOTl!I5A$4vK@SGEIBt!ya8GBrLR@;27B!T#c?jBP(3L-I8-YogkPRc^O$r
zPdltX+*~m;gofp?B_yF#HB&aS%c;bOTR~^Yb-*m5*-@RSQX&M%d0}^XK~+}}psDK{
zz}<VFYo0F6>%e{qjDJm-I>jAH%G;fx3*-_IcdBL}#oqZp@*dHyBb+8+1-<|P002ov
JPDHLkV1ld%B>w;a

literal 0
HcmV?d00001