Merge pull request #1101 from ctrlaltca/registration

[WIP] In-client Registration support
This commit is contained in:
woogerboy21 2015-05-30 13:49:04 -04:00
commit 28ccec711e
54 changed files with 3669 additions and 66 deletions

View file

@ -43,9 +43,14 @@ private slots:
void processServerShutdownEvent(const Event_ServerShutdown &event);
void serverTimeout();
void loginError(Response::ResponseCode r, QString reasonStr, quint32 endTime);
void registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime);
void activateError();
void socketError(const QString &errorStr);
void protocolVersionMismatch(int localVersion, int remoteVersion);
void userInfoReceived(const ServerInfo_User &userInfo);
void registerAccepted();
void registerAcceptedNeedsActivate();
void activateAccepted();
void localGameEnded();
void pixmapCacheSizeChanged(int newSizeInMBs);
@ -55,6 +60,7 @@ private slots:
void actWatchReplay();
void actDeckEditor();
void actFullScreen(bool checked);
void actRegister();
void actSettings();
void actExit();
@ -82,7 +88,7 @@ private:
QList<QMenu *> tabMenus;
QMenu *cockatriceMenu, *helpMenu;
QAction *aConnect, *aDisconnect, *aSinglePlayer, *aWatchReplay, *aDeckEditor, *aFullScreen, *aSettings, *aExit,
*aAbout, *aCheckCardUpdates;
*aAbout, *aCheckCardUpdates, *aRegister;
TabSupervisor *tabSupervisor;
QMenu *trayIconMenu;