Changeset 7398 for code/branches/notifications/data/gui

Timestamp:

Sep 10, 2010, 7:50:06 PM (14 years ago)

Author:

dafrick

Message:

Done some selective testing and it finally seems to work.

File:

• code/branches/notifications/data/gui/scripts/NotificationLayer.lua (modified) (9 diffs)

code/branches/notifications/data/gui/scripts/NotificationLayer.lua

@@ -40 +40 @@
         winMgr:destroyWindow(queue.window)
     end
-    queue = nil
+    P.queueList[name] = nil
 end
 
@@ -194 +194 @@
     window = winMgr:createWindow("MenuWidgets/FrameWindow", "orxonox/NotificationLayer/Root/EditMode/" .. name)
     local frame = tolua.cast(window, "CEGUI::FrameWindow")
-    frame:setCloseButtonEnabled(false)
+    frame:setCloseButtonEnabled(true)
+    orxonox.GUIManager:subscribeEventHelper(frame, "CloseClicked", P.name .. ".closeQueue_clicked")
     frame:setText("NotificationQueue \"" .. name .. "\"")
     root:addChildWindow(window)
@@ -221 +222 @@
     targets:setSize(CEGUI.UVector2(CEGUI.UDim(0, size[2]*2+20), CEGUI.UDim(0, textHeight)))
     targets:setPosition(CEGUI.UVector2(CEGUI.UDim(0, horzOffset), CEGUI.UDim(0, vertOffset)))
-    cout(0, horzOffset .. "|" .. targets:getXPosition():asAbsolute(1) .. "|" .. size[2]*2+20)
     horzOffset = horzOffset + size[2]*2+20 + 5
     pane:addChildWindow(targets)
@@ -231 +231 @@
     save:setSize(CEGUI.UVector2(CEGUI.UDim(0, saveTextWidth), CEGUI.UDim(0, textHeight)))
     save:setPosition(CEGUI.UVector2(CEGUI.UDim(0, horzOffset), CEGUI.UDim(0, vertOffset)))
-    cout(0, horzOffset .. "|" .. save:getXPosition():asAbsolute(1))
     orxonox.GUIManager:subscribeEventHelper(save, "Clicked", P.name .. ".saveTargets_clicked")
     pane:addChildWindow(save)
@@ -335 +334 @@
     local window = winMgr:getWindow("orxonox/NotificationLayer/Root/EditMode/" .. queueName .. "/Targets")
     local save = winMgr:getWindow("orxonox/NotificationLayer/Root/EditMode/" .. queueName .. "/Targets/Save")
-    local width = window:getXPosition():asAbsolute(1)
+    local width = window:getWidth():asAbsolute(1)
 
     local queue = orxonox.NotificationManager:getInstance():getQueue(queueName)
@@ -345 +344 @@
     local size = getMinTextSize(P.sampleWindow)
     window:setWidth(CEGUI.UDim(0, size[2]*2+20))
-    cout(0, width .. "|" .. size[2]*2+20 .. "|" .. window:getWidth():asAbsolute(1) .. "|" .. save:getXPosition():asAbsolute(1))
     save:setXPosition(CEGUI.UDim(0, save:getXPosition():asAbsolute(1)-width+window:getWidth():asAbsolute(1)))
 end
@@ -359 +357 @@
     local window = winMgr:getWindow("orxonox/NotificationLayer/Root/EditMode/" .. queueName .. "/Size")
     local save = winMgr:getWindow("orxonox/NotificationLayer/Root/EditMode/" .. queueName .. "/Size/Save")
-    local width = window:getXPosition():asAbsolute(1)
+    local width = window:getWidth():asAbsolute(1)
 
     local queue = orxonox.NotificationManager:getInstance():getQueue(queueName)
@@ -382 +380 @@
     local window = winMgr:getWindow("orxonox/NotificationLayer/Root/EditMode/" .. queueName .. "/DisplayTime")
     local save = winMgr:getWindow("orxonox/NotificationLayer/Root/EditMode/" .. queueName .. "/DisplayTime/Save")
-    local width = window:getXPosition():asAbsolute(1)
+    local width = window:getWidth():asAbsolute(1)
 
     local queue = orxonox.NotificationManager:getInstance():getQueue(queueName)
@@ -417 +415 @@
 function P.leaveEditMode_clicked(e)
     hideMenuSheet(P.name)
+end
+
+function P.closeQueue_clicked(e)
+    local we = CEGUI.toWindowEventArgs(e)
+    local name = we.window:getName()
+
+    local match = string.gmatch(name, "EditMode/.*")
+    local nameStr = match()
+    local queueName = string.sub(nameStr, 10, string.len(nameStr))
+
+    winMgr:destroyWindow(P.queueList[queueName].edit)
+    P.queueList[queueName].edit = nil
+    orxonox.NotificationManager:getInstance():getQueue(queueName):destroy()
 end