Status bar fixed

[qtmeetings] / src / UserInterface / Views / WeeklyViewWidget.cpp

diff --git a/src/UserInterface/Views/WeeklyViewWidget.cpp b/src/UserInterface/Views/WeeklyViewWidget.cpp
index 6c8b75c..0c9b61f 100644 (file)
--- a/src/UserInterface/Views/WeeklyViewWidget.cpp
+++ b/src/UserInterface/Views/WeeklyViewWidget.cpp
@@ -76,6 +76,7 @@ WeeklyViewWidget::WeeklyViewWidget( QDateTime aCurrentDateTime, Configuration *a
        iStatusBar->setFixedHeight( 28 );\r
        QPixmap pixmap(":ixonos_logo");\r
        iStatusBar->setPixmap( pixmap );\r
+       iStatusBar->setText( tr("Disconnected"), BorderedBarWidget::LeftAlign );\r
 \r
        iSchedule = new ScheduleWidget( aCurrentDateTime, iConfiguration->displaySettings(), this );\r
        connect( iSchedule, SIGNAL( shownWeekChanged( QDate ) ), this, SIGNAL( shownWeekChanged( QDate ) ) );\r
@@ -227,15 +228,34 @@ Room* WeeklyViewWidget::currentRoom()
        return iRoomsCombo->currentRoom();\r
 }\r
 \r
-void WeeklyViewWidget::setCurrentDateTime( QDateTime aCurrentDateTime )\r
+void WeeklyViewWidget::setConnectionStatus( QDateTime aCurrentTime, bool aConnected,\r
+               QTime aLastUpdated, QString aError )\r
 {\r
-       iCurrentDayLabel->setText( aCurrentDateTime.date().toString( iConfiguration->displaySettings()->dateFormat() ) );\r
+       iCurrentDayLabel->setText( aCurrentTime.date().toString( iConfiguration->displaySettings()->dateFormat() ) );\r
+       iCurrentWeekLabel->setText( tr( "Wk %1" ).arg( aCurrentTime.date().weekNumber() ) );\r
+       iSchedule->setCurrentDateTime( aCurrentTime );\r
        \r
-       iCurrentWeekLabel->setText( tr( "Wk %1" ).arg( aCurrentDateTime.date().weekNumber() ) );\r
-\r
-       iTimeDisplay->setText( aCurrentDateTime.toString( iConfiguration->displaySettings()->timeFormat() ) );\r
+       iTimeDisplay->setText( aCurrentTime.toString( iConfiguration->displaySettings()->timeFormat() ) );\r
+       if ( aLastUpdated.isNull() )\r
+               iStatusBar->setText( tr("Disconnected") , BorderedBarWidget::LeftAlign );\r
+       else if ( !aConnected )\r
+       {\r
+               iStatusBar->setText( tr("Disconnected")\r
+                               .arg(aLastUpdated.toString(iConfiguration->displaySettings()->timeFormat()))\r
+                               , BorderedBarWidget::LeftAlign );\r
+       }\r
+       else\r
+       {\r
+               iStatusBar->setText( tr("Connected - Last update %1")\r
+                               .arg(aLastUpdated.toString(iConfiguration->displaySettings()->timeFormat())) ,\r
+                               BorderedBarWidget::LeftAlign );\r
+       }\r
+       showError( aError );\r
+ }\r
 \r
-       iSchedule->setCurrentDateTime( aCurrentDateTime );\r
+void WeeklyViewWidget::showError( QString aError )\r
+{\r
+       iStatusBar->setText( aError );\r
 }\r
 \r
 QDate WeeklyViewWidget::beginnigOfShownWeek()\r
@@ -262,12 +282,9 @@ void WeeklyViewWidget::setDefaultRoom()
 void WeeklyViewWidget::connectionEstablished()\r
 {\r
        ViewBase::connectionEstablished();\r
-       qDebug() << "WeeklyViewWidget::connectionEstablished";\r
-       iStatusBar->setText( tr("Connected"), BorderedBarWidget::LeftAlign );\r
 }\r
 \r
 void WeeklyViewWidget::connectionLost()\r
 {\r
        ViewBase::connectionLost();\r
-       iStatusBar->setText( tr("Disconnected"), BorderedBarWidget::LeftAlign );\r
 }\r