http://sourceforge.net/tracker/index.php?func=detail&aid=777187&group_id=254&atid=100254
It also fixs a problem triggered when switching from `Send Contact ...' to another action, in HEAD. -- Buenos Aires, Argentina 18°C with winds at 9 km/h N
Index: plugins/qt-gui/src/usereventdlg.cpp
===================================================================
RCS file: /tmp/licq/qt-gui/src/usereventdlg.cpp,v
retrieving revision 1.134
diff -u -d -p -r1.134 usereventdlg.cpp
--- plugins/qt-gui/src/usereventdlg.cpp 2 Jul 2003 15:58:31 -0000 1.134
+++ plugins/qt-gui/src/usereventdlg.cpp 30 Jul 2003 18:44:45 -0000
@@ -1470,12 +1470,12 @@ UserSendCommon::UserSendCommon(CICQDaemo
btnMenu->setPopup(mainwin->UserMenu());
}
cmbSendType = new QComboBox(this);
- cmbSendType->insertItem(tr("Message"));
- cmbSendType->insertItem(tr("URL"));
- cmbSendType->insertItem(tr("Chat Request"));
- cmbSendType->insertItem(tr("File Transfer"));
- cmbSendType->insertItem(tr("Contact List"));
- cmbSendType->insertItem(tr("SMS"));
+ cmbSendType->insertItem(tr("Message"), UC_MESSAGE);
+ cmbSendType->insertItem(tr("URL"), UC_URL);
+ cmbSendType->insertItem(tr("Chat Request"), UC_CHAT);
+ cmbSendType->insertItem(tr("File Transfer"), UC_FILE);
+ cmbSendType->insertItem(tr("Contact List"), UC_CONTACT);
+ cmbSendType->insertItem(tr("SMS"), UC_SMS);
connect(cmbSendType, SIGNAL(activated(int)), this, SLOT(changeEventType(int)));
h_lay->addWidget(cmbSendType);
h_lay->addStretch(1);
@@ -1592,12 +1592,12 @@ UserSendCommon::UserSendCommon(CICQDaemo
btnMenu->setPopup(mainwin->UserMenu());
}
cmbSendType = new QComboBox(this);
- cmbSendType->insertItem(tr("Message"));
- cmbSendType->insertItem(tr("URL"));
- cmbSendType->insertItem(tr("Chat Request"));
- cmbSendType->insertItem(tr("File Transfer"));
- cmbSendType->insertItem(tr("Contact List"));
- cmbSendType->insertItem(tr("SMS"));
+ cmbSendType->insertItem(tr("Message"), UC_MESSAGE);
+ cmbSendType->insertItem(tr("URL"), UC_URL);
+ cmbSendType->insertItem(tr("Chat Request"), UC_CHAT);
+ cmbSendType->insertItem(tr("File Transfer"), UC_FILE);
+ cmbSendType->insertItem(tr("Contact List"), UC_CONTACT);
+ cmbSendType->insertItem(tr("SMS"), UC_SMS);
connect(cmbSendType, SIGNAL(activated(int)), this, SLOT(changeEventType(int)));
h_lay->addWidget(cmbSendType);
h_lay->addStretch(1);
@@ -1776,43 +1776,47 @@ void UserSendCommon::changeEventType(int
switch(id)
{
#ifdef QT_PROTOCOL_PLUGIN
- case 0:
+ case UC_MESSAGE:
e = new UserSendMsgEvent(server, sigman, mainwin, m_szId, m_nPPID);
break;
- case 1:
+ case UC_URL:
e = new UserSendUrlEvent(server, sigman, mainwin, m_szId, m_nPPID);
break;
- case 2:
+ case UC_CHAT:
e = new UserSendChatEvent(server, sigman, mainwin, m_szId, m_nPPID);
break;
- case 3:
+ case UC_FILE:
e = new UserSendFileEvent(server, sigman, mainwin, m_szId, m_nPPID);
break;
- case 4:
+ case UC_CONTACT:
e = new UserSendContactEvent(server, sigman, mainwin, m_szId, m_nPPID);
break;
- case 5:
+ case UC_SMS:
e = new UserSendSmsEvent(server, sigman, mainwin, m_szId, m_nPPID);
break;
+ default:
+ assert(0);
#else
- case 0:
+ case UC_MESSAGE:
e = new UserSendMsgEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
break;
- case 1:
+ case UC_URL:
e = new UserSendUrlEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
break;
- case 2:
+ case UC_CHAT:
e = new UserSendChatEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
break;
- case 3:
+ case UC_FILE:
e = new UserSendFileEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
break;
- case 4:
+ case UC_CONTACT:
e = new UserSendContactEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
break;
- case 5:
+ case UC_SMS:
e = new UserSendSmsEvent(server, sigman, mainwin, m_szId, m_nPPID, parent);
break;
+ default:
+ assert(0);
#endif
}
@@ -2402,7 +2406,7 @@ UserSendMsgEvent::UserSendMsgEvent(CICQD
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(0);
+ cmbSendType->setCurrentItem(UC_MESSAGE);
}
UserSendMsgEvent::UserSendMsgEvent(CICQDaemon *s, CSignalManager *theSigMan,
@@ -2421,7 +2425,7 @@ UserSendMsgEvent::UserSendMsgEvent(CICQD
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(0);
+ cmbSendType->setCurrentItem(UC_MESSAGE);
}
@@ -2567,7 +2571,7 @@ UserSendUrlEvent::UserSendUrlEvent(CICQD
m_sBaseTitle += tr(" - URL");
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(1);
+ cmbSendType->setCurrentItem(UC_URL);
}
#endif
@@ -2593,7 +2597,7 @@ UserSendUrlEvent::UserSendUrlEvent(CICQD
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(1);
+ cmbSendType->setCurrentItem(UC_URL);
}
UserSendUrlEvent::UserSendUrlEvent(CICQDaemon *s, CSignalManager *theSigMan,
@@ -2617,7 +2621,7 @@ UserSendUrlEvent::UserSendUrlEvent(CICQD
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(1);
+ cmbSendType->setCurrentItem(UC_URL);
}
@@ -2724,7 +2728,7 @@ UserSendFileEvent::UserSendFileEvent(CIC
m_sBaseTitle += tr(" - File Transfer");
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(3);
+ cmbSendType->setCurrentItem(UC_FILE);
}
#endif
@@ -2765,7 +2769,7 @@ UserSendFileEvent::UserSendFileEvent(CIC
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(3);
+ cmbSendType->setCurrentItem(UC_FILE);
}
UserSendFileEvent::UserSendFileEvent(CICQDaemon *s, CSignalManager *theSigMan,
@@ -2804,7 +2808,7 @@ UserSendFileEvent::UserSendFileEvent(CIC
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(3);
+ cmbSendType->setCurrentItem(UC_FILE);
}
@@ -2979,7 +2983,7 @@ UserSendChatEvent::UserSendChatEvent(CIC
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(2);
+ cmbSendType->setCurrentItem(UC_CHAT);
}
UserSendChatEvent::UserSendChatEvent(CICQDaemon *s, CSignalManager *theSigMan,
@@ -3015,7 +3019,7 @@ UserSendChatEvent::UserSendChatEvent(CIC
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(2);
+ cmbSendType->setCurrentItem(UC_CHAT);
}
@@ -3123,10 +3127,9 @@ UserSendContactEvent::UserSendContactEve
lay->addWidget(splView);
QLabel* lblContact = new QLabel(tr("Drag Users Here - Right Click for Options"), mainWidget);
lay->addWidget(lblContact);
-
lstContacts = new CMMUserView(mainwin->colInfo, mainwin->m_bShowHeader,
- m_nUin, mainwin, mainWidget);
- lay->addWidget(lstContacts);
+ (char *)szId, nPPID, mainwin, mainWidget);
+ lay->addWidget(lstContacts);
m_sBaseTitle += tr(" - Contact List");
#if QT_VERSION >= 300
@@ -3135,7 +3138,7 @@ UserSendContactEvent::UserSendContactEve
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(4);
+ cmbSendType->setCurrentItem(UC_CONTACT);
}
UserSendContactEvent::UserSendContactEvent(CICQDaemon *s, CSignalManager *theSigMan,
@@ -3143,7 +3146,6 @@ UserSendContactEvent::UserSendContactEve
: UserSendCommon(s, theSigMan, m, _nUin, parent, "UserSendContactEvent")
{
delete mleSend; mleSend = NULL;
-
QBoxLayout* lay = new QVBoxLayout(mainWidget);
lay->addWidget(splView);
QLabel* lblContact = new QLabel(tr("Drag Users Here - Right Click for Options"), mainWidget);
@@ -3160,12 +3162,14 @@ UserSendContactEvent::UserSendContactEve
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(4);
+ cmbSendType->setCurrentItem(UC_CONTACT);
+
}
UserSendContactEvent::~UserSendContactEvent()
{
+
}
@@ -3291,7 +3295,7 @@ UserSendSmsEvent::UserSendSmsEvent(CICQD
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(5);
+ cmbSendType->setCurrentItem(UC_SMS);
}
UserSendSmsEvent::UserSendSmsEvent(CICQDaemon *s, CSignalManager *theSigMan,
@@ -3342,7 +3346,7 @@ UserSendSmsEvent::UserSendSmsEvent(CICQD
mainwin->userEventTabDlg->setCaption(m_sBaseTitle);
#endif
setCaption(m_sBaseTitle);
- cmbSendType->setCurrentItem(5);
+ cmbSendType->setCurrentItem(UC_SMS);
}
//-----UserSendSmsEvent::~UserSendSmsEvent-------------------------------------
Index: plugins/qt-gui/src/usereventdlg.h
===================================================================
RCS file: /tmp/licq/qt-gui/src/usereventdlg.h,v
retrieving revision 1.56
diff -u -d -p -r1.56 usereventdlg.h
--- plugins/qt-gui/src/usereventdlg.h 2 Jul 2003 04:41:02 -0000 1.56
+++ plugins/qt-gui/src/usereventdlg.h 30 Jul 2003 17:39:27 -0000
@@ -100,6 +100,14 @@ public:
char *Id() { return m_szId; }
unsigned long PPID() { return m_nPPID; }
+ enum type {
+ UC_MESSAGE,
+ UC_URL,
+ UC_CHAT,
+ UC_FILE,
+ UC_CONTACT,
+ UC_SMS
+ };
protected:
QTextCodec *codec;
bool m_bOwner;
@@ -277,7 +285,7 @@ public:
protected:
virtual bool sendDone(ICQEvent *);
virtual void resetSettings();
- virtual bool isType(int id) { return (id == 0); }
+ virtual bool isType(int id) { return (id == UC_MESSAGE); }
protected slots:
virtual void sendButton();
@@ -304,7 +312,7 @@ protected:
CInfoField *edtItem;
virtual bool sendDone(ICQEvent *);
virtual void resetSettings();
- virtual bool isType(int id) { return (id == 1); }
+ virtual bool isType(int id) { return (id == UC_URL); }
protected slots:
virtual void sendButton();
@@ -333,7 +341,7 @@ protected:
ConstFileList m_lFileList;
virtual bool sendDone(ICQEvent*);
virtual void resetSettings();
- virtual bool isType(int id) { return (id == 2); }
+ virtual bool isType(int id) { return (id == UC_FILE); }
protected slots:
void browseFile();
@@ -364,7 +372,7 @@ protected:
unsigned short m_nMPChatPort;
virtual bool sendDone(ICQEvent *);
virtual void resetSettings();
- virtual bool isType(int id) { return (id == 3); }
+ virtual bool isType(int id) { return (id == UC_CHAT); }
protected slots:
virtual void sendButton();
@@ -393,7 +401,7 @@ protected:
virtual bool sendDone(ICQEvent *);
virtual void resetSettings();
- virtual bool isType(int id) { return (id == 4); }
+ virtual bool isType(int id) { return (id == UC_CONTACT); }
protected slots:
virtual void sendButton();
@@ -421,7 +429,7 @@ protected:
virtual bool sendDone(ICQEvent *);
virtual void resetSettings();
- virtual bool isType(int id) { return (id == 5); }
+ virtual bool isType(int id) { return (id == UC_SMS); }
protected slots:
virtual void sendButton();
pgp00000.pgp
Description: signature
