Changeset 7354 for code/branches/notifications/data

Timestamp:

Sep 5, 2010, 12:42:54 PM (14 years ago)

Author:

dafrick

Message:

Started work on edit mode. ConsoleCommand is not yet working.
Some additional cleanup. All the NotificationQueues generated by the NotificationManager now are destroyed upon destruction of the NotificationManager.
Removed NotificationQueue from level files.

Location:

code/branches/notifications/data

Files:

• gui/scripts/NotificationLayer.lua (modified) (2 diffs)
• levels/Fight in our Back.oxw (modified) (1 diff)
• levels/Quest_PirateAttack.oxw (modified) (1 diff)
• levels/old/princessaeryn.oxw (modified) (1 diff)
• levels/old/questsystem.oxw (modified) (1 diff)
• levels/princessaeryn.oxw (modified) (1 diff)
• levels/tutorial.oxw (modified) (1 diff)

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

@@ -6 +6 @@
 P.nameList = {}
 P.visible = nil
+P.editMode = false
+P.editList = {}
 
 function P.createQueue(name, size)
     local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
     local queue = winMgr:createWindow("MenuWidgets/Listbox", "orxonox/NotificationLayer/Root/Queue/" .. name)
-    queue:setProperty("BackgroundColor", "66FFFFFF")
+    queue:setProperty("BackgroundColor", "00FFFFFF")
     root:addChildWindow(queue)
 
@@ -123 +125 @@
 end
 
+function P.enterEditMode()
+    P.editMode = true
+
+    local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
+    --Replace all queues with FrameWindows
+    for k,v in pairs(P.queueList) do
+        if v ~= nil then
+            root:removeChildWindow(v)
+            local frame = winMgr:createWindow("MenuWidgets/FrameWindow", "orxonox/NotificationLayer/Root/EditMode/" .. P.nameList(k))
+            frame:setArea(v:getArea())
+            P.editList[k] = frame
+        end
+    end
+end
+
+function P.leaveEditMode()
+    P.editMode = false
+
+    local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
+    --Replace all queues with FrameWindows
+    for k,v in pairs(P.queueList) do
+        if v ~= nil then
+            root:addChildWindow(v)
+            v:setArea(P.editList[k]:getArea())
+            winMgr:destroyWindow(P.editList[k])
+            P.editList[k] = nil
+        end
+    end
+end
+
+function P.onHide()
+    if P.editMode then
+        P.leaveEditMode()
+    end
+end
+
 function P.nameToQueueHelper(name)
     local queue = nil

code/branches/notifications/data/levels/Fight in our Back.oxw

@@ -7 +7 @@
     include("templates/spaceship_Transporter.oxt")
 ?>
-
-<NotificationQueue
-    name     = "notification"
-    position = "0.40, 0.05"
-    font     = "VeraMono"
-    textsize = 0.020
-    length   = 3
-    width    = 50
-/>
 
 <!--*****************************************************************************************************************************************************************************************-->

code/branches/notifications/data/levels/Quest_PirateAttack.oxw

@@ -19 +19 @@
     dofile("includes/CuboidSpaceStation.lua")
 ?>
-
-<NotificationQueue
-     name     = "notification"
-     position = "0.40, 0.05"
-     font     = "VeraMono"
-     textsize = 0.020
-     length   = 3
-     width    = 50
-/>
-    
-    
     
 <Level

code/branches/notifications/data/levels/old/princessaeryn.oxw

@@ -8 +8 @@
     dofile("includes/CuboidSpaceStation.lua")
 ?>
-
-<NotificationQueue
- name  = "notification"
- position = "1.0, 1.0"
- targets = "questsystem"
-/>
 
 <Level

code/branches/notifications/data/levels/old/questsystem.oxw

@@ -4 +4 @@
   include("templates/spaceship_assff.oxt")
 ?>
-
-<NotificationQueue
- name  = "notification"
- position = "1.0, 1.0"
- targets = "all"
-/>
 
 <Level

code/branches/notifications/data/levels/princessaeryn.oxw

@@ -14 +14 @@
  description  = "The Tale of Princess Aeryn"
 >
-
-  <NotificationQueue
-   name   = "notification"
-   position = "0.55, 0.05"
-   font   = "VeraMono"
-   textsize = 0.020
-   length   = 3
-   width  = 50
-  />
 
   <templates>

code/branches/notifications/data/levels/tutorial.oxw

@@ -13 +13 @@
     <Template link=lodtemplate_default />
   </templates>
-
-  <NotificationQueue
-   name   = "notification"
-   position = "0.05, 0.05"
-   font   = "VeraMono"
-   textsize = 0.020
-   length   = 3
-   width  = 50
-  />
 
   <Scene