Changeset 7362

Timestamp:

Sep 5, 2010, 11:11:22 PM (14 years ago)

Author:

dafrick

Message:

NotificationQueue can now be moved in edit mode.

Location:

code/branches/notifications

Files:

• data/gui/scripts/NotificationLayer.lua (modified) (2 diffs)
• src/modules/notifications/NotificationManager.cc (modified) (3 diffs)

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

@@ -133 +133 @@
         if v ~= nil then
             root:removeChildWindow(v)
-            local frame = winMgr:createWindow("MenuWidgets/FrameWindow", "orxonox/NotificationLayer/Root/EditMode/" .. P.nameList(k))
+            local frame = winMgr:createWindow("MenuWidgets/FrameWindow", "orxonox/NotificationLayer/Root/EditMode/" .. P.nameList[k])
             frame:setArea(v:getArea())
+            root:addChildWindow(frame)
             P.editList[k] = frame
         end
@@ -153 +154 @@
         end
     end
+
+    showMenuSheet(P.name, false, true)
 end
 

code/branches/notifications/src/modules/notifications/NotificationManager.cc

@@ -64 +64 @@
         this->highestIndex_ = 0;
 
+        ModifyConsoleCommand("enterEditMode").setObject(this);
+
         if(GameMode::showsGraphics())
         {
@@ -79 +81 @@
     NotificationManager::~NotificationManager()
     {
-        
+        ModifyConsoleCommand("enterEditMode").setObject(NULL);
     }
 
@@ -310 +312 @@
     void NotificationManager::enterEditMode(void)
     {
+        GUIManager::getInstance().hideGUI("NotificationLayer");
+        GUIManager::getInstance().showGUI("NotificationLayer", false, false);
         GUIManager::getInstance().getLuaState()->doString("NotificationLayer.enterEditMode()");
     }