Changeset 5482

Timestamp:

09/30/07 06:27:42 (14 months ago)

Author:

erijo

Message:

Added a new class for getting (and translating) commonly used strings.
Fixes #1453.

Location:

trunk/qt-gui/src

Files:

• awaymsgdlg.cpp (modified) (4 diffs)
• licqkimiface.cpp (modified) (2 diffs)
• mainwin.cpp (modified) (4 diffs)
• Makefile.am (modified) (2 diffs)
• showawaymsgdlg.cpp (modified) (2 diffs)
• strings.cpp (added)
• strings.h (added)
• userbox.cpp (modified) (1 diff)
• usereventdlg.cpp (modified) (4 diffs)
• userinfodlg.cpp (modified) (2 diffs)
• wharf.cpp (modified) (2 diffs)

trunk/qt-gui/src/awaymsgdlg.cpp

@@ -154 +154 @@
   if (o == 0) return;
   setCaption(QString(tr("Set %1 Response for %2"))
-             .arg(ICQUser::StatusToStatusStr(m_nStatus, false)).arg(QString::fromUtf8(o->GetAlias())));
+             .arg(Strings::getStatus(m_nStatus, false))
+             .arg(QString::fromUtf8(o->GetAlias())));
   QTextCodec *codec = UserCodec::defaultEncoding();
   if (*o->AutoResponse())
@@ -162 +163 @@
                            "You can leave me a message.\n"
                            "(%m messages pending from you).")
-                        .arg(ICQUser::StatusToStatusStr(m_nStatus, false)));
+                        .arg(Strings::getStatus(m_nStatus, false)));
   gUserManager.DropOwner();
 
@@ -326 +327 @@
   else if (u->StatusToUser() != ICQ_STATUS_OFFLINE)
     mleAwayMsg->setText(tr("I am currently %1.\nYou can leave me a message.")
-                        .arg(ICQUser::StatusToStatusStr(u->StatusToUser(), false)));
+                        .arg(Strings::getStatus(u->StatusToUser(), false)));
 
   gUserManager.DropUser(u);
@@ -383 +384 @@
   else if (u->StatusToUser() != ICQ_STATUS_OFFLINE)
     mleAwayMsg->setText(tr("I am currently %1.\nYou can leave me a message.")
-                        .arg(ICQUser::StatusToStatusStr(u->StatusToUser(), false)));
+                        .arg(Strings::getStatus(u->StatusToUser(), false)));
 
   gUserManager.DropUser(u);

trunk/qt-gui/src/licqkimiface.cpp

@@ -42 +42 @@
 #include "licqkimiface.h"
 #include "mainwin.h"
+#include "strings.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -210 +211 @@
                     << ": Licq ID=(" << pUser->PPID() << ", " << id << ")"
                     << "KABC ID=" << kabcID << endl;*/
-        QTextCodec* codec = UserCodec::codecForICQUser(pUser);
-        QCString rawStatus = pUser->StatusStr();
-        status = codec->toUnicode(rawStatus);
+        status = Strings::getStatus(pUser);
         FOR_EACH_PROTO_USER_BREAK
     }

trunk/qt-gui/src/mainwin.cpp

@@ -86 +86 @@
 #include "emoticon.h"
 #include "ownermanagerdlg.h"
+#include "strings.h"
 
 #ifdef USE_KDE
@@ -2111 +2112 @@
       // Only one protocol is loaded, show some text too
       lblStatus->clearPixmaps();
-      lblStatus->setText(o->StatusStr());
+      lblStatus->setText(Strings::getStatus(o));
       lblStatus->setPrependPixmap(CMainWindow::iconForStatus(o->StatusFull()));
       lblStatus->update();
@@ -4536 +4537 @@
   }
 
-  const char *szStatus = u->StatusStrShort();
   unsigned short status = u->Status();
   
@@ -4551 +4551 @@
   else
   {
-    mnuUser->changeItem(mnuUserCheckResponse, QString(tr("Check %1 Response")).arg(szStatus));
+    mnuUser->changeItem(mnuUserCheckResponse,
+                        QString(tr("Check %1 Response"))
+                        .arg(Strings::getShortStatus(u, false)));
     mnuUser->setItemEnabled(mnuUserCheckResponse, true);
   }

trunk/qt-gui/src/Makefile.am

@@ -21 +21 @@
     usercodec.h reqauthdlg.h licqdialog.h userselectdlg.h \
     editfilelistdlg.h emoticon.h catdlg.h phonedlg.h ownermanagerdlg.h \
