Message Log Widget changes (#2709)

* Message Log Widget changes

* Gravard now logs as before

* removed redundant QString()

cockatrice/src/messagelogwidget.h

@@ -23,64 +23,76 @@ struct LogMoveCard {
 class MessageLogWidget : public ChatView {
     Q_OBJECT
 private:
-    enum MessageContext { MessageContext_None, MessageContext_MoveCard, MessageContext_Mulligan };
+    enum MessageContext {
+        MessageContext_None,
+        MessageContext_MoveCard,
+        MessageContext_Mulligan
+    };
 
-    QString sanitizeHtml(QString dirty) const;
+    int mulliganNumber;
-    QString cardLink(const QString &cardName) const;
+    Player *mulliganPlayer;
-    QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const;
     MessageContext currentContext;
-
     QList<LogMoveCard> moveCardQueue;
     QMap<CardItem *, QString> moveCardPT;
     QMap<CardItem *, bool> moveCardTapped;
 
-    Player *mulliganPlayer;
+    const QString tableConstant() const;
-    int mulliganNumber;
+    const QString graveyardConstant() const;
+    const QString exileConstant() const;
+    const QString handConstant() const;
+    const QString deckConstant() const;
+    const QString sideboardConstant() const;
+    const QString stackConstant() const;
+
+    QString sanitizeHtml(QString dirty) const;
+    QString cardLink(const QString cardName) const;
+    QPair<QString, QString> getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const;
+
 public slots:
-    void logGameJoined(int gameId);
+    void containerProcessingDone();
-    void logReplayStarted(int gameId);
+    void containerProcessingStarted(const GameEventContext &context);
-    void logJoin(Player *player);
+    void logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal);
-    void logLeave(Player *player, QString reason);
+    void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
-    void logGameClosed();
-    void logKicked();
-    void logJoinSpectator(QString name);
-    void logLeaveSpectator(QString name, QString reason);
-    void logDeckSelect(Player *player, QString deckHash, int sideboardSize);
-    void logReadyStart(Player *player);
-    void logNotReadyStart(Player *player);
-    void logSetSideboardLock(Player *player, bool locked);
     void logConcede(Player *player);
-    void logGameStart();
     void logConnectionStateChanged(Player *player, bool connectionState);
-    void logSay(Player *player, QString message);
+    void logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard, bool playerTarget);
-    void logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString userPrivLevel, QString message);
+    void logCreateToken(Player *player, QString cardName, QString pt);
-    void logShuffle(Player *player, CardZone *zone);
+    void logDeckSelect(Player *player, QString deckHash, int sideboardSize);
-    void logRollDie(Player *player, int sides, int roll);
+    void logDestroyCard(Player *player, QString cardName);
+    void logDoMoveCard(LogMoveCard &lmc);
     void logDrawCards(Player *player, int number);
-    void logUndoDraw(Player *player, QString cardName);
+    void logDumpZone(Player *player, CardZone *zone, int numberCards);
-    void doMoveCard(LogMoveCard &attributes);
+    void logFlipCard(Player *player, QString cardName, bool faceDown);
+    void logGameClosed();
+    void logGameStart();
+    void logJoin(Player *player);
+    void logJoinSpectator(QString name);
+    void logKicked();
+    void logLeave(Player *player, QString reason);
+    void logLeaveSpectator(QString name, QString reason);
+    void logNotReadyStart(Player *player);
     void logMoveCard(Player *player, CardItem *card, CardZone *startZone, int oldX, CardZone *targetZone, int newX);
     void logMulligan(Player *player, int number);
-    void logFlipCard(Player *player, QString cardName, bool faceDown);
+    void logReplayStarted(int gameId);
-    void logDestroyCard(Player *player, QString cardName);
+    void logReadyStart(Player *player);
-    void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
+    void logRevealCards(Player *player, CardZone *zone, int cardId, QString cardName, Player *otherPlayer, bool faceDown);
-    void logUnattachCard(Player *player, QString cardName);
+    void logRollDie(Player *player, int sides, int roll);
-    void logCreateToken(Player *player, QString cardName, QString pt);
+    void logSay(Player *player, QString message);
-    void logCreateArrow(Player *player, Player *startPlayer, QString startCard, Player *targetPlayer, QString targetCard, bool playerTarget);
+    void logSetActivePhase(int phase);
+    void logSetActivePlayer(Player *player);
+    void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
     void logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue);
-    void logSetTapped(Player *player, CardItem *card, bool tapped);
     void logSetCounter(Player *player, QString counterName, int value, int oldValue);
     void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap);
     void logSetPT(Player *player, CardItem *card, QString newPT);
-    void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
+    void logSetSideboardLock(Player *player, bool locked);
-    void logDumpZone(Player *player, CardZone *zone, int numberCards);
+    void logSetTapped(Player *player, CardItem *card, bool tapped);
+    void logShuffle(Player *player, CardZone *zone);
+    void logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString userPrivLevel, QString message);
     void logStopDumpZone(Player *player, CardZone *zone);
-    void logRevealCards(Player *player, CardZone *zone, int cardId, QString cardName, Player *otherPlayer, bool faceDown);
+    void logUnattachCard(Player *player, QString cardName);
-    void logAlwaysRevealTopCard(Player *player, CardZone *zone, bool reveal);
+    void logUndoDraw(Player *player, QString cardName);
-    void logSetActivePlayer(Player *player);
+
-    void logSetActivePhase(int phase);
-    void containerProcessingStarted(const GameEventContext &context);
-    void containerProcessingDone();
 public:
     void connectToPlayer(Player *player);
     MessageLogWidget(const TabSupervisor *_tabSupervisor, const UserlistProxy *_userlistProxy, TabGame *_game, QWidget *parent = 0);

cockatrice/src/tab_game.cpp

@@ -412,7 +412,6 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
     retranslateUi();
     connect(&settingsCache->shortcuts(), SIGNAL(shortCutchanged()),this,SLOT(refreshShortcuts()));
     refreshShortcuts();
-    messageLog->logGameJoined(gameInfo.game_id());
 
     // append game to rooms game list for others to see
     for (int i = gameInfo.game_types_size() - 1; i >= 0; i--)