Changed something cannot remember what

[qtmeetings] / src / BusinessLogic / Engine.cpp

diff --git a/src/BusinessLogic/Engine.cpp b/src/BusinessLogic/Engine.cpp
index 218f9c5..fa9ccc1 100644 (file)
--- a/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@ -40,9 +40,8 @@ Engine::Engine() :
        
        //initialize idle time counter
        iIdleTimeCounter = new QTimer();
-       iIdleTimeCounter->setSingleShot( true );
-       // iIdleTimeCounter->setInterval( IDLE_TIME_MULTIPLIER * iConfiguration->displaySettings()->screensaver() );
-       iIdleTimeCounter->setInterval( 10000 );
+       iIdleTimeCounter->setSingleShot( true);
+       iIdleTimeCounter->setInterval(IDLE_TIME_MULTIPLIER * iConfiguration->displaySettings()->screensaver() );
        iIdleTimeCounter->start();
 
        // create application clock
@@ -55,7 +54,7 @@ Engine::Engine() :
        iAutoRefresh->setInterval(iConfiguration->connectionSettings()->refreshInterval() * 1000);
        iAutoRefresh->start();
        connect( iAutoRefresh, SIGNAL( timeout() ), iAutoRefresh, SLOT( start() ) );
-       connect( iAutoRefresh, SIGNAL( timeout() ), this, SLOT( fetchMeetings() ) );
+       // connect( iAutoRefresh, SIGNAL( timeout() ), this, SLOT( fetchMeetings() ) );
        
        if( iDevice->currentOperationMode() == DeviceManager::KioskMode )
        {
@@ -64,7 +63,7 @@ Engine::Engine() :
 
        connectSignals();
        
-       QTimer::singleShot( 0, this, SLOT( fetchMeetings() ) );
+       // QTimer::singleShot( 0, this, SLOT( fetchMeetings() ) );
 
        // TODO: continue implementation
 }
@@ -158,27 +157,30 @@ void Engine::roomStatusInfoNeeded(Room *aRoom)
        int indexOfNextMeeting = indexOfMeetingAfter(aRoom, iClock->datetime() );
 
        // if there is no meeting, then status is Free; otherwise Busy
-       Room::Status
-                       status =
-                                       (indexOfCurrentMeeting == -1 ) ? Room::FreeStatus : Room::BusyStatus;
+       Room::Status status = (indexOfCurrentMeeting == -1 ) ? Room::FreeStatus : Room::BusyStatus;
        // if room is Busy, then check end time, otherwise...
        QTime until = (status == Room::BusyStatus ) ? iMeetings.at( indexOfCurrentMeeting )->endsAt().time() :
        // ...if there is meeting following on the same day then check end time, otherwise end is the of the working day
-       ((indexOfNextMeeting != -1 ) ? iMeetings.at( indexOfNextMeeting )->startsAt().time() : Engine::endOfTheDay );
+       ( ( indexOfNextMeeting != -1 ) ? iMeetings.at( indexOfNextMeeting )->startsAt().time() : Engine::endOfTheDay );
 
        //currently works only for deafult room
 //     if( aRoom->equals( *(defaultRoom() ) ) )
 //             iWindowManager->roomStatusChanged( aRoom, status, until );
 }
 
+/*
 void Engine::fetchMeetings()
 {
-       Room *room = defaultRoom();
-       qDebug() << "Engine::fetchMeetings for " << room->name();
-       fetchMeetings(iClock->datetime(), iClock->datetime().addDays( 7), room);
+       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)
+void Engine::fetchMeetingDetails( Meeting *aMeeting )
 {
        qDebug() << "Engine::fetchMeetingDetails( Meeting* )";
 /*     iWindowManager->showProgressBar(tr("Please Wait"), true);
@@ -187,7 +189,6 @@ void Engine::fetchMeetingDetails(Meeting *aMeeting)
        SIGNAL( progressBarCancelled() ), this, 
        SLOT( fetchMeetingDetailsCancelled() ));
        iCommunication->fetchMeetingDetails( *aMeeting); */
-       
        iCommunication->fetchMeetingDetails( *aMeeting );
 }
 
@@ -201,12 +202,12 @@ void Engine::meetingsFetched( const QList<Meeting*> &aMeetings )
        }
        iMeetings.clear();
        for ( int i = 0; i < aMeetings.count(); ++i ) {
-               Meeting* m = new Meeting( *(aMeetings.at( i )) );
+               Meeting* m = new Meeting( *( aMeetings.at( i ) ) );
                iMeetings.append( m );
        }
 
        // refresh room status info
-       roomStatusInfoNeeded(defaultRoom() );
+       roomStatusInfoNeeded( defaultRoom() );
 }
 
 void Engine::errorHandler( int aCode, const QString &aAddInfo )
@@ -267,7 +268,7 @@ void Engine::initUserInterface()
        
        connect( iWindowManager, SIGNAL( eventDetected() ), this, SLOT( handleViewEvent() ) );
        connect( iWindowManager, SIGNAL( previousViewRestored() ), iUIManager, SLOT( previousViewRestored() ) );
-       connect( iWindowManager, SIGNAL( dialogActivated() ), this, SLOT( dialogActivated() ) );
+//     connect( iWindowManager, SIGNAL( dialogActivated() ), this, SLOT( dialogActivated() ) );
        connect( iWindowManager, SIGNAL( dialogDeactivated() ), this, SLOT( dialogDeactivated() ) );
        
        // Show the UI
@@ -275,6 +276,9 @@ void Engine::initUserInterface()
        iWindowManager->show();
        iUIManager->showMainView();
        
+       // This triggers the meeting fetching
+       iUIManager->currentRoomChanged( this->iCurrentRoom );
+       
        qDebug() << "[Engine::initUserInterface] <Finished>";
 }
 
@@ -295,6 +299,7 @@ void Engine::initConfiguration()
        {
                QTimer::singleShot( 0, this, SLOT( closeApplication() ) );
        }
+       iCurrentRoom = iConfiguration->defaultRoom();
 }
 
 void Engine::connectSignals()
@@ -365,3 +370,8 @@ void Engine::startIdleTimeCounter()
        }
 }
 
+void Engine::currentRoomChanged(Room *aRoom)
+{
+       qDebug() << "[Engine::currentRoomChanged] <invoked>";
+       iCurrentRoom = aRoom;
+}
\ No newline at end of file