Merge branch 'master' into dev_local

Conflicts:
	src/BusinessLogic/UIManager.h

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

diff --cc src/BusinessLogic/UIManager.cpp
index a540f96,96251a1..1c8345b
--- 1/src/BusinessLogic/UIManager.cpp
--- 2/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@@ -237,24 -233,9 +233,25 @@@ void UIManager::changeModeOrdered( Devi
        }
  }
  
 +void UIManager::connectionLost()
 +{
 +      qDebug() << "UIManager::connectionLost()";
 +      iWeeklyView->connectionLost();
 +      iSettingsView->connectionLost();
 +      iRoomStatusIndicator->connectionLost();
 +}
 +
 +void UIManager::connectionEstablished()
 +{
 +      qDebug() << "UIManager::connectionEstablished()";
 +      iWeeklyView->connectionEstablished();
 +      iSettingsView->connectionEstablished();
 +      iRoomStatusIndicator->connectionEstablished();
 +}
 +
  void UIManager::currentRoomChanged(Room *aRoom)
  {
+       qDebug() << "[UIManager::currentRoomChanged] <Invoked>";
        if ( iWeeklyView != 0 )
        {
                QDateTime from = QDateTime( iWeeklyView->beginnigOfShownWeek() );

diff --cc src/BusinessLogic/UIManager.h
index 6721510,b2ef8e5..8d47f86
--- 1/src/BusinessLogic/UIManager.h
--- 2/src/BusinessLogic/UIManager.h
+++ b/src/BusinessLogic/UIManager.h
@@@ -35,18 -62,47 +62,54 @@@ signals
        
  public slots:
  
+       //! Handles setting view request.
+       /*!
+        * Handles request to show settings view. Makes the
+        * view visible and stops the idle time counter.
+        */
        void settingsViewRequest();
+       //! Handles setting views ok clicked.
+       /*!
+        * Handles the setting views Ok button clicked
+        * signal. Sets the weekly view visible and starts
+        * the idle time counter.
+        */
        void settingsOkClicked();
+       //! Handles room status indicator view request.
+       /*!
+        * Handles the request to show room status indicator
+        * view. Sets the view visible and stops the idle
+        * time counter. The WindowManager handles restoring
+        * what ever view was previously visible.
+        */
        void roomStatusIndicatorRequested();
+       //! Handles previousViewRestored signal.
+       /*!
+        * Handles the restoring of previous view. This is usually
+        * signaled by WindowManager when room status indicator
+        * view is being hidden.
+        */
        void previousViewRestored();
+       //! Handle change mode order.
+       /*!
+        * Handles change mode order. Displays the password query dialog
+        * and waits for its response.
+        */
        void changeModeOrdered( DeviceManager::OperationMode aMode );
+       //! Handles select room change.
+       /*!
+        * Handles the changing of currently select room. Engine is requested
+        * to start fetching new meetings for currently shown week.
+        */
+       void currentRoomChanged( Room *aRoom );
 +
 +      //! Shows any view specific indicators for connection error
 +      void connectionLost();
 +      
 +      //! Removes any view specific indicators for connection error
 +      void connectionEstablished();
 +      
+       
  private slots:
  
        void meetingsFetched( const QList<Meeting*> &aMeetings );

diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
index 60d9253,c903bc0..6573e28
--- 1/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
--- 2/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
@@@ -138,24 -118,3 +138,26 @@@ void RoomStatusIndicatorWidget::statusC
        }\r
        setPalette( createPalette( aStatus ) );\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/ViewBase.cpp
index 902f177,24d6461..14c51aa
--- 1/src/UserInterface/Views/ViewBase.cpp
--- 2/src/UserInterface/Views/ViewBase.cpp
+++ b/src/UserInterface/Views/ViewBase.cpp
@@@ -12,7 -12,7 +12,8 @@@
  
  ViewBase::ViewBase( ViewBase::ViewMode aMode, QWidget *aParent ) : QWidget( aParent ), iViewMode( aMode )
  {
--
++      connectedOnce = false;
++      connectionError = false;
  }
  
  ViewBase::~ViewBase()