Changeset 5724

Timestamp:

10/29/07 01:36:28 (10 months ago)

Author:

flynd

Message:

Renamed MsgView? to MessageList? and moved it to widgets dir.

Location:

branches/qt-gui_qt4/src

Files:

• CMakeLists.txt (modified) (1 diff)
• userevents/userviewevent.cpp (modified) (10 diffs)
• userevents/userviewevent.h (modified) (2 diffs)
• widgets/CMakeLists.txt (modified) (2 diffs)
• widgets/messagelist.cpp (moved) (moved from branches/qt-gui_qt4/src/messagebox.cpp) (13 diffs)
• widgets/messagelist.h (moved) (moved from branches/qt-gui_qt4/src/messagebox.h) (3 diffs)

branches/qt-gui_qt4/src/CMakeLists.txt

@@ -5 +5 @@
   licqgui.cpp
   mainwin.cpp
-  messagebox.cpp
   mlview.cpp
   signalmanager.cpp

branches/qt-gui_qt4/src/userevents/userviewevent.cpp

@@ -49 +49 @@
 #include "dialogs/refusedlg.h"
 
+#include "widgets/messagelist.h"
 #include "widgets/skinnablebutton.h"
 
@@ -54 +55 @@
 #include "gui-defines.h"
 #include "mainwin.h"
-#include "messagebox.h"
 #include "mlview.h"
 #include "signalmanager.h"
@@ -75 +75 @@
   connect(a, SIGNAL(activated()), this, SLOT(close()));
 
-  msgView = new MsgView();
+  msgView = new MessageList();
   splRead->addWidget(msgView);
 
@@ -157 +157 @@
       i = 0;
 
-    MsgViewItem* e = new MsgViewItem(u->EventPeek(i), myCodec, msgView);
+    MessageListItem* e = new MessageListItem(u->EventPeek(i), myCodec, msgView);
     myHighestEventId = u->EventPeek(i)->Id();
 
