diff --git a/cockatrice/src/tab.h b/cockatrice/src/tab.h index 31fdcbab6..5f50813cc 100644 --- a/cockatrice/src/tab.h +++ b/cockatrice/src/tab.h @@ -9,7 +9,7 @@ class TabSupervisor; class Tab : public QWidget { Q_OBJECT signals: - void userEvent(); + void userEvent(bool globalEvent = true); protected: QMenu *tabMenu; TabSupervisor *tabSupervisor; diff --git a/cockatrice/src/tab_room.cpp b/cockatrice/src/tab_room.cpp index f40458cdd..d72e13ef5 100644 --- a/cockatrice/src/tab_room.cpp +++ b/cockatrice/src/tab_room.cpp @@ -262,5 +262,5 @@ void TabRoom::processLeaveRoomEvent(Event_LeaveRoom *event) void TabRoom::processSayEvent(Event_RoomSay *event) { chatView->appendMessage(event->getPlayerName(), event->getMessage()); - emit userEvent(); + emit userEvent(false); } diff --git a/cockatrice/src/tab_supervisor.cpp b/cockatrice/src/tab_supervisor.cpp index 1dfe7d443..c9cdc5d57 100644 --- a/cockatrice/src/tab_supervisor.cpp +++ b/cockatrice/src/tab_supervisor.cpp @@ -101,7 +101,7 @@ void TabSupervisor::retranslateUi() 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()); } @@ -299,14 +299,15 @@ void TabSupervisor::talkLeft(TabMessage *tab) removeTab(indexOf(tab)); } -void TabSupervisor::tabUserEvent() +void TabSupervisor::tabUserEvent(bool globalEvent) { Tab *tab = static_cast(sender()); if (tab != currentWidget()) { tab->setContentsChanged(true); setTabIcon(indexOf(tab), *tabChangedIcon); } - QApplication::alert(this); + if (globalEvent) + QApplication::alert(this); } void TabSupervisor::processRoomEvent(RoomEvent *event) diff --git a/cockatrice/src/tab_supervisor.h b/cockatrice/src/tab_supervisor.h index 439ac1f88..5d7a2c9bc 100644 --- a/cockatrice/src/tab_supervisor.h +++ b/cockatrice/src/tab_supervisor.h @@ -78,7 +78,7 @@ private slots: void processUserLeft(const QString &userName); void processUserJoined(const QString &userName); void talkLeft(TabMessage *tab); - void tabUserEvent(); + void tabUserEvent(bool globalEvent); void processRoomEvent(RoomEvent *event); void processGameEventContainer(GameEventContainer *cont); void processMessageEvent(Event_Message *event);