[Orxonox-commit 2644] r7349 - in code/branches/notifications: data/gui/scripts src/modules/notifications

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-09-04 17:25:36 +0200 (Sat, 04 Sep 2010)
New Revision: 7349

Modified:
   code/branches/notifications/data/gui/scripts/NotificationLayer.lua
   code/branches/notifications/src/modules/notifications/NotificationManager.cc
   code/branches/notifications/src/modules/notifications/NotificationManager.h
   code/branches/notifications/src/modules/notifications/NotificationQueue.cc
   code/branches/notifications/src/modules/notifications/NotificationQueue.h
Log:
Making the background of the NotificationQueue transparent. (Had to change/update TaharezLook look'n'feel file, so don't forget to update data_extern as well...)
Removing some obsolete includes and a warning.


Modified: code/branches/notifications/data/gui/scripts/NotificationLayer.lua
===================================================================
--- code/branches/notifications/data/gui/scripts/NotificationLayer.lua	2010-09-04 07:33:42 UTC (rev 7348)
+++ code/branches/notifications/data/gui/scripts/NotificationLayer.lua	2010-09-04 15:25:36 UTC (rev 7349)
@@ -8,8 +8,7 @@
 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("Alpha", 0.3)
-    queue:setProperty("InheritsAlpha", "setFalse")
+    queue:setProperty("BackgroundColor", "00FFFFFF")
     root:addChildWindow(queue)
 
     queue:setPosition(CEGUI.UVector2(CEGUI.UDim(0, 0), CEGUI.UDim(0, 0)))

Modified: code/branches/notifications/src/modules/notifications/NotificationManager.cc
===================================================================
--- code/branches/notifications/src/modules/notifications/NotificationManager.cc	2010-09-04 07:33:42 UTC (rev 7348)
+++ code/branches/notifications/src/modules/notifications/NotificationManager.cc	2010-09-04 15:25:36 UTC (rev 7349)
@@ -33,13 +33,11 @@
 
 #include "NotificationManager.h"
 
-#include <set>
-
-#include "util/ScopedSingletonManager.h"
 #include "core/CoreIncludes.h"
-#include "Notification.h"
-#include "interfaces/NotificationListener.h"
 #include "core/GUIManager.h"
+#include "util/ScopedSingletonManager.h"
+#include "interfaces/NotificationListener.h"
+#include "Notification.h"
 #include "NotificationQueue.h"
 
 namespace orxonox
@@ -65,7 +63,7 @@
             GUIManager::getInstance().loadGUI("NotificationLayer");
 
             // Create first queue:
-            NotificationQueue* queue = new NotificationQueue("all");
+            this->queue_ = new NotificationQueue("all");
         }
     }
 
@@ -75,7 +73,7 @@
     */
     NotificationManager::~NotificationManager()
     {
-
+        this->queue_->destroy();
     }
 
     /**

Modified: code/branches/notifications/src/modules/notifications/NotificationManager.h
===================================================================
--- code/branches/notifications/src/modules/notifications/NotificationManager.h	2010-09-04 07:33:42 UTC (rev 7348)
+++ code/branches/notifications/src/modules/notifications/NotificationManager.h	2010-09-04 15:25:36 UTC (rev 7349)
@@ -82,6 +82,8 @@
         private:
             static NotificationManager* singletonPtr_s;
 
+            NotificationQueue* queue_; //!< Initial, first, NotificationQueue.
+
             int highestIndex_; //!< This variable holds the highest index (resp. key) in notificationLists_s, to secure that no key appears twice.
 
             std::multimap<std::time_t,Notification*> allNotificationsList_; //!< Container where all notifications are stored.

Modified: code/branches/notifications/src/modules/notifications/NotificationQueue.cc
===================================================================
--- code/branches/notifications/src/modules/notifications/NotificationQueue.cc	2010-09-04 07:33:42 UTC (rev 7348)
+++ code/branches/notifications/src/modules/notifications/NotificationQueue.cc	2010-09-04 15:25:36 UTC (rev 7349)
@@ -33,12 +33,12 @@
 
 #include "NotificationQueue.h"
 
-#include <algorithm>
+#include <map>
 
-#include "util/Convert.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
 #include "core/LuaState.h"
+#include "util/Convert.h"
 #include "Notification.h"
 
 namespace orxonox

Modified: code/branches/notifications/src/modules/notifications/NotificationQueue.h
===================================================================
--- code/branches/notifications/src/modules/notifications/NotificationQueue.h	2010-09-04 07:33:42 UTC (rev 7348)
+++ code/branches/notifications/src/modules/notifications/NotificationQueue.h	2010-09-04 15:25:36 UTC (rev 7349)
@@ -37,14 +37,12 @@
 #include "notifications/NotificationsPrereqs.h"
 
 #include <ctime>
-#include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "util/Math.h"
-#include "core/OrxonoxClass.h"
 #include "tools/interfaces/Tickable.h"
+#include "util/Math.h"
 #include "interfaces/NotificationListener.h"
 #include "NotificationManager.h"