Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7349 for code


Ignore:
Timestamp:
Sep 4, 2010, 5:25:36 PM (14 years ago)
Author:
dafrick
Message:

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.

Location:
code/branches/notifications
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/notifications/data/gui/scripts/NotificationLayer.lua

    r7343 r7349  
    99    local root = winMgr:getWindow("orxonox/NotificationLayer/Root")
    1010    local queue = winMgr:createWindow("MenuWidgets/Listbox", "orxonox/NotificationLayer/Root/Queue/" .. name)
    11     queue:setProperty("Alpha", 0.3)
    12     queue:setProperty("InheritsAlpha", "setFalse")
     11    queue:setProperty("BackgroundColor", "00FFFFFF")
    1312    root:addChildWindow(queue)
    1413
  • code/branches/notifications/src/modules/notifications/NotificationManager.cc

    r7341 r7349  
    3434#include "NotificationManager.h"
    3535
    36 #include <set>
    37 
     36#include "core/CoreIncludes.h"
     37#include "core/GUIManager.h"
    3838#include "util/ScopedSingletonManager.h"
    39 #include "core/CoreIncludes.h"
     39#include "interfaces/NotificationListener.h"
    4040#include "Notification.h"
    41 #include "interfaces/NotificationListener.h"
    42 #include "core/GUIManager.h"
    4341#include "NotificationQueue.h"
    4442
     
    6664
    6765            // Create first queue:
    68             NotificationQueue* queue = new NotificationQueue("all");
     66            this->queue_ = new NotificationQueue("all");
    6967        }
    7068    }
     
    7674    NotificationManager::~NotificationManager()
    7775    {
    78 
     76        this->queue_->destroy();
    7977    }
    8078
  • code/branches/notifications/src/modules/notifications/NotificationManager.h

    r7338 r7349  
    8383            static NotificationManager* singletonPtr_s;
    8484
     85            NotificationQueue* queue_; //!< Initial, first, NotificationQueue.
     86
    8587            int highestIndex_; //!< This variable holds the highest index (resp. key) in notificationLists_s, to secure that no key appears twice.
    8688
  • code/branches/notifications/src/modules/notifications/NotificationQueue.cc

    r7343 r7349  
    3434#include "NotificationQueue.h"
    3535
    36 #include <algorithm>
    37 
    38 #include "util/Convert.h"
     36#include <map>
     37
    3938#include "core/CoreIncludes.h"
    4039#include "core/GUIManager.h"
    4140#include "core/LuaState.h"
     41#include "util/Convert.h"
    4242#include "Notification.h"
    4343
  • code/branches/notifications/src/modules/notifications/NotificationQueue.h

    r7343 r7349  
    3838
    3939#include <ctime>
    40 #include <map>
    4140#include <set>
    4241#include <string>
    4342#include <vector>
    4443
     44#include "tools/interfaces/Tickable.h"
    4545#include "util/Math.h"
    46 #include "core/OrxonoxClass.h"
    47 #include "tools/interfaces/Tickable.h"
    4846#include "interfaces/NotificationListener.h"
    4947#include "NotificationManager.h"
Note: See TracChangeset for help on using the changeset viewer.