projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lots of additions again. Working on implementing commands and prettifying the output.
[quassel.git]
/
gui
/
channelwidget.h
diff --git
a/gui/channelwidget.h
b/gui/channelwidget.h
index
7338ecd
..
e1d2f2e
100644
(file)
--- a/
gui/channelwidget.h
+++ b/
gui/channelwidget.h
@@
-24,27
+24,34
@@
#include "ui_channelwidget.h"
#include "ui_ircwidget.h"
#include "ui_channelwidget.h"
#include "ui_ircwidget.h"
+#include "global.h"
#include "message.h"
class ChannelWidget : public QWidget {
Q_OBJECT
public:
#include "message.h"
class ChannelWidget : public QWidget {
Q_OBJECT
public:
- ChannelWidget(QString netname, QString bufname, QWidget *parent = 0);
+ ChannelWidget(QString netname, QString bufname, Q
String ownNick, Q
Widget *parent = 0);
QString bufferName() { return _bufferName; }
QString networkName() { return _networkName; }
signals:
QString bufferName() { return _bufferName; }
QString networkName() { return _networkName; }
signals:
- void send
Message
(QString, QString, QString);
+ void send
Input
(QString, QString, QString);
public slots:
void recvMessage(Message);
void recvStatusMsg(QString msg);
void setTopic(QString);
void setNicks(QStringList);
public slots:
void recvMessage(Message);
void recvStatusMsg(QString msg);
void setTopic(QString);
void setNicks(QStringList);
+ void addNick(QString nick, VarMap props);
+ void removeNick(QString nick);
+ void updateNick(QString nick, VarMap props);
+ void setOwnNick(QString nick);
+
private slots:
void enterPressed();
private slots:
void enterPressed();
+ void updateNickList();
private:
Ui::ChannelWidget ui;
private:
Ui::ChannelWidget ui;
@@
-52,6
+59,7
@@
class ChannelWidget : public QWidget {
QColor stdCol, errorCol, noticeCol, joinCol, quitCol, partCol, serverCol;
QString _networkName;
QString _bufferName;
QColor stdCol, errorCol, noticeCol, joinCol, quitCol, partCol, serverCol;
QString _networkName;
QString _bufferName;
+ VarMap nicks;
};
/** Temporary widget for displaying a set of ChannelWidgets. */
};
/** Temporary widget for displaying a set of ChannelWidgets. */
@@
-66,9
+74,13
@@
class IrcWidget : public QWidget {
void recvStatusMsg(QString network, QString message);
void setTopic(QString, QString, QString);
void setNicks(QString, QString, QStringList);
void recvStatusMsg(QString network, QString message);
void setTopic(QString, QString, QString);
void setNicks(QString, QString, QStringList);
+ void addNick(QString net, QString nick, VarMap props);
+ void removeNick(QString net, QString nick);
+ void updateNick(QString net, QString nick, VarMap props);
+ void setOwnNick(QString net, QString nick);
signals:
signals:
- void send
Message
(QString network, QString buffer, QString message);
+ void send
Input
(QString network, QString buffer, QString message);
private slots:
void userInput(QString, QString, QString);
private slots:
void userInput(QString, QString, QString);
@@
-76,6
+88,8
@@
class IrcWidget : public QWidget {
private:
Ui::IrcWidget ui;
QHash<QString, ChannelWidget *> buffers;
private:
Ui::IrcWidget ui;
QHash<QString, ChannelWidget *> buffers;
+ VarMap nicks;
+ QString ownNick;
ChannelWidget * getBuffer(QString net, QString buf);
};
ChannelWidget * getBuffer(QString net, QString buf);
};