-    gpgkeyselect.h gpgkeymanager.h licqkimiface.h kimiface.h support.h
+    gpgkeyselect.h gpgkeymanager.h licqkimiface.h kimiface.h support.h \
+    strings.h
 
 licq_gui = adduserdlg.cpp authuserdlg.cpp awaymsgdlg.cpp \
@@ -34 +35 @@
     usercodec.cpp reqauthdlg.cpp licqdialog.cpp userselectdlg.cpp \
     editfilelistdlg.cpp emoticon.cpp catdlg.cpp phonedlg.cpp \
-    ownermanagerdlg.cpp gpgkeyselect.cpp gpgkeymanager.cpp support.cpp
+    ownermanagerdlg.cpp gpgkeyselect.cpp gpgkeymanager.cpp support.cpp \
+    strings.cpp
 
 licq_qt_gui_la_SOURCES = $(licq_gui)

trunk/qt-gui/src/showawaymsgdlg.cpp

@@ -34 +34 @@
 #include "sigman.h"
 #include "licq_user.h"
+#include "strings.h"
 #include "usercodec.h"
 #include <ctype.h>
@@ -70 +71 @@
 //  chkShowAgain->setChecked(u->ShowAwayMsg());
 
-  setCaption(QString(tr("%1 Response for %2")).arg(u->StatusStr()).arg(QString::fromUtf8(u->GetAlias())));
+  setCaption(QString(tr("%1 Response for %2"))
+             .arg(Strings::getStatus(u, false))
+             .arg(QString::fromUtf8(u->GetAlias())));
 
   btnOk = new QPushButton(tr("&Ok"), this);

trunk/qt-gui/src/userbox.cpp

@@ -1706 +1706 @@
 
   QString s = "<nobr>";
-  s += ICQUser::StatusToStatusStr(item->m_nStatus, item->m_bStatusInvisible);
+  s += Strings::getStatus(item->m_nStatus, item->m_bStatusInvisible);
 
   QRect r(itemRect(item));

trunk/qt-gui/src/usereventdlg.cpp

@@ -95 +95 @@
 #include "support.h"
 #include "mledit.h"
+#include "strings.h"
 
 #include <X11/Xlib.h>
@@ -172 +173 @@
   if (u != NULL)
   {
-    nfoStatus->setData(u->StatusStr());
+    nfoStatus->setData(Strings::getStatus(u));
     if (u->NewMessages() == 0)
       setIcon(CMainWindow::iconForStatus(u->StatusFull(), u->IdString(), u->PPID()));
@@ -687 +688 @@
     case USER_STATUS:
     {
-      nfoStatus->setData(u->StatusStr());
+      nfoStatus->setData(Strings::getStatus(u));
       if (u->NewMessages() == 0)
       {
@@ -2386 +2387 @@
 
     msg = tr("%1 is in %2 mode:\n%3\nSend...")
-             .arg(QString::fromUtf8(u->GetAlias())).arg(u->StatusStr())
-             .arg(codec->toUnicode(u->AutoResponse()));
+        .arg(QString::fromUtf8(u->GetAlias()))
+        .arg(Strings::getStatus(u))
+        .arg(codec->toUnicode(u->AutoResponse()));
 
     u->SetShowAwayMsg( false );

trunk/qt-gui/src/userinfodlg.cpp

@@ -82 +82 @@
 #include "mledit.h"
 #include "mlview.h"
+#include "strings.h"
 
 #include "xpm/phonebookPhone.xpm"
@@ -415 +416 @@
   nfoIp->setData(ip);
   tznZone->setData(u->GetTimezone());
-  nfoStatus->setData(u->StatusStr());
+  nfoStatus->setData(Strings::getStatus(u));
   if (m_bOwner)
   {

trunk/qt-gui/src/wharf.cpp

@@ -53 +53 @@
 #include "licq_user.h"
 #include "ewidgets.h"
+#include "strings.h"
 
 #include <X11/Xlib.h>
@@ -758 +759 @@
 {
   QToolTip::remove(this);
-  QString s = QString("<nobr>") + QString(ICQUser::StatusToStatusStr(m_ownerStatus, m_bStatusInvisible))
-      + QString("</nobr>");
+  QString s = QString("<nobr>%1</nobr>")
+      .arg(Strings::getStatus(m_ownerStatus, m_bStatusInvisible));
 
   if(m_nSysMsg)