Merge branch 'master' of https://git.maemo.org/projects/qtmeetings

diff --combined src/BusinessLogic/UIManager.cpp
index 33fa209,be2f660..517a715
--- 1/src/BusinessLogic/UIManager.cpp
--- 2/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@@ -63,15 -63,6 +63,6 @@@ void UIManager::showMainView(
        iWindowManager->showView( iWeeklyView );
  }
  
- void UIManager::showProgressBar( QString aText )
- {
-       if ( iProgressBar != 0 )
-       {
-               iProgressBar->update( aText );
-               iWindowManager->showDialog( iProgressBar );
-       }
- }
- 
  // ===============================================
  //            INITIALIZE THE UIMANAGER
  void UIManager::createWeeklyView()
@@@ -98,17 -89,12 +89,16 @@@ void UIManager::createSettingsView(
  
  void UIManager::createRoomStatusIndicator()
  {
 -      iRoomStatusIndicator = new RoomStatusIndicatorWidget( iEngine->defaultRoom(), Room::FreeStatus, QTime::currentTime(), iEngine->iConfiguration->displaySettings()->dateFormat() );
 +      iRoomStatusIndicator = new RoomStatusIndicatorWidget( iEngine->defaultRoom(), Room::FreeStatus, QTime::currentTime().addSecs(100000000), iEngine->iConfiguration->displaySettings()->timeFormat() );
 +      
 +      // Connect engine signals
 +      connect( iEngine, SIGNAL( roomStatusChanged( Room::Status, QTime ) ), iRoomStatusIndicator, SLOT( statusChanged( Room::Status, QTime ) ) );
 +      connect( iWeeklyView, SIGNAL( currentRoomChanged( Room * ) ), iRoomStatusIndicator, SLOT( currentRoomChanged( Room * ) ) );
  }
  
  void UIManager::createPasswordDialog()
  {
-       iPasswordDialog = new PasswordDialog( iEngine->iConfiguration->adminPassword(), tr("UIManager::createPasswordDialog"), tr("UIManager::createPasswordDialog") );
-       
+       iPasswordDialog = new PasswordDialog( iEngine->iConfiguration->adminPassword(), "", tr("Enter password") );
        connect( iPasswordDialog, SIGNAL( passwordEntered( PasswordDialog::PasswordStatus ) ), this, SLOT( passwordEntered( PasswordDialog::PasswordStatus ) ) );
  }
  
@@@ -177,7 -163,8 +167,8 @@@ void UIManager::showMeetingProgressBar
  {
        if ( iProgressBar != 0 )
        {
-               iProgressBar->update( tr("Fetching meeting info...") );
+               iProgressBar->update( tr( "Fetching meeting info..." ), tr( "Please wait" ) );
+               iProgressBar->toggleCancellable( true );
                iWindowManager->showDialog( static_cast<QDialog *>( iProgressBar ), false, false );
                iEngine->stopIdleTimeCounter();
        }
@@@ -192,10 -179,8 +183,10 @@@ void UIManager::meetingDetailsFetched(M
                {
                        iProgressBar->close(); // Close it in case it's visible
                }
 +              iEngine->stopIdleTimeCounter(); // Timer restarted when the dialog is dismissed.
                MeetingInfoDialog *tmp = new MeetingInfoDialog( &aDetailedMeeting );
                iWindowManager->showDialog( static_cast<QDialog *>( tmp ) );
 +              
  // TODO : We should use the member variable and implement correctly the setMeeting() method !!!
  //            iMeetingInfo->setMeeting( &aDetailedMeeting );
  //            iWindowManager->showDialog( static_cast<QDialog *>( iMeetingInfo ) );
@@@ -228,13 -213,12 +219,12 @@@ void UIManager::progressBarCancelled(
  void UIManager::changeModeOrdered( DeviceManager::OperationMode aMode )
  {
        qDebug() << "[UIManager::changeModeOrdered] <Invoked>";
  
        if ( iPasswordDialog != 0 )
        {
-               // TODO : Set the new text for password dialog
+               QString text = tr( "You are about to change operation mode to %1." )
+                                               .arg( iEngine->iDevice->operationModeToString( aMode ) );
+               iPasswordDialog->update( text );
                iWindowManager->showDialog( static_cast<QDialog *>( iPasswordDialog ) );
        }
  }
@@@ -256,10 -240,6 +246,10 @@@ void UIManager::updateTime(QDateTime aD
        {
                iWeeklyView->setCurrentDateTime( aDateTime );
        }
 +      if ( iRoomStatusIndicator != 0 )
 +      {
 +              iRoomStatusIndicator->setCurrentTime( aDateTime.time() );
 +      }
  }
  
  void UIManager::passwordEntered( PasswordDialog::PasswordStatus aStatus )
@@@ -270,6 -250,8 +260,8 @@@
                        // Show the progress bar..
                        if ( iProgressBar != 0 )
                        {
+                               iProgressBar->update( tr( "" ), tr( "Changing operation mode" ) );
+                               iProgressBar->toggleCancellable( false );
                                iWindowManager->showDialog( static_cast<QDialog *>( iProgressBar ), false );
                        }
                        // ... and initiate the mode changing