Changeset 5115

Timestamp:

08/08/07 06:06:52 (14 months ago)

Author:

eugene

Message:

Make history reverse optional.

Location:

branches/qt-gui_qt4/src

Files:

• ewidgets.cpp (modified) (5 diffs)
• ewidgets.h (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)
• mainwin.h (modified) (1 diff)
• optionsdlg.cpp (modified) (4 diffs)
• optionsdlg.h (modified) (1 diff)
• userinfodlg.cpp (modified) (4 diffs)

branches/qt-gui_qt4/src/ewidgets.cpp

@@ -162 +162 @@
     m_nDateFormat = m->m_histDateFormat;
     m_extraSpacing = m->m_histVertSpacing;
+    m_reverse = m->m_histReverse;
     m_appendLineBreak = false;
   }
@@ -170 +171 @@
     m_nDateFormat = m->m_chatDateFormat;
     m_extraSpacing = m->m_chatVertSpacing;
+    m_reverse = false;
     m_appendLineBreak = m->m_chatAppendLineBreak;
   }
@@ -213 +215 @@
     m_nDateFormat = m->m_histDateFormat;
     m_extraSpacing = m->m_histVertSpacing;
+    m_reverse = m->m_histReverse;
     m_appendLineBreak = false;
   }
@@ -221 +224 @@
     m_nDateFormat = m->m_chatDateFormat;
     m_extraSpacing = m->m_chatVertSpacing;
+    m_reverse = false;
     m_appendLineBreak = m->m_chatAppendLineBreak;
   }
@@ -318 +322 @@
       s.append("<br>");
 
-    m_buffer.append(s);
     if (m_appendLineBreak)
-      m_buffer.append("<hr>");
+      s.append("<hr>");
+
+    if (m_reverse)
+      m_buffer.prepend(s);
+    else
+      m_buffer.append(s);
   }
   else
   {
+    if (m_appendLineBreak)
+      s.append("<hr>");
+
     append(s);
-    if (m_appendLineBreak)
-      append("<hr>");
   }
 }

branches/qt-gui_qt4/src/ewidgets.h

@@ -82 +82 @@
   QString m_nDateFormat;
   bool m_extraSpacing;
+  bool m_reverse;
   bool m_appendLineBreak;
   bool m_useBuffer;

branches/qt-gui_qt4/src/mainwin.cpp

@@ -490 +490 @@
   licqConf.ReadNum("HistoryMessageStyle", m_histMsgStyle, 0);
   licqConf.ReadBool("HistoryVerticalSpacing", m_histVertSpacing, true);
+  licqConf.ReadBool("HistoryReverse", m_histReverse, true);
   licqConf.ReadStr("HistoryDateFormat", szTemp, "yyyy-MM-dd hh:mm:ss");
   m_histDateFormat = QString::fromLatin1(szTemp);
@@ -3628 +3629 @@
   licqConf.WriteNum("HistoryMessageStyle", m_histMsgStyle);
   licqConf.WriteBool("HistoryVerticalSpacing", m_histVertSpacing);
+  licqConf.WriteBool("HistoryReverse", m_histReverse);
   licqConf.WriteStr("HistoryDateFormat", m_histDateFormat.latin1());
 

branches/qt-gui_qt4/src/mainwin.h

@@ -205 +205 @@
        m_chatAppendLineBreak,
        m_histVertSpacing,
+       m_histReverse,
        m_bFlashTaskbar,
        m_bMainWinSticky,

branches/qt-gui_qt4/src/optionsdlg.cpp

@@ -213 +213 @@
   cmbHistStyle->setCurrentIndex(mainwin->m_histMsgStyle);
   chkHistVertSpacing->setChecked(mainwin->m_histVertSpacing);
+  chkHistReverse->setChecked(mainwin->m_histReverse);
   cmbHistDateFormat->lineEdit()->setText(mainwin->m_histDateFormat);
   btnColorRcv->setColor(mainwin->m_colorRcv);
@@ -505 +506 @@
   mainwin->m_histMsgStyle = cmbHistStyle->currentIndex();
   mainwin->m_histVertSpacing = chkHistVertSpacing->isChecked();
