Changeset 8378 for code/branches/tutoriallevel2

Timestamp:

May 2, 2011, 1:58:12 PM (14 years ago)

Author:

dafrick

Message:

Notification text alignment can be set per queue.

Location:

code/branches/tutoriallevel2

Files:

• data/gui/scripts/NotificationLayer.lua (modified) (4 diffs)
• src/modules/notifications/NotificationManager.cc (modified) (1 diff)
• src/orxonox/interfaces/NotificationListener.h (modified) (4 diffs)

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

@@ -32 +32 @@
         ["fontSize"]  = 12,
         ["fontColor"] = "FFFFFFFF",
+        ["alignment"] = "LeftAligned",
         ["items"]     = {},
         ["first"]     = 1,
@@ -79 +80 @@
     item:setProperty("BackgroundEnabled", "false")
     item:setProperty("FrameEnabled", "false")
+    item:setProperty("HorzFormatting", queue.alignment)
     queue.items[queue.last] = item
     queue.last = queue.last+1
@@ -215 +217 @@
 end
 
+function P.changeQueueAlignment(queueName, alignment)
+    local queue = P.queueList[queueName]
+    local queueWindow = queue.window
+    if queueWindow == nil then
+        return
+    end
+    
+    queue.alignment = alignment
+    local item = nil
+    for i=queue.first,queue.last-1 do
+        item = queue.items[i]
+        item:setProperty("HorzFormatting", queue.alignment)
+    end
+end
+
 -- Helper function to set the font size and color of a item of a queue.
 -- The parameters are (in order) 'the ListboxItem', 'the queue table', 'whether color should be changed as well'
@@ -228 +245 @@
     if changeColor then
         item:setProperty("TextColours", "tl:" .. queue.fontColor .. " tr:" .. queue.fontColor .. " bl:" .. queue.fontColor .. " br:" .. queue.fontColor .. "")
-        cout(0, "tl:[" .. queue.fontColor .. "] tr:[" .. queue.fontColor .. "] bl:[" .. queue.fontColor .. "] br:[" .. queue.fontColor .. "]")
     end
 end

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

@@ -367 +367 @@
         GUIManager::getInstance().getLuaState()->doString("NotificationLayer.resizeQueue(\"info\", 0.6, 0, " + multi_cast<std::string>(infoQueue->getMaxSize()) + ")");
         GUIManager::getInstance().getLuaState()->doString("NotificationLayer.moveQueue(\"info\", 0.2, 0, 0.8, 0)");
+        GUIManager::getInstance().getLuaState()->doString("NotificationLayer.changeQueueAlignment(\"info\", \"HorzCentred\")");
     }
 

code/branches/tutoriallevel2/src/orxonox/interfaces/NotificationListener.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Damian 'Mozork' Frick
  *   Co-authors:
  *      ...
@@ -66 +66 @@
     }
 
+    // TODO: Update doc.
     /**
     @brief
@@ -74 +75 @@
 
     @author
-        Fabian 'x3n' Landau
-
+        Damian 'Mozork' Frick
+        
     @ingroup Notifications
     */
@@ -90 +91 @@
             static void sendNotificationHelper(const std::string& message, const std::string& sender, unsigned int messageMode);
             
-            virtual bool registerNotification(const std::string& message, const std::string& sender)
-                { return false; }
+            virtual bool registerNotification(const std::string& message, const std::string& sender) { return false; }
             virtual void executeCommand(const std::string& command, const std::string& sender) {}
     };