X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2FUserInterface%2FViews%2FMeetingInfoDialog.cpp;h=760eca9f98aae696305b7a1782363afd2c70d84c;hb=a2659d5f04b1662bea18fbbbff3a763fcfe3ff7c;hp=9a08de973f1cb49381f415070872ada2d0d23d01;hpb=11e5e6349ca6f86f864075fb9d38a778950cebf2;p=qtmeetings

diff --git a/src/UserInterface/Views/MeetingInfoDialog.cpp b/src/UserInterface/Views/MeetingInfoDialog.cpp
index 9a08de9..760eca9 100644
--- a/src/UserInterface/Views/MeetingInfoDialog.cpp
+++ b/src/UserInterface/Views/MeetingInfoDialog.cpp
@@ -1,7 +1,10 @@
 #include "MeetingInfoDialog.h"
+
 #include "ToolBox.h"
 #include "Meeting.h"
 #include "Room.h"
+#include "Configuration.h"
+
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QPushButton>
@@ -43,11 +46,30 @@ void MeetingInfoDialog::createDialogView(Meeting *aMeeting)
 	boldFont.setBold( true );
 
 	QLabel *subjectLabel = ToolBox::createLabel( tr( "Subject:" ), boldFont );
-	QLabel *subjectContent = ToolBox::createLabel( aMeeting->subject(), normalFont );
+	QLabel *subjectContent = new QLabel();
+	subjectContent->setFont( normalFont );
 
 	QLabel *descriptionLabel = ToolBox::createLabel( tr( "Description:" ), boldFont );
 	QTextEdit *descriptionContent = new QTextEdit( "" );
-	descriptionContent->setHtml( aMeeting->description() );
+
+	if( Configuration::instance()->showConfidentialMeetingDetails() )
+	{
+		subjectContent->setText( aMeeting->subject() );
+		descriptionContent->setHtml( aMeeting->description() );
+	}
+
+	if( subjectContent->text().isEmpty() )
+	{
+		subjectContent->setText( tr( "Room reserved", "Meeting Info Subject" ) ); // default subject text
+	}
+
+	qDebug() << "############ Desc: " << descriptionContent->toPlainText().trimmed();
+
+	if( descriptionContent->toPlainText().trimmed().isEmpty() )
+	{
+		descriptionContent->setPlainText( tr( "Room reserved", "Meeting Info Description" ) ); // default description text
+	}
+
 	descriptionContent->setReadOnly( true );
 	descriptionContent->setFont( normalFont );