Changeset 5852 for trunk/qt-gui

Timestamp:

11/22/07 04:29:18 (12 months ago)

Author:

flynd

Message:

Merged r5849,r5850,r5851 from qt4-gui to get year in last fields of info dialog.

Location:

trunk/qt-gui/src

Files:

• ewidgets.cpp (modified) (1 diff)
• ewidgets.h (modified) (1 diff)
• userinfodlg.cpp (modified) (1 diff)

trunk/qt-gui/src/ewidgets.cpp

@@ -664 +664 @@
 }
 
-
-void CInfoField::setData(const unsigned long data)
-{
-  char t[32];
-  sprintf(t, "%lu", data);
-  setData(t);
+void CInfoField::setData(unsigned long data)
+{
+  setText(QString::number(data));
+}
+
+void CInfoField::setDateTime(uint timestamp)
+{
+  if (timestamp == 0)
+    setText(tr("Unknown"));
+  else
+  {
+    QDateTime t;
+    t.setTime_t(timestamp);
+    setText(t.toString());
+  }
 }
 

trunk/qt-gui/src/ewidgets.h

@@ -186 +186 @@
   void setData(const char *data);
   void setData(QString data);
-  void setData(const unsigned long data);
+  void setData(unsigned long data);
+  void setDateTime(uint timestamp);
   void SetReadOnly(bool);
 protected:

trunk/qt-gui/src/userinfodlg.cpp

@@ -1549 +1549 @@
   {
     u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_R);
-    if (u == NULL) return;
+    if (u == NULL)
+      return;
     bDropUser = true;
   }
-
-  QDateTime t;
-  QString ds;
 
   if (!u->StatusOffline())
     nfoLastOnline->setData(tr("Now"));
-  else if (u->LastOnline() == 0)
-    nfoLastOnline->setData(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->LastOnline());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastOnline->setData(ds);
-  }
-
-  if (u->LastSentEvent() == 0)
-    nfoLastSent->setData(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->LastSentEvent());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastSent->setData(ds);
-  }
-
-  if (u->LastReceivedEvent() == 0)
-    nfoLastRecv->setData(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->LastReceivedEvent());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastRecv->setData(ds);
-  }
-
-  if (u->LastCheckedAutoResponse() == 0)
-    nfoLastCheckedAR->setData(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->LastCheckedAutoResponse());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastCheckedAR->setData(ds);
-  }
+  else
+    nfoLastOnline->setDateTime(u->LastOnline());
+
+  nfoLastSent->setDateTime(u->LastSentEvent());
+  nfoLastRecv->setDateTime(u->LastReceivedEvent());
+  nfoLastCheckedAR->setDateTime(u->LastCheckedAutoResponse());
 
   if (u->StatusOffline())
     nfoOnlineSince->setData(tr("Offline"));
-  else if (u->OnlineSince() == 0)
-    nfoOnlineSince->setData(tr("Unknown"));
-  else
-  {
-    t.setTime_t(u->OnlineSince());
-    ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoOnlineSince->setData(ds);
-  }
-
-  if (bDropUser) gUserManager.DropUser(u);
+  else
+    nfoOnlineSince->setDateTime(u->OnlineSince());
+
+  if (bDropUser)
+    gUserManager.DropUser(u);
 }