X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2FBusinessLogic%2FUIManager.cpp;h=7d697e8ed4665611c400a3d7f8abd22d96b058fa;hb=81d3e60d0265fdb330388ed9e358b524c56ab310;hp=54ee8653456fe2b0a5355da99a16243750b309d8;hpb=24cdf6f4ca42fff4f197fcedc5ac460cbb515c64;p=qtmeetings

diff --git a/src/BusinessLogic/UIManager.cpp b/src/BusinessLogic/UIManager.cpp
index 54ee865..7d697e8 100644
--- a/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@ -89,11 +89,7 @@ void UIManager::createSettingsView()
 
 void UIManager::createRoomStatusIndicator()
 {
-	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 * ) ) );
+	iRoomStatusIndicator = new RoomStatusIndicatorWidget( iEngine->defaultRoom(), Room::FreeStatus, QTime::currentTime(), iEngine->iConfiguration->displaySettings()->dateFormat() );
 }
 
 void UIManager::createPasswordDialog()
@@ -105,7 +101,6 @@ void UIManager::createPasswordDialog()
 void UIManager::createProgressBar()
 {
 	iProgressBar = new ProgressBar( tr("CHANGE THIS"), true );
-	
 	// Connect to UIManager
 	connect( iProgressBar, SIGNAL( cancel() ), this, SLOT( progressBarCancelled() ) );
 	// Connect to Engine
@@ -182,10 +177,8 @@ void UIManager::meetingDetailsFetched(Meeting &aDetailedMeeting)
 		{
 			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 ) );
@@ -244,10 +237,6 @@ void UIManager::updateTime(QDateTime aDateTime)
 	{
 		iWeeklyView->setCurrentDateTime( aDateTime );
 	}
-	if ( iRoomStatusIndicator != 0 )
-	{
-		iRoomStatusIndicator->setCurrentTime( aDateTime.time() );
-	}
 }
 
 void UIManager::passwordEntered( PasswordDialog::PasswordStatus aStatus )
@@ -263,12 +252,12 @@ void UIManager::passwordEntered( PasswordDialog::PasswordStatus aStatus )
 				iWindowManager->showDialog( static_cast<QDialog *>( iProgressBar ), false, false );
 			}
 			// ... and initiate the mode changing
-			iEngine->changeDeviceMode( true );
+			iEngine->changeDeviceMode();
 			break;
 		case PasswordDialog::Incorrect:
 			iWindowManager->error( tr("Incorrect Password") );
+			break;
 		case PasswordDialog::Canceled:
-			iEngine->changeDeviceMode( false );
 			break;
 	}