+  mainwin->m_histReverse = chkHistReverse->isChecked();
   mainwin->m_histDateFormat = cmbHistDateFormat->currentText();
   mainwin->m_colorRcv = btnColorRcv->getColor();
@@ -1117 +1119 @@
   layHistDisp->addLayout(layHistDateFormat);
 
+  QHBoxLayout *layHistOpts = new QHBoxLayout();
   chkHistVertSpacing = new QCheckBox(tr("Insert vertical spacing"));
   connect(chkHistVertSpacing, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
   chkHistVertSpacing->setToolTip(tr("Insert extra space between messages."));
-  layHistDisp->addWidget(chkHistVertSpacing);
+  layHistOpts->addWidget(chkHistVertSpacing);
+
+  chkHistReverse = new QCheckBox(tr("Reverse history"));
+  connect(chkHistReverse, SIGNAL(toggled(bool)), this, SLOT(slot_refresh_msgViewer()));
+  chkHistReverse->setToolTip(tr("Put recent messages on top."));
+  layHistOpts->addWidget(chkHistReverse);
+  layHistDisp->addLayout(layHistOpts);
 
   boxHistPreview = new QGroupBox(tr("Preview"));
@@ -2020 +2029 @@
   msgHistViewer->m_nMsgStyle = cmbHistStyle->currentIndex();
   msgHistViewer->m_extraSpacing = chkHistVertSpacing->isChecked();
+  msgHistViewer->m_reverse = chkHistReverse->isChecked();
   msgHistViewer->m_colorSnt = btnColorSnt->getColor();
   msgHistViewer->m_colorRcv = btnColorRcv->getColor();

branches/qt-gui_qt4/src/optionsdlg.h

@@ -269 +269 @@
   QComboBox *cmbHistStyle;
   QCheckBox *chkHistVertSpacing;
+  QCheckBox *chkHistReverse;
   QComboBox *cmbHistDateFormat;
   CMessageViewWidget *msgHistViewer;

branches/qt-gui_qt4/src/userinfodlg.cpp

@@ -1774 +1774 @@
   chkHistoryReverse = new QCheckBox(tr("Rever&se"));
   connect(chkHistoryReverse, SIGNAL(toggled(bool)), SLOT(HistoryReverse(bool)));
-  chkHistoryReverse->setChecked(m_bHistoryReverse = true);
+  chkHistoryReverse->setChecked(m_bHistoryReverse = mainwin->m_histReverse);
   chkHistoryReverse->setFixedSize(chkHistoryReverse->sizeHint());
   l->addWidget(chkHistoryReverse);
@@ -2045 +2045 @@
   // Last check (will be true if history is empty)
   if (m_lHistoryList.size() == 0) return;
-  HistoryListIter tempIter;
-
-  if(m_bHistoryReverse)
-  {
-    tempIter = m_iHistoryEIter;
-    tempIter--;
-  }
-  else
-  {
-    tempIter = m_iHistorySIter;
-  }
+  HistoryListIter tempIter = m_iHistorySIter;
+
   QString s;
   QString tmp;
@@ -2094 +2085 @@
 
   mlvHistory->clear();
+  mlvHistory->m_reverse = m_bHistoryReverse;
   while (m_nHistoryShowing < (NUM_MSG_PER_HISTORY))
   {
@@ -2117 +2109 @@
       barFiltering->setValue(m_nHistoryShowing);
     }
-    if(m_bHistoryReverse)
-    {
-      if (tempIter == (lneFilter->text().isEmpty() ?
-                       m_iHistorySIter : m_lHistoryList.begin()))
-        break;
-      tempIter--;
-    }
-    else
-    {
-       tempIter++;
-       if (tempIter == (lneFilter->text().isEmpty() ?
-                        m_iHistoryEIter : m_lHistoryList.end()))
-         break;
-    }
+    
+    tempIter++;
+    if (tempIter == (lneFilter->text().isEmpty() ?
+                     m_iHistoryEIter : m_lHistoryList.end()))
+      break;
   }