Merge branch 'master' into dev_local

diff --cc src/BusinessLogic/Engine.cpp
Simple merge

diff --cc src/BusinessLogic/Engine.h
Simple merge

diff --cc src/BusinessLogic/UIManager.cpp
Simple merge

diff --cc src/BusinessLogic/UIManager.h
Simple merge

diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
index 6573e28,dbc2b07..e3ba648
--- 1/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
--- 2/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
@@@ -137,27 -122,26 +142,49 @@@ void RoomStatusIndicatorWidget::statusC
                iUntilTextLabel->setText( tr( "until %1" ).arg( aUntil.toString( iTimeFormat ) ) );\r
        }\r
        setPalette( createPalette( aStatus ) );\r
+ }
+ \r
+ void RoomStatusIndicatorWidget::currentRoomChanged( Room *aRoom )\r
+ {\r
+       iDefaultRoomLabel->setText( aRoom->name() );\r
+ }\r
+ \r
+ bool RoomStatusIndicatorWidget::event(QEvent *event)\r
+ {\r
+       switch(event->type())\r
+       {\r
+               case QEvent::Paint:\r
+                       qDebug() << "[RoomStatusIndicatorWidget::event] <Paint event>";\r
+                       break;\r
+               case QEvent::PaletteChange:\r
+                       qDebug() << "[RoomStatusIndicatorWidget::event] <Palette change event>";\r
+                       break;\r
+               default:\r
+                       break;\r
+       }\r
+       \r
+       return ViewBase::event( event );\r
  }\r
 +\r
 +void RoomStatusIndicatorWidget::connectionEstablished()\r
 +{\r
 +      \r
 +      if( !connectedOnce )\r
 +      {\r
 +              // Just got the required meetings for the first time\r
 +              qDebug() << "RoomStatusIndicatorWidget::connectionEstablished() first call";\r
 +              iDefaultRoomLabel->setHidden( false );\r
 +              iUntilTextLabel->setHidden( false );\r
 +              iStatusLabel->setHidden( false );\r
 +      }\r
 +      else qDebug() << "RoomStatusIndicatorWidget::connectionEstablished()";\r
 +      ViewBase::connectionEstablished();\r
 +      iConnectionLabel->setHidden( true );\r
 +}\r
 +\r
 +void RoomStatusIndicatorWidget::connectionLost()\r
 +{\r
 +      ViewBase::connectionLost();\r
 +      iConnectionLabel->setHidden( false );\r
 +}\r
 +\r

diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.h
Simple merge