@@ -171 +171 @@
           event->SubCommand() != ICQ_CMDxSUB_MSG)
       {
-        new MsgViewItem(event, myCodec, msgView);
+        new MessageListItem(event, myCodec, msgView);
         // Make sure we don't add this message again,
         // even if we receive an userUpdated signal for it.
@@ -242 +242 @@
 {
   int num = msgView->getNumUnread();
-  MsgViewItem* e = msgView->getNextUnread();
+  MessageListItem* e = msgView->getNextUnread();
 
   btnReadNext->setEnabled(num > 0);
@@ -273 +273 @@
       {
          myHighestEventId = eventId;
-         MsgViewItem* m = new MsgViewItem(e, myCodec, msgView);
+         MessageListItem* m = new MessageListItem(e, myCodec, msgView);
          msgView->scrollToItem(m);
       }
@@ -586 +586 @@
 void UserViewEvent::slotBtnReadNext()
 {
-  MsgViewItem* e = msgView->getNextUnread();
+  MessageListItem* e = msgView->getNextUnread();
 
   updateNextButton();
@@ -631 +631 @@
     return;
 
-  MsgViewItem* e = dynamic_cast<MsgViewItem*>(item);
+  MessageListItem* e = dynamic_cast<MessageListItem*>(item);
 
   btnRead1->setText("");
@@ -788 +788 @@
 
   if (!Config::Chat::instance()->msgChatView())
-    new MsgViewItem(e->GrabUserEvent(), myCodec, msgView);
+    new MessageListItem(e->GrabUserEvent(), myCodec, msgView);
 }
 

branches/qt-gui_qt4/src/userevents/userviewevent.h

@@ -36 +36 @@
 {
 class MLView;
-class MsgView;
+class MessageList;
 class SkinnableButton;
 class UserSendCommon;
@@ -52 +52 @@
   QSplitter* splRead;
   MLView* mlvRead;
-  MsgView* msgView;
+  MessageList* msgView;
   CUserEvent* currentEvent;
   QCheckBox* chkAutoClose;

branches/qt-gui_qt4/src/widgets/CMakeLists.txt

@@ -3 +3 @@
   colorbutton.cpp
   infofield.cpp
+  messagelist.cpp
   mledit.cpp
   protocombobox.cpp
@@ -20 +21 @@
 
 add_library(widgets STATIC ${widgets_SRCS} ${widget_MOC_SRCS})
-target_link_libraries(widgets config)
+target_link_libraries(widgets config helpers)

branches/qt-gui_qt4/src/widgets/messagelist.cpp

@@ -19 +19 @@
  */
 
-#include "messagebox.h"
+#include "messagelist.h"
 
 #include "config.h"
@@ -37 +37 @@
 using namespace LicqQtGui;
 
-/* TRANSLATOR LicqQtGui::MsgView */
-
-MsgViewItem::MsgViewItem(CUserEvent* theMsg, QTextCodec* codec, QTreeWidget* parent)
+/* TRANSLATOR LicqQtGui::MessageList */
+/* TRANSLATOR LicqQtGui::MessageListItem */
+
+MessageListItem::MessageListItem(CUserEvent* theMsg, QTextCodec* codec, QTreeWidget* parent)
   : QTreeWidgetItem(parent)
 {
@@ -95 +96 @@
 }
 
-MsgViewItem::~MsgViewItem(void)
+MessageListItem::~MessageListItem(void)
 {
   delete myMsg;
 }
 
-void MsgViewItem::SetEventLine()
+void MessageListItem::SetEventLine()
 {
   QString s = EventDescription(myMsg);
@@ -159 +160 @@
 }
 
-void MsgViewItem::MarkRead()
+void MessageListItem::MarkRead()
 {
   myUnread = false;
@@ -174 +175 @@
 }
 
-//-----MsgView::constructor------------------------------------------------------------------------
-MsgView::MsgView(QWidget* parent)
+//-----MessageList::constructor------------------------------------------------------------------------
+MessageList::MessageList(QWidget* parent)
   : QTreeWidget(parent)
 {
@@ -204 +205 @@
 }
 
-CUserEvent* MsgView::currentMsg()
+CUserEvent* MessageList::currentMsg()
 {
   if (currentItem() == NULL)
     return NULL;
-  return (dynamic_cast<MsgViewItem*>(currentItem())->msg());
-}
-
-QSize MsgView::sizeHint() const
+  return (dynamic_cast<MessageListItem*>(currentItem())->msg());
+}
+
+QSize MessageList::sizeHint() const
 {
   QSize s = QTreeWidget::sizeHint();
@@ -219 +220 @@
 }
 
-int MsgView::getNumUnread() const
+int MessageList::getNumUnread() const
 {
   int num = 0;
@@ -225 +226 @@
   for (int i = 0; i < topLevelItemCount(); ++i)
   {
-    MsgViewItem* item = dynamic_cast<MsgViewItem*>(topLevelItem(i));
+    MessageListItem* item = dynamic_cast<MessageListItem*>(topLevelItem(i));
     if (item->isUnread())
       num++;
@@ -232 +233 @@
 }
 
-MsgViewItem* MsgView::getNextUnread()
-{
-  MsgViewItem* next = NULL;
+MessageListItem* MessageList::getNextUnread()
+{
+  MessageListItem* next = NULL;
   for (int i = 0; i < topLevelItemCount(); ++i)
   {
-    MsgViewItem* item = dynamic_cast<MsgViewItem*>(topLevelItem(i));
+    MessageListItem* item = dynamic_cast<MessageListItem*>(topLevelItem(i));
     if (item->isUnread())
       next = item;
@@ -244 +245 @@
 }
 
-void MsgView::resizeEvent(QResizeEvent *e)
+void MessageList::resizeEvent(QResizeEvent *e)
 {
   QScrollBar *s = verticalScrollBar();
@@ -258 +259 @@
 }
 
-void MsgView::SetEventLines()
+void MessageList::SetEventLines()
 {
   for (int i = 0; i < topLevelItemCount(); ++i)
   {
-    MsgViewItem* item = dynamic_cast<MsgViewItem*>(topLevelItem(i));
+    MessageListItem* item = dynamic_cast<MessageListItem*>(topLevelItem(i));
     item->SetEventLine();
   }
 }
 
-bool MsgView::event(QEvent *event)
+bool MessageList::event(QEvent *event)
 {
   if (event->type() == QEvent::ToolTip)
@@ -273 +274 @@
     QHelpEvent *helpEvent = static_cast<QHelpEvent *>(event);
 
-    MsgViewItem *item = static_cast<MsgViewItem*>(itemAt(helpEvent->pos()));
+    MessageListItem *item = static_cast<MessageListItem*>(itemAt(helpEvent->pos()));
     if (item != NULL)
     {
@@ -293 +294 @@
 }
 
-void MsgView::drawRow(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+void MessageList::drawRow(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
   QStyleOptionViewItem option2(option);

branches/qt-gui_qt4/src/widgets/messagelist.h

@@ -18 +18 @@
  */
 
-#ifndef MESSAGEBOX_H
-#define MESSAGEBOX_H
+#ifndef MESSAGELIST_H
+#define MESSAGELIST_H
 
 #include <QTreeWidget>
@@ -30 +30 @@
 namespace LicqQtGui
 {
-class MsgView;
 
-class MsgViewItem : public QTreeWidgetItem
+class MessageListItem : public QTreeWidgetItem
 {
 public:
-  MsgViewItem(CUserEvent* theMsg, QTextCodec* codec, QTreeWidget* parent);
-  ~MsgViewItem(void);
+  MessageListItem(CUserEvent* theMsg, QTextCodec* codec, QTreeWidget* parent);
+  ~MessageListItem(void);
   void MarkRead();
   void SetEventLine();
@@ -50 +49 @@
 
 
-class MsgView : public QTreeWidget
+class MessageList : public QTreeWidget
 {
   Q_OBJECT
 public:
-  MsgView (QWidget *parent = 0);
+  MessageList (QWidget *parent = 0);
   CUserEvent* currentMsg();
   QSize sizeHint() const;
   int getNumUnread() const;
-  MsgViewItem* getNextUnread();
+  MessageListItem* getNextUnread();
 
 signals: