Changeset 11347 for code/branches/Presentation_HS16/src/modules

Timestamp:

Dec 19, 2016, 8:15:56 AM (8 years ago)

Author:

maxima

Message:

dialog branch merged to presentation

Location:

code/branches/Presentation_HS16

Files:

• . (modified) (1 prop)
• src/modules/notifications/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/NotificationDispatcher.h (modified) (1 diff)
• src/modules/notifications/NotificationManager.h (modified) (2 diffs)
• src/modules/notifications/dispatchers/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/dispatchers/Dialogue.cc (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.cc)
• src/modules/notifications/dispatchers/Dialogue.h (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h)
• src/modules/notifications/dispatchers/DialogueManager.cc (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/DialogueManager.cc)
• src/modules/notifications/dispatchers/DialogueManager.h (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/DialogueManager.h)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDDialogue.cc (copied) (copied from code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.cc)
• src/modules/overlays/hud/HUDDialogue.h (copied) (copied from code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.h)

code/branches/Presentation_HS16/src/modules/notifications/CMakeLists.txt

@@ -17 +17 @@
     NotificationsPrecompiledHeaders.h
   LINK_LIBRARIES
+    overlays
     orxonox
   SOURCE_FILES ${NOTIFICATIONS_SRC_FILES}

code/branches/Presentation_HS16/src/modules/notifications/NotificationDispatcher.h

@@ -126 +126 @@
             virtual const std::string& createNotificationMessage(void)
                 { return BLANKSTRING; }
+            
 
     };

code/branches/Presentation_HS16/src/modules/notifications/NotificationManager.h

@@ -77 +77 @@
             inline const std::string & getMessage(void) const
                 { return this->message_; }
-
             /**
             @brief Get the sender of the Notification.
@@ -94 +93 @@
         private:
             std::string message_; //!< The Notification message.
-            std::string sender_; //!< The sender of the notification.
+            std::string sender_;//!< The sender of the notifications.
             NotificationMessageType type_; //!< The type of the notification.
 

code/branches/Presentation_HS16/src/modules/notifications/dispatchers/CMakeLists.txt

@@ -2 +2 @@
   CommandNotification.cc
   SimpleNotification.cc
+  Dialogue.cc
 )

code/branches/Presentation_HS16/src/modules/overlays/hud/CMakeLists.txt

@@ -27 +27 @@
   LastTeamStandingInfos.cc
   CountDown.cc
+  HUDDialogue.cc
 )