jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 17:14:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

don't call alert() when a message in a public chat is received

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-06-25 01:26:20 +02:00
parent a4c3d48389
commit cc795a2dd7
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/tab.h
View file

@ -9,7 +9,7 @@ class TabSupervisor;
class Tab : public QWidget { class Tab : public QWidget {
Q_OBJECT Q_OBJECT
signals: signals:
void userEvent(); void userEvent(bool globalEvent = true);
protected: protected:
QMenu *tabMenu; QMenu *tabMenu;
TabSupervisor *tabSupervisor; TabSupervisor *tabSupervisor;

2
cockatrice/src/tab_room.cpp
View file

@ -262,5 +262,5 @@ void TabRoom::processLeaveRoomEvent(Event_LeaveRoom *event)
void TabRoom::processSayEvent(Event_RoomSay *event) void TabRoom::processSayEvent(Event_RoomSay *event)
{ {
chatView->appendMessage(event->getPlayerName(), event->getMessage()); chatView->appendMessage(event->getPlayerName(), event->getMessage());
emit userEvent(); emit userEvent(false);
} }

7
cockatrice/src/tab_supervisor.cpp
View file

@ -101,7 +101,7 @@ void TabSupervisor::retranslateUi()
int TabSupervisor::myAddTab(Tab *tab) int TabSupervisor::myAddTab(Tab *tab)
{ {
connect(tab, SIGNAL(userEvent()), this, SLOT(tabUserEvent())); connect(tab, SIGNAL(userEvent(bool)), this, SLOT(tabUserEvent(bool)));
return addTab(tab, tab->getTabText()); return addTab(tab, tab->getTabText());
} }
@ -299,14 +299,15 @@ void TabSupervisor::talkLeft(TabMessage *tab)
removeTab(indexOf(tab)); removeTab(indexOf(tab));
} }
void TabSupervisor::tabUserEvent() void TabSupervisor::tabUserEvent(bool globalEvent)
{ {
Tab *tab = static_cast<Tab *>(sender()); Tab *tab = static_cast<Tab *>(sender());
if (tab != currentWidget()) { if (tab != currentWidget()) {
tab->setContentsChanged(true); tab->setContentsChanged(true);
setTabIcon(indexOf(tab), *tabChangedIcon); setTabIcon(indexOf(tab), *tabChangedIcon);
} }
QApplication::alert(this); if (globalEvent)
QApplication::alert(this);
} }
void TabSupervisor::processRoomEvent(RoomEvent *event) void TabSupervisor::processRoomEvent(RoomEvent *event)

2
cockatrice/src/tab_supervisor.h
View file

@ -78,7 +78,7 @@ private slots:
void processUserLeft(const QString &userName); void processUserLeft(const QString &userName);
void processUserJoined(const QString &userName); void processUserJoined(const QString &userName);
void talkLeft(TabMessage *tab); void talkLeft(TabMessage *tab);
void tabUserEvent(); void tabUserEvent(bool globalEvent);
void processRoomEvent(RoomEvent *event); void processRoomEvent(RoomEvent *event);
void processGameEventContainer(GameEventContainer *cont); void processGameEventContainer(GameEventContainer *cont);
void processMessageEvent(Event_Message *event); void processMessageEvent(Event_Message *event);