Got the new stuff working, last commit before final pull push

diff --git a/src/BusinessLogic/Engine.cpp b/src/BusinessLogic/Engine.cpp
index 07563eb..218f9c5 100644 (file)
--- a/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@ -95,26 +95,6 @@ void Engine::closeApplication()
        QTimer::singleShot( 1000, QApplication::instance(), SLOT( quit() ));
 }
 
-<<<<<<< HEAD:src/BusinessLogic/Engine.cpp
-=======
-void Engine::observedEventDetected()
-{
-       qDebug() << "Engine::observedEventDetected()";
-       if ( !iIdleTimeCounter->isActive() )
-       {
-               iWindowManager->weeklyView()->showCurrentWeek();
-       }
-       iWindowManager->showWeeklyView();
-       // prepare to restart idle counter
-       if (iIdleTimeCounter->isActive() )
-       {
-               iIdleTimeCounter->stop();
-       }
-       // (re)start idle counter
-       iIdleTimeCounter->start();
-}
-
->>>>>>> 60b7802da53961d1998e276858bbc5e404b98a05:src/BusinessLogic/Engine.cpp
 Room* Engine::defaultRoom()
 {
        qDebug() << "Engine::defaultRoom()";

diff --git a/src/BusinessLogic/UIManager.cpp b/src/BusinessLogic/UIManager.cpp
index 9455bb0..3de5117 100644 (file)
--- a/src/BusinessLogic/UIManager.cpp
+++ b/src/BusinessLogic/UIManager.cpp
@@ -137,7 +137,7 @@ void UIManager::connectDeviceManager( DeviceManager *aDeviceManager )
 
 void UIManager::connectCommunicationManager( CommunicationManager *aCommunicationManager )
 {
-//     connect( aCommunicationManager, SIGNAL( meetingDetailsFetched( Meeting & ) ), this, SLOT( meetingDetailsFetched( Meeting & ) ) );
+       connect( aCommunicationManager, SIGNAL( meetingDetailsFetched( Meeting & ) ), this, SLOT( meetingDetailsFetched( Meeting & ) ) );
        connect( aCommunicationManager, SIGNAL( meetingsFetched( const QList<Meeting *> & ) ), this, SLOT( meetingsFetched( const QList<Meeting *> & ) ) );
 }
 
@@ -177,7 +177,8 @@ void UIManager::showMeetingProgressBar( Meeting *aMeeting )
        if ( iProgressBar != 0 )
        {
                iProgressBar->update( tr("Fetching meeting info...") );
-               iWindowManager->showDialog( static_cast<QDialog *>( iProgressBar ), false );
+               iWindowManager->showDialog( static_cast<QDialog *>( iProgressBar ), false, false );
+               iEngine->stopIdleTimeCounter();
        }
 }
 
@@ -190,9 +191,11 @@ void UIManager::meetingDetailsFetched(Meeting &aDetailedMeeting)
                {
                        iProgressBar->close(); // Close it in case it's visible
                }
-               // iMeetingInfo->setMeeting( &aDetailedMeeting );
                MeetingInfoDialog *tmp = new MeetingInfoDialog( &aDetailedMeeting );
-               iWindowManager->showDialog( static_cast<QDialog *>( tmp/*iMeetingInfo*/ ) );
+               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 ) );
        }
 }
 
@@ -215,6 +218,7 @@ void UIManager::progressBarCancelled()
        if ( iProgressBar != 0 )
        {
                iProgressBar->close();
+               iEngine->startIdleTimeCounter();
        }
 }
 

diff --git a/src/UserInterface/Views/MeetingInfoDialog.cpp b/src/UserInterface/Views/MeetingInfoDialog.cpp
index 3250e82..9a08de9 100644 (file)
--- a/src/UserInterface/Views/MeetingInfoDialog.cpp
+++ b/src/UserInterface/Views/MeetingInfoDialog.cpp
@@ -33,6 +33,8 @@ void MeetingInfoDialog::setMeeting(Meeting *aMeeting)
 
 void MeetingInfoDialog::createDialogView(Meeting *aMeeting)
 {
+       qDebug() << "[MeetingInfoDialog::createDialogView] <Invoked>";
+       
        QFont normalFont;
        normalFont.setPointSize( 11 );
 
@@ -95,4 +97,6 @@ void MeetingInfoDialog::createDialogView(Meeting *aMeeting)
        layout->addStretch();
        layout->addLayout( buttonLayout );
        setLayout( layout );
+       
+       qDebug() << "[MeetingInfoDialog::createDialogView] <Finished>";
 }