Changeset 4735

Timestamp:

11/06/06 00:14:46 (2 years ago)

Author:

erijo

Message:

Use the configured datetime format in noticies as well.

Location:

trunk/qt-gui/src

Files:

• ewidgets.cpp (modified) (3 diffs)
• ewidgets.h (modified) (1 diff)
• usereventdlg.cpp (modified) (2 diffs)

trunk/qt-gui/src/ewidgets.cpp

@@ -949 +949 @@
 }
 
-void CMessageViewWidget::addNotice(QString dateTime, QString messageText)
+void CMessageViewWidget::addNotice(QDateTime dt, QString messageText)
 {
   QString color = "green";
   QString s = "";
-  
+  const QString dateTime = dt.toString( m_nDateFormat );
+
   /* Remove trailing line breaks. */
   for (unsigned int i = messageText.length() - 1; i >= 0; i--)
@@ -962 +963 @@
       break;
   }
-     
-  
+
+
   switch (m_nMsgStyle)
   {
@@ -994 +995 @@
       break;    
   }
-  
+
   append(s);
   if (m_bAppendLineBreak)

trunk/qt-gui/src/ewidgets.h

@@ -209 +209 @@
     bool isDirect, bool isMultiRec, bool isUrgent, bool isEncrypted, 
     QString contactName, QString messageText);
-  void addNotice(QString dateTime, QString messageText);
+  void addNotice(QDateTime dateTime, QString messageText);
 
   unsigned short m_nMsgStyle;

trunk/qt-gui/src/usereventdlg.cpp

@@ -1798 +1798 @@
     QString strMsg = QString("%1 has joined the conversation.")
       .arg(szId);
-    mleHistory->addNotice(QTime::currentTime().toString(), strMsg);
+    mleHistory->addNotice(QDateTime::currentDateTime(), strMsg);
   }
 
@@ -1825 +1825 @@
     QString strMsg = QString("%1 has left the conversation.")
       .arg(szId);
-    mleHistory->addNotice(QTime::currentTime().toString(), strMsg);
+    mleHistory->addNotice(QDateTime::currentDateTime(), strMsg);
     
     // Remove the typing notification if active