Changeset 6001

Timestamp:

01/08/08 06:26:35 (11 months ago)

Author:

flynd

Message:

Removed old history tab from user info dialog.

Location:

branches/qt-gui_qt4/src

Files:

• core/gui-defines.h (modified) (1 diff)
• core/licqgui.cpp (modified) (3 diffs)
• dialogs/userinfodlg.cpp (modified) (14 diffs)
• dialogs/userinfodlg.h (modified) (7 diffs)

branches/qt-gui_qt4/src/core/gui-defines.h

@@ -56 +56 @@
   mnuUserSendSms,
   mnuUserGeneral,
-  mnuUserHistory,
 };
 

branches/qt-gui_qt4/src/core/licqgui.cpp

@@ -783 +783 @@
 }
 
-void LicqGui::showInfoDialog(int fcn, QString id, unsigned long ppid,
+void LicqGui::showInfoDialog(int /* fcn */, QString id, unsigned long ppid,
   bool toggle, bool updateNow)
 {
@@ -803 +803 @@
   {
     int tab = UserInfoDlg::WorkInfo;
-    switch (fcn)
-    {
-      case mnuUserHistory:
-        tab = UserInfoDlg::HistoryInfo;
-        break;
-      case mnuUserGeneral:
-        if (ppid == LICQ_PPID && id[0].isLetter())
-          tab = UserInfoDlg::AboutInfo;
-        else
-          tab = UserInfoDlg::GeneralInfo;
-        break;
-    }
+    if (ppid == LICQ_PPID && id[0].isLetter())
+      tab = UserInfoDlg::AboutInfo;
+    else
+      tab = UserInfoDlg::GeneralInfo;
     if (toggle && f->isTabShown(tab))
     {
@@ -835 +827 @@
   }
 
-  switch(fcn)
-  {
-    case mnuUserHistory:
-      f->showTab(UserInfoDlg::HistoryInfo);
-      break;
-    case mnuUserGeneral:
-      if (ppid == LICQ_PPID && id[0].isLetter())
-        f->showTab(UserInfoDlg::AboutInfo);
-      else
-        f->showTab(UserInfoDlg::GeneralInfo);
-      break;
-  }
+  if (ppid == LICQ_PPID && id[0].isLetter())
+    f->showTab(UserInfoDlg::AboutInfo);
+  else
+    f->showTab(UserInfoDlg::GeneralInfo);
+
   f->show();
   f->raise();

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

@@ -35 +35 @@
 #include <QHeaderView>
 #include <QLabel>
-#include <QLineEdit>
 #include <QMovie>
 #include <QPixmap>
 #include <QPushButton>
-#include <QShortcut>
 #include <QSpinBox>
 #include <QTextCodec>
@@ -72 +70 @@
 #include <licq_log.h>
 
-#include "widgets/historyview.h"
 #include "widgets/infofield.h"
 #include "widgets/mledit.h"
@@ -118 +115 @@
   CreatePhoneBook();
   CreatePicture();
-  CreateHistory();
   CreateLastCountersInfo();
 #ifdef USE_KABC
@@ -137 +133 @@
   tabs->addTab(tabList[PhoneInfo].tab, tabList[PhoneInfo].label);
   tabs->addTab(tabList[PictureInfo].tab, tabList[PictureInfo].label);
-  tabs->addTab(tabList[HistoryInfo].tab, tabList[HistoryInfo].label);
   tabs->addTab(tabList[LastCountersInfo].tab, tabList[LastCountersInfo].label);
 #ifdef USE_KABC
@@ -181 +176 @@
 
   lay->addLayout(l);
-
-  // prepare the timer for the history filter
-  timer = new QTimer(this);
-  timer->setObjectName("history_filterTimer");
-  connect(timer, SIGNAL(timeout()), SLOT(ShowHistory()));
 
   ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
@@ -237 +227 @@
 
   emit finished(myId, m_nPPID);
-
-  ICQUser::ClearHistory(m_lHistoryList);
 }
 
@@ -1687 +1675 @@
 }
 
-// -----------------------------------------------------------------------------
-
-void UserInfoDlg::CreateHistory()
-{
-  tabList[HistoryInfo].label = tr("&History");
-  QWidget* p = new QWidget(this);
-  tabList[HistoryInfo].tab = p;
-  p->setObjectName(tabList[HistoryInfo].label);
-  tabList[HistoryInfo].loaded = false;
-
-  QVBoxLayout* lay = new QVBoxLayout(p);
-
-  QHBoxLayout* l = new QHBoxLayout();
-
-  lblHistory = new QLabel();
-  lblHistory->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-  l->addWidget(lblHistory, 1);
-
-  chkHistoryReverse = new QCheckBox(tr("Rever&se"));
-  connect(chkHistoryReverse, SIGNAL(toggled(bool)), SLOT(HistoryReverse(bool)));
-  chkHistoryReverse->setChecked(m_bHistoryReverse = Config::Chat::instance()->reverseHistory());
-  chkHistoryReverse->setFixedSize(chkHistoryReverse->sizeHint());
-  l->addWidget(chkHistoryReverse);
-
-  lay->addLayout(l);
-
-  mlvHistory = new HistoryView(true, myId, m_nPPID, p);
-
-  connect(mlvHistory, SIGNAL(viewurl(QWidget*, QString)), LicqGui::instance(), SLOT(viewUrl(QWidget*, QString)));
-
-  lay->addWidget(mlvHistory, 1);
-
-  l = new QHBoxLayout();
-
-  lneFilter = new QLineEdit();
-  lblFilter = new QLabel(tr("&Filter: "));
-  lblFilter->setBuddy(lneFilter);
-  l->addWidget(lblFilter);
-  l->addWidget(lneFilter, 1);
-  connect(lneFilter, SIGNAL(textChanged(const QString&)), SLOT(slot_showHistoryTimer()));
-
-  lay->addLayout(l);
-
-  QShortcut* a = new QShortcut(Qt::Key_U + Qt::CTRL, p);
-  connect(a, SIGNAL(activated()), SLOT(HistoryReload()));
-
-  a = new QShortcut(Qt::Key_F5, p);
-  connect(a, SIGNAL(activated()), SLOT(HistoryReload()));
-}
-
-/*!  \brief Resets and restarts the timeout for the history filter
- *
- *   Everytime this slot is called, the timer for the history filter
- *   is reset.
- *   The timeout is set to 1000 ms.
- *   This slot is called everytime the user changes the filter
- *   string in the history tab.  After 1 second of being idle, the
- *   filter is invoked because SIGNAL(timeout()) is connected to
- *   ShowHistory().
- */
-void UserInfoDlg::slot_showHistoryTimer()
-{
-  timer->stop();
-  timer->setSingleShot(true);
-  timer->start(1000);
-}
-
 void UserInfoDlg::EditCategory(QTreeWidgetItem* selected)
 {
@@ -1863 +1784 @@
   gUserManager.DropUser(u);
 }
-
-void UserInfoDlg::SetupHistory()
-{
-  tabList[HistoryInfo].loaded = true;
-
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
-  if (u == NULL) return;
-
-  if (!u->GetHistory(m_lHistoryList))
-  {
-    if(u->HistoryFile())
-      mlvHistory->setText(tr("Error loading history file: %1\nDescription: %2")
-        .arg(u->HistoryFile()).arg(u->HistoryName()));
-    else
-      mlvHistory->setText(tr("Sorry, history is disabled for this person."));
-
-    btnMain2->setEnabled(false);
-    gUserManager.DropUser(u);
-  }
-  else
-  {
-    m_bHistoryReverse = chkHistoryReverse->isChecked();
-    m_iHistoryEIter = m_lHistoryList.end();
-    m_iHistorySIter = m_iHistoryEIter;
-    for (unsigned short i = 0;
-         (i < Config::Chat::instance()->histMsgNum()) && (m_iHistorySIter != m_lHistoryList.begin());
-         i++)
-    {
-      m_iHistorySIter--;
-    }
-    m_nHistoryIndex = m_lHistoryList.size();
-    gUserManager.DropUser(u);
-    ShowHistory();
-
-    btnMain2->setEnabled((m_nHistoryIndex - m_nHistoryShowing) != 0);
-  }
-
-  btnMain3->setEnabled(false);
-}
-
-// -----------------------------------------------------------------------------
-
-
-void UserInfoDlg::HistoryReload()
-{
-  ICQUser::ClearHistory(m_lHistoryList);
-  SetupHistory();
-}
-
-void UserInfoDlg::HistoryReverse(bool newVal)
-{
-  if (chkHistoryReverse->isChecked() != newVal)
-    chkHistoryReverse->setChecked(newVal);
-  else if(m_bHistoryReverse != newVal)
-  {
-    m_bHistoryReverse = newVal;
-    ShowHistory();
-  }
-}
-
-void UserInfoDlg::ShowHistoryPrev()
-{
-  if (m_iHistorySIter != m_lHistoryList.begin())
-  {
-    m_iHistoryEIter = m_iHistorySIter;
-    m_nHistoryIndex -= Config::Chat::instance()->histMsgNum();
-    for (unsigned short i = 0;
-         (i < Config::Chat::instance()->histMsgNum()) && (m_iHistorySIter != m_lHistoryList.begin());
-         i++)
-    {
-            m_iHistorySIter--;
-    }
-    ShowHistory();
-    btnMain2->setEnabled(m_iHistorySIter != m_lHistoryList.begin());
-    btnMain3->setEnabled(true);
-  }
-}
-
-void UserInfoDlg::ShowHistoryNext()
-{
-  if (m_iHistoryEIter != m_lHistoryList.end())
-  {
-    m_iHistorySIter = m_iHistoryEIter;
-    for (unsigned short i = 0;
-         (i < Config::Chat::instance()->histMsgNum()) && (m_iHistoryEIter != m_lHistoryList.end());
-         i++)
-    {
-            m_iHistoryEIter++;
-            m_nHistoryIndex++;
-    }
-    ShowHistory();
-    btnMain3->setEnabled(m_iHistoryEIter != m_lHistoryList.end());
-    btnMain2->setEnabled(true);
-  }
-}
-
-bool UserInfoDlg::chkContains(const char* d, const char* filter, int len)
-{
-  if (!d)
-    return false;
-
-  while (*d)
-  {
-    if (strncasecmp(d, filter, len) == 0)
-      return true;
-    d++;
-  }
-
-  return false;
-}
-
-void UserInfoDlg::ShowHistory()
-{
-  m_nHistoryShowing = 0;
-
-  // Last check (will be true if history is empty)
-  if (m_lHistoryList.size() == 0) return;
-  HistoryListIter tempIter = m_iHistorySIter;
-
-  QString s;
-  QString tmp;
-  QDateTime date;
-  QString contactName = tr("server");
-  QTextCodec* codec = QTextCodec::codecForLocale();
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
-  bool bUseHTML = false;
-  if (u != NULL)
-  {
-      codec = UserCodec::codecForICQUser(u);
-      if (!m_bOwner)
-         contactName = QString::fromUtf8(u->GetAlias());
-      for (int x = 0; x < myId.length(); x++)
-      {
-        if (!myId[x].isDigit())
-        {
-          bUseHTML = true;
-          break;
-        }
-      }
-      gUserManager.DropUser(u);
-  }
-  char* ftxt = qstrdup(codec->fromUnicode(lneFilter->text()));
-  int flen = strlen(ftxt);
-
-  QString ownerName;
-  ICQOwner* o = gUserManager.FetchOwner(m_nPPID, LOCK_R);
-  if (o != NULL)
-  {
-    // Don't use this codec to decode our conversation with the contact
-    // since we're using the contact's encoding, not ours.
-    QTextCodec* ownerCodec = UserCodec::codecForICQUser(o);
-    ownerName = ownerCodec->toUnicode(o->GetAlias());
-    gUserManager.DropOwner(m_nPPID);
-  }
-
-  mlvHistory->clear();
-  mlvHistory->setReverse(m_bHistoryReverse);
-  while (m_nHistoryShowing < Config::Chat::instance()->histMsgNum())
-  {
-    if(UserInfoDlg::chkContains((*tempIter)->Text(), ftxt, flen))
-    {
-      date.setTime_t((*tempIter)->Time());
-      QString messageText;
-      if ((*tempIter)->SubCommand() == ICQ_CMDxSUB_SMS) // SMSs are always in UTF-8
-        messageText = QString::fromUtf8((*tempIter)->Text());
-      else
-        messageText = codec->toUnicode((*tempIter)->Text());
-
-      mlvHistory->addMsg((*tempIter)->Direction(), false,
-                  ((*tempIter)->SubCommand() == ICQ_CMDxSUB_MSG ? QString("") : (EventDescription(*tempIter) + " ")),
-                  date,
-                  (*tempIter)->IsDirect(),
-                  (*tempIter)->IsMultiRec(),
-                  (*tempIter)->IsUrgent(),
-                  (*tempIter)->IsEncrypted(),
-                  ((*tempIter)->Direction() == D_RECEIVER ? contactName : ownerName),
-                  MLView::toRichText(messageText, true, bUseHTML));
-      m_nHistoryShowing++;
-    }
-
-    tempIter++;
-    if (tempIter == (lneFilter->text().isEmpty() ?
-                     m_iHistoryEIter : m_lHistoryList.end()))
-      break;
-  }
-
-  // History view is buffered so tell it write buffer to output now that all entries have been added
-  mlvHistory->updateContent();
-
-  delete [] ftxt;
-  if(lneFilter->text().isEmpty())
-    lblHistory->setText(tr("[<font color=\"%1\">Received</font>] "
-                           "[<font color=\"%2\">Sent</font>] "
-                           "%3 to %4 of %5")
-                        .arg(Config::Chat::instance()->recvColor())
-                        .arg(Config::Chat::instance()->sentColor())
-                        .arg(m_nHistoryIndex - m_nHistoryShowing + 1)
-                        .arg(m_nHistoryIndex)
-                        .arg(m_lHistoryList.size()));
-  else
-    lblHistory->setText(tr("[<font color=\"%1\">Received</font>] "
-                           "[<font color=\"%2\">Sent</font>] "
-                           "%3 out of %4 matches")
-                        .arg(Config::Chat::instance()->recvColor())
-                        .arg(Config::Chat::instance()->sentColor())
-                        .arg(m_nHistoryShowing)
-                        .arg(m_lHistoryList.size()));
-  /*mlvHistory->append(tmp.left(tmp.length()-4));*/
-  if(!m_bHistoryReverse)
-    mlvHistory->GotoEnd();
-  else
-    mlvHistory->GotoHome();
-}
-
-
-void UserInfoDlg::SaveHistory()
-{
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
-  if (u == NULL) return;
-
-  QTextCodec* codec = UserCodec::codecForICQUser(u);
-
-  u->SaveHistory(codec->fromUnicode(mlvHistory->toPlainText()));
-  gUserManager.DropUser(u);
-}
-
-
-// -----------------------------------------------------------------------------
 
 void UserInfoDlg::updateTab(int index)
@@ -2127 +1820 @@
       btnMain2->setEnabled(true);
       btnMain1->setEnabled(true);
-      break;
-
-    case HistoryInfo:
-      btnMain3->setText(tr("Nex&t"));
-      btnMain2->setText(tr("P&rev"));
-      btnMain1->setText(m_bOwner ? (QString)"" : tr("&Menu"));
-      if (tabList[HistoryInfo].loaded)
-      {
-        btnMain3->setEnabled(m_iHistoryEIter != m_lHistoryList.end());
-        btnMain2->setEnabled((m_nHistoryIndex - m_nHistoryShowing) != 0);
-      }
-      btnMain1->setEnabled(!m_bOwner);
-      mlvHistory->setFocus();
       break;
 
@@ -2188 +1868 @@
         SetPicture(NULL);
         break;
-      case HistoryInfo:
-        SetupHistory();
-        break;
       case LastCountersInfo:
         SetLastCountersInfo(NULL);
@@ -2230 +1907 @@
     SavePicture();
     break;
-  case HistoryInfo:
-    if (!m_bOwner)
-      ShowHistoryPrev();
-    break;
   case LastCountersInfo:
     break;
@@ -2252 +1925 @@
 {
   if (currentTab == LastCountersInfo) return;
-
-  if (currentTab == HistoryInfo)
-  {
-    if (m_bOwner)
-      ShowHistoryPrev();
-    else
-      ShowHistoryNext();
-    return;
-  }
 
 #ifdef USE_KABC
@@ -2367 +2031 @@
   QTextCodec* codec = QTextCodec::codecForLocale();
 
-  if (currentTab != HistoryInfo &&
-      currentTab != PhoneInfo &&
+  if (currentTab != PhoneInfo &&
       currentTab != PictureInfo)
   {
@@ -2512 +2175 @@
     break;
   }
-  case HistoryInfo:
-    ShowHistoryNext();
-    break;
   }
 

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

@@ -24 +24 @@
 #include <QDialog>
 
-#include <licq_history.h>
 #include <licq_user.h>
 
@@ -30 +29 @@
 class QComboBox;
 class QLabel;
-class QLineEdit;
 class QPushButton;
 class QSpinBox;
@@ -41 +39 @@
 namespace LicqQtGui
 {
-class HistoryView;
 class InfoField;
 class MLEdit;
@@ -60 +57 @@
     PhoneInfo,
     PictureInfo,
-    HistoryInfo,
     LastCountersInfo,
 #ifdef USE_KDE
@@ -197 +193 @@
   QString m_kabcID;
 
-  // History tab
-  void CreateHistory();
-  void SetupHistory();
-  void SaveHistory();
-  InfoField* nfoHistory;
-  HistoryView* mlvHistory;
-  QLabel* lblHistory;
-  QLabel* lblFilter;
-  QLineEdit* lneFilter;
-  QCheckBox* chkHistoryReverse;
-  HistoryList m_lHistoryList;
-  HistoryListIter m_iHistorySIter;
-  HistoryListIter m_iHistoryEIter;
-  bool m_bHistoryReverse;
-  unsigned short m_nHistoryIndex;
-  unsigned short m_nHistoryShowing;
-
   void SetGeneralInfo(ICQUser*);
   void SetMoreInfo(ICQUser*);
@@ -243 +222 @@
 
 private slots:
-  void ShowHistory();
-  void ShowHistoryPrev();
-  void ShowHistoryNext();
-  void HistoryReverse(bool);
-  void HistoryReload();
   void updateTab(int index);
   void updatedUser(CICQSignal*);
@@ -257 +231 @@
   void resetCaption();
   void ShowUsermenu();
-  void slot_showHistoryTimer();
   void EditCategory(QTreeWidgetItem* selected);
   void setCategory(ICQUserCategory* cat);