From 6aadf896da1da64fe79c0b0c80df876a024d3caa Mon Sep 17 00:00:00 2001
From: Eduardo Bart <edub4rt@gmail.com>
Date: Thu, 3 Nov 2011 20:28:10 -0200
Subject: [PATCH] move tooltip and messagebox to modules

---
 modules/core/core.otmod                       |  2 --
 modules/core_styles/styles/buttons.otui       | 12 +-----------
 modules/{core => }/messagebox/messagebox.lua  |  2 +-
 modules/messagebox/messagebox.otmod           | 12 ++++++++++++
 modules/{core => }/messagebox/messagebox.otui |  0
 modules/{core => }/tooltip/tooltip.lua        | 13 ++++++++++++-
 modules/tooltip/tooltip.otmod                 | 12 ++++++++++++
 modules/{core => }/tooltip/tooltip.otui       |  0
 8 files changed, 38 insertions(+), 15 deletions(-)
 rename modules/{core => }/messagebox/messagebox.lua (96%)
 create mode 100644 modules/messagebox/messagebox.otmod
 rename modules/{core => }/messagebox/messagebox.otui (100%)
 rename modules/{core => }/tooltip/tooltip.lua (75%)
 create mode 100644 modules/tooltip/tooltip.otmod
 rename modules/{core => }/tooltip/tooltip.otui (100%)

diff --git a/modules/core/core.otmod b/modules/core/core.otmod
index 57a52e66..b4886d92 100644
--- a/modules/core/core.otmod
+++ b/modules/core/core.otmod
@@ -17,7 +17,5 @@ Module
     require 'widget'
     require 'ui'
     require 'gfx'
-    require 'messagebox/messagebox'
-    require 'tooltip/tooltip'
     return true
 
diff --git a/modules/core_styles/styles/buttons.otui b/modules/core_styles/styles/buttons.otui
index e1f005ef..4551809c 100644
--- a/modules/core_styles/styles/buttons.otui
+++ b/modules/core_styles/styles/buttons.otui
@@ -23,17 +23,7 @@ Button < UIButton
     color: #999999
     background-color: #ffffff88
 
-ToolTipButton < UIButton
-  onHoverChange: |
-    function(self, hovered)
-      if hovered then
-        ToolTip.display(self:getStyle().tooltip)
-      else
-        ToolTip:hide()
-      end
-    end
-
-TopButton < ToolTipButton
+TopButton < UIButton
   background-color: white
   size: 26 25
   text-translate: 0 0
diff --git a/modules/core/messagebox/messagebox.lua b/modules/messagebox/messagebox.lua
similarity index 96%
rename from modules/core/messagebox/messagebox.lua
rename to modules/messagebox/messagebox.lua
index 6a213d64..74b34612 100644
--- a/modules/core/messagebox/messagebox.lua
+++ b/modules/messagebox/messagebox.lua
@@ -10,7 +10,7 @@ function MessageBox.create(title, text, flags)
   setmetatable(box, MessageBox)
 
   -- create messagebox window
-  local window = UI.loadAndDisplayLocked('/core/messagebox/messagebox.otui')
+  local window = UI.loadAndDisplayLocked('/messagebox/messagebox.otui')
   window:setTitle(title)
 
   local label = window:getChildById('messageBoxLabel')
diff --git a/modules/messagebox/messagebox.otmod b/modules/messagebox/messagebox.otmod
new file mode 100644
index 00000000..23da5c55
--- /dev/null
+++ b/modules/messagebox/messagebox.otmod
@@ -0,0 +1,12 @@
+Module
+  name: messagebox
+  description: Manages message boxes
+  author: OTClient team
+  website: https://github.com/edubart/otclient
+  autoLoad: true
+  dependencies:
+    - core
+
+  onLoad: |
+    require 'messagebox'
+    return true
diff --git a/modules/core/messagebox/messagebox.otui b/modules/messagebox/messagebox.otui
similarity index 100%
rename from modules/core/messagebox/messagebox.otui
rename to modules/messagebox/messagebox.otui
diff --git a/modules/core/tooltip/tooltip.lua b/modules/tooltip/tooltip.lua
similarity index 75%
rename from modules/core/tooltip/tooltip.lua
rename to modules/tooltip/tooltip.lua
index 66e84347..b2d54caa 100644
--- a/modules/core/tooltip/tooltip.lua
+++ b/modules/tooltip/tooltip.lua
@@ -16,11 +16,19 @@ local function moveToolTip(tooltip)
   tooltip:moveTo(pos)
 end
 
+local function onButtonHoverChange(button, hovered)
+  if hovered then
+    ToolTip.display(button:getStyle().tooltip)
+  else
+    ToolTip:hide()
+  end
+end
+
 -- public functions
 function ToolTip.display(text)
   ToolTip.hide()
   if text then
-    currentToolTip = UI.loadAndDisplay('/core/tooltip/tooltip.otui', UI.root)
+    currentToolTip = UI.loadAndDisplay('/tooltip/tooltip.otui', UI.root)
     currentToolTip.onMouseMove = moveToolTip
     local label = currentToolTip:getChildById('toolTipText')
     label:setText(text)
@@ -39,3 +47,6 @@ function ToolTip.hide()
     currentToolTip = nil
   end
 end
+
+-- hooks
+connect(UIButton, { onHoverChange = onButtonHoverChange})
diff --git a/modules/tooltip/tooltip.otmod b/modules/tooltip/tooltip.otmod
new file mode 100644
index 00000000..cfa5912f
--- /dev/null
+++ b/modules/tooltip/tooltip.otmod
@@ -0,0 +1,12 @@
+Module
+  name: tooltip
+  description: Enable tooltips on any button
+  author: OTClient team
+  website: https://github.com/edubart/otclient
+  autoLoad: true
+  dependencies:
+    - core
+
+  onLoad: |
+    require 'tooltip'
+    return true
diff --git a/modules/core/tooltip/tooltip.otui b/modules/tooltip/tooltip.otui
similarity index 100%
rename from modules/core/tooltip/tooltip.otui
rename to modules/tooltip/tooltip.otui