Changeset 5849

Timestamp:

11/22/07 03:54:40 (12 months ago)

Author:

flynd

Message:

Changed timestamps in info dialog to not cut year. Also moved the datetime handling to infofield class.

Location:

branches/qt-gui_qt4/src

Files:

• dialogs/userinfodlg.cpp (modified) (1 diff)
• widgets/infofield.cpp (modified) (2 diffs)
• widgets/infofield.h (modified) (1 diff)

branches/qt-gui_qt4/src/dialogs/userinfodlg.cpp

@@ -1573 +1573 @@
   if (!u->StatusOffline())
     nfoLastOnline->setText(tr("Now"));
-  else if (u->LastOnline() == 0)
-    nfoLastOnline->setText(tr("Unknown"));
   else
-  {
-    t.setTime_t(u->LastOnline());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastOnline->setText(ds);
-  }
-
-  if (u->LastSentEvent() == 0)
-    nfoLastSent->setText(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->LastSentEvent());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastSent->setText(ds);
-  }
-
-  if (u->LastReceivedEvent() == 0)
-    nfoLastRecv->setText(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->LastReceivedEvent());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastRecv->setText(ds);
-  }
-
-  if (u->LastCheckedAutoResponse() == 0)
-    nfoLastCheckedAR->setText(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->LastCheckedAutoResponse());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastCheckedAR->setText(ds);
-  }
+    nfoLastOnline->setDateTime(u->LastOnline());
+
+  nfoLastSent->setDateTime(u->LastSentEvent());
+  nfoLastRecv->setDateTime(u->LastSentEvent());
+  nfoLastCheckedAR->setDateTime(u->LastCheckedAutoResponse());
 
   if (u->StatusOffline())
     nfoOnlineSince->setText(tr("Offline"));
-  else if (u->OnlineSince() == 0)
-    nfoOnlineSince->setText(tr("Unknown"));
   else
-  {
-    t.setTime_t(u->OnlineSince());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoOnlineSince->setText(ds);
-  }
-
-  if (bDropUser) gUserManager.DropUser(u);
+    nfoOnlineSince->setDateTime(u->OnlineSince());
+
+  if (bDropUser)
+    gUserManager.DropUser(u);
 }
 

branches/qt-gui_qt4/src/widgets/infofield.cpp

@@ -21 +21 @@
 #include "infofield.h"
 
+#include <QDateTime>
+
 using namespace LicqQtGui;
+/* TRANSLATOR LicqQtGui::InfoField */
 
 InfoField::InfoField(bool ro, QWidget* parent)
@@ -48 +51 @@
 void InfoField::setText(unsigned long data)
 {
-  char t[32];
-  sprintf(t, "%lu", data);
-  setText(t);
+  setText(QString::number(data));
 }
+
+void InfoField::setDateTime(uint timestamp)
+{
+  if (timestamp == 0)
+    setText(tr("Unknown"));
+  else
+    setText(QDateTime::fromTime_t(timestamp).toString());
+}

branches/qt-gui_qt4/src/widgets/infofield.h

@@ -65 +65 @@
   void setText(unsigned long data);
 
+  // Don't hide base setText which takes QString
   using QLineEdit::setText;
+
+  /**
+   * Set field to a timestamp
+   *
+   * @param timestamp Timestamp in UTC to set
+   */
+  void setDateTime(uint timestamp);
 
 private: