Confilcts solved

[qtmeetings] / src / BusinessLogic / Engine.cpp

diff --git a/src/BusinessLogic/Engine.cpp b/src/BusinessLogic/Engine.cpp
index e745491..962da10 100644 (file)
--- a/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@ -16,7 +16,7 @@
 #include <QtDebug>
 
 QTime Engine::endOfTheDay = QTime( 23, 59, 0, 0); // end of the day is 11:59pm
-const int IDLE_TIME_MULTIPLIER = 5000; // Multiplies milliseconds to minutes
+const int IDLE_TIME_MULTIPLIER = 60000; // Multiplies milliseconds to minutes
 
 // Macro to help deleting objects. This could be global.
 #define QT_DELETE(X) \
@@ -164,15 +164,31 @@ void Engine::roomStatusInfoNeeded(Room *aRoom)
        ( ( indexOfNextMeeting != -1 ) ? iMeetings.at( indexOfNextMeeting )->startsAt().time() : Engine::endOfTheDay );
 
        //currently works only for deafult room
-       if ( aRoom->equals( *(iCurrentRoom) ) )
-       {
-               emit roomStatusChanged( status, until );
-       }
+//     if( aRoom->equals( *(defaultRoom() ) ) )
+//             iWindowManager->roomStatusChanged( aRoom, status, until );
+}
+
+/*
+void Engine::fetchMeetings()
+{
+       qDebug() << "Engine::fetchMeetings for " << iCurrentRoom;
+       QDateTime from( iWindowManager->weeklyView()->beginnigOfShownWeek() );
+       QDateTime to( from.addDays( 7 ) );
+       // fetchMeetings( from, to, iWindowManager->weeklyView()->currentRoom() );
+       // Signal is connected to the currentRoomChanged slot which keeps the iCurrentRoom up to date
+       fetchMeetings( from, to, iCurrentRoom );
 }
+*/
 
 void Engine::fetchMeetingDetails( Meeting *aMeeting )
 {
        qDebug() << "Engine::fetchMeetingDetails( Meeting* )";
+/*     iWindowManager->showProgressBar(tr("Please Wait"), true);
+       iWindowManager->updateProgressBar(tr("Fetching Meeting Details...") );
+       connect(iWindowManager, 
+       SIGNAL( progressBarCancelled() ), this, 
+       SLOT( fetchMeetingDetailsCancelled() ));
+       iCommunication->fetchMeetingDetails( *aMeeting); */
        iCommunication->fetchMeetingDetails( *aMeeting );
 }
 
@@ -224,20 +240,16 @@ void Engine::shownWeekChanged( QDate aFrom )
 //     fetchMeetings( from, to, iWindowManager->weeklyView()->currentRoom() );
 }
 
-void Engine::changeDeviceMode( bool aChange )
+void Engine::changeDeviceMode()
 {
-       if ( aChange )
-       {
-               connect( iDevice, SIGNAL( changingModeFailed() ), this, SLOT( changeModeFailed() ) );
-               iAutoRefresh->stop(); // Stop the meeting update
-       }
-       iDevice->changeMode( aChange );
+       connect( iDevice, SIGNAL( changeModeFailed() ), this, SLOT( changeModeFailed() ) );
+       iAutoRefresh->stop(); // Stop the meeting update
+       iDevice->changeMode();
 }
 
 void Engine::changeModeFailed()
 {
        qDebug() << "Engine::progressBarCancelled()";
-       iDevice->changeMode( false );
        iAutoRefresh->start(); //we start the metting updating
 }
 
@@ -358,4 +370,4 @@ void Engine::currentRoomChanged(Room *aRoom)
 {
        qDebug() << "[Engine::currentRoomChanged] <invoked>";
        iCurrentRoom = aRoom;
-}
+}
\ No newline at end of file