mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-30 10:33:54 -07:00
If the user request to join a room and we are already in, just focus the correct tab
Also, handle all the Command_JoinRoom return values
This commit is contained in:
parent
cd02df78a1
commit
23e84273ed
2 changed files with 52 additions and 32 deletions
|
|
@ -24,14 +24,11 @@ private:
|
|||
QTreeWidget *roomList;
|
||||
QPushButton *joinButton;
|
||||
AbstractClient *client;
|
||||
|
||||
void joinRoom(int id, bool setCurrent);
|
||||
private slots:
|
||||
void processListRoomsEvent(const Event_ListRooms &event);
|
||||
void joinClicked();
|
||||
void joinFinished(const Response &resp, const CommandContainer &commandContainer, const QVariant &extraData);
|
||||
signals:
|
||||
void roomJoined(const ServerInfo_Room &info, bool setCurrent);
|
||||
void joinRoomRequest(int, bool setCurrent);
|
||||
public:
|
||||
RoomSelector(AbstractClient *_client, QWidget *parent = 0);
|
||||
void retranslateUi();
|
||||
|
|
@ -43,6 +40,8 @@ signals:
|
|||
void roomJoined(const ServerInfo_Room &info, bool setCurrent);
|
||||
private slots:
|
||||
void processServerMessageEvent(const Event_ServerMessage &event);
|
||||
void joinRoom(int id, bool setCurrent);
|
||||
void joinRoomFinished(const Response &resp, const CommandContainer &commandContainer, const QVariant &extraData);
|
||||
private:
|
||||
AbstractClient *client;
|
||||
RoomSelector *roomSelector;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue