Changeset 5446

Timestamp:

09/28/07 21:38:59 (12 months ago)

Author:

eugene

Message:

Made default amount of messages per history page configurable in range of (2..200), ticket 821.

Location:

branches/qt-gui_qt4/src

Files:

• gui-defines.h (modified) (1 diff)
• mainwin.cpp (modified) (2 diffs)
• mainwin.h (modified) (1 diff)
• messagebox.cpp (modified) (2 diffs)
• optionsdlg.cpp (modified) (3 diffs)
• optionsdlg.h (modified) (1 diff)
• userinfodlg.cpp (modified) (6 diffs)

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

@@ -20 +20 @@
 #ifndef GUIDEFINES_H
 #define GUIDEFINES_H
-
-#define NUM_MSG_PER_HISTORY 40
-#define COLOR_SENT "blue"
-#define COLOR_RECEIVED "red"
 
 #define DOCK_DIR "dock/"

branches/qt-gui_qt4/src/mainwin.cpp

@@ -380 +380 @@
   licqConf.ReadStr("DateFormat", szTemp, "hh:mm:ss");
   m_chatDateFormat = QString::fromLatin1(szTemp);
+  licqConf.ReadNum("HistoryMessagesPerPage", m_histMsgNum, 40);
   licqConf.ReadNum("HistoryMessageStyle", m_histMsgStyle, 0);
   licqConf.ReadBool("HistoryVerticalSpacing", m_histVertSpacing, true);
@@ -2784 +2785 @@
   licqConf.WriteStr("ChatBackground", m_colorChatBkg.name().toLatin1());
   licqConf.WriteStr("DateFormat", m_chatDateFormat.toLatin1());
+  licqConf.WriteNum("HistoryMessagesPerPage", m_histMsgNum);
   licqConf.WriteNum("HistoryMessageStyle", m_histMsgStyle);
   licqConf.WriteBool("HistoryVerticalSpacing", m_histVertSpacing);

branches/qt-gui_qt4/src/mainwin.h

@@ -203 +203 @@
                  m_nSortColumn,
                  m_chatMsgStyle,
-                 m_histMsgStyle;
+                 m_histMsgStyle,
+                 m_histMsgNum;
 
   QString m_chatDateFormat,

branches/qt-gui_qt4/src/messagebox.cpp

@@ -34 +34 @@
 
 #include "eventdesc.h"
-#include "gui-defines.h"
 
 using namespace LicqQtGui;
@@ -73 +72 @@
   QColor foreColor;
   if (myMsg->Direction() == D_SENDER)
-    foreColor = QColor(COLOR_SENT);
+    foreColor = QColor("blue");
   else
-    foreColor = QColor(COLOR_RECEIVED);
+    foreColor = QColor("red");
   setForeground(0, foreColor);
   setForeground(1, foreColor);

branches/qt-gui_qt4/src/optionsdlg.cpp

@@ -207 +207 @@
   chkHistReverse->setChecked(mainwin->m_histReverse);
   cmbHistDateFormat->lineEdit()->setText(mainwin->m_histDateFormat);
+  spnHistMsgNum->setValue(mainwin->m_histMsgNum);
   btnColorRcv->setColor(mainwin->m_colorRcv);
   btnColorSnt->setColor(mainwin->m_colorSnt);
@@ -497 +498 @@
   mainwin->m_chatMsgStyle = cmbChatStyle->currentIndex();
   mainwin->m_chatDateFormat = cmbChatDateFormat->currentText();
+  mainwin->m_histMsgNum = spnHistMsgNum->value();
   mainwin->m_histMsgStyle = cmbHistStyle->currentIndex();
   mainwin->m_histVertSpacing = chkHistVertSpacing->isChecked();
@@ -1119 +1121 @@
   layHistDisp->addLayout(layHistDateFormat);
 
+  QHBoxLayout *layHistMsgNum = new QHBoxLayout();
+  lblHistMsgNum = new QLabel(tr("Entries per page:"));
+  layHistMsgNum->addWidget(lblHistMsgNum);
+  spnHistMsgNum = new QSpinBox();
+  spnHistMsgNum->setRange(2, 200);
+  layHistMsgNum->addWidget(spnHistMsgNum);
+  layHistDisp->addLayout(layHistMsgNum);
+
   QHBoxLayout *layHistOpts = new QHBoxLayout();
   chkHistVertSpacing = new QCheckBox(tr("Insert vertical spacing"));

branches/qt-gui_qt4/src/optionsdlg.h

@@ -269 +269 @@
   QVBoxLayout *layHistDisp;
   QVBoxLayout *layHistPreview;
-  QLabel *lblHistStyle, *lblHistDateFormat;
+  QLabel *lblHistStyle, *lblHistDateFormat, *lblHistMsgNum;
   QComboBox *cmbHistStyle;
   QCheckBox *chkHistVertSpacing;
   QCheckBox *chkHistReverse;
   QComboBox *cmbHistDateFormat;
+  QSpinBox *spnHistMsgNum;
   HistoryView* msgHistViewer;
 

branches/qt-gui_qt4/src/userinfodlg.cpp

@@ -80 +80 @@
 #include "ewidgets.h"
 #include "eventdesc.h"
-#include "gui-defines.h"
 #include "historyview.h"
 #include "mainwin.h"
@@ -1954 +1953 @@
     m_iHistorySIter = m_iHistoryEIter;
     for (unsigned short i = 0;
-         (i < NUM_MSG_PER_HISTORY) && (m_iHistorySIter != m_lHistoryList.begin());
+         (i < gMainWindow->m_histMsgNum) && (m_iHistorySIter != m_lHistoryList.begin());
          i++)
     {
@@ -1994 +1993 @@
   {
     m_iHistoryEIter = m_iHistorySIter;
-    m_nHistoryIndex -= NUM_MSG_PER_HISTORY;
+    m_nHistoryIndex -= gMainWindow->m_histMsgNum;
     for (unsigned short i = 0;
-         (i < NUM_MSG_PER_HISTORY) && (m_iHistorySIter != m_lHistoryList.begin());
+         (i < gMainWindow->m_histMsgNum) && (m_iHistorySIter != m_lHistoryList.begin());
          i++)
     {
@@ -2013 +2012 @@
     m_iHistorySIter = m_iHistoryEIter;
     for (unsigned short i = 0;
-         (i < NUM_MSG_PER_HISTORY) && (m_iHistoryEIter != m_lHistoryList.end());
+         (i < gMainWindow->m_histMsgNum) && (m_iHistoryEIter != m_lHistoryList.end());
          i++)
     {
@@ -2066 +2065 @@
       gUserManager.DropUser(u);
   }
-  barFiltering->setRange(0, NUM_MSG_PER_HISTORY);
+  barFiltering->setRange(0, gMainWindow->m_histMsgNum);
   char* ftxt = qstrdup(codec->fromUnicode(lneFilter->text()));
   int flen = strlen(ftxt);
@@ -2083 +2082 @@
   mlvHistory->clear();
   mlvHistory->setReverse(m_bHistoryReverse);
-  while (m_nHistoryShowing < (NUM_MSG_PER_HISTORY))
+  while (m_nHistoryShowing < gMainWindow->m_histMsgNum)
   {
     if(UserInfoDlg::chkContains((*tempIter)->Text(), ftxt, flen))