jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 03:28:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

In-game message macros available immediately in active games (#5113)

Browse source 
* In-game message macros available immediately in active games

* fix formatting

* init sayMenu actions with sayMenu as parent
This commit is contained in:
Alexander Choi 2024-10-09 15:08:57 -06:00 • committed by GitHub
parent 500b694cc6
commit b4bfa17cee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/dlg_settings.cpp
View file

@ -1001,6 +1001,7 @@ void MessagesSettingsPage::storeSettings()
SettingsCache::instance().messages().setCount(messageList->count()); SettingsCache::instance().messages().setCount(messageList->count());
for (int i = 0; i < messageList->count(); i++) for (int i = 0; i < messageList->count(); i++)
SettingsCache::instance().messages().setMessageAt(i, messageList->item(i)->text()); SettingsCache::instance().messages().setMessageAt(i, messageList->item(i)->text());
emit SettingsCache::instance().messages().messageMacrosChanged();
} }
void MessagesSettingsPage::actAdd() void MessagesSettingsPage::actAdd()

3
cockatrice/src/player.cpp
View file

@ -419,6 +419,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T
if (local) { if (local) {
sayMenu = playerMenu->addMenu(QString()); sayMenu = playerMenu->addMenu(QString());
connect(&SettingsCache::instance().messages(), SIGNAL(messageMacrosChanged()), this, SLOT(initSayMenu()));
initSayMenu(); initSayMenu();
} }
@ -1036,7 +1037,7 @@ void Player::initSayMenu()
sayMenu->setEnabled(count > 0); sayMenu->setEnabled(count > 0);
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
auto *newAction = new QAction(SettingsCache::instance().messages().getMessageAt(i), this); auto *newAction = new QAction(SettingsCache::instance().messages().getMessageAt(i), sayMenu);
if (i < 10) { if (i < 10) {
newAction->setShortcut(QKeySequence("Ctrl+" + QString::number((i + 1) % 10))); newAction->setShortcut(QKeySequence("Ctrl+" + QString::number((i + 1) % 10)));
} }

3
cockatrice/src/player.h
View file

@ -224,6 +224,8 @@ private slots:
void actReveal(QAction *action); void actReveal(QAction *action);
void refreshShortcuts(); void refreshShortcuts();
void initSayMenu();
private: private:
TabGame *game; TabGame *game;
QMenu *sbMenu, *countersMenu, *sayMenu, *createPredefinedTokenMenu, *mRevealLibrary, *mLendLibrary, *mRevealTopCard, QMenu *sbMenu, *countersMenu, *sayMenu, *createPredefinedTokenMenu, *mRevealLibrary, *mLendLibrary, *mRevealTopCard,
@ -310,7 +312,6 @@ private:
QMap<int, ArrowItem *> arrows; QMap<int, ArrowItem *> arrows;
void rearrangeCounters(); void rearrangeCounters();
void initSayMenu();
void initContextualPlayersMenu(QMenu *menu); void initContextualPlayersMenu(QMenu *menu);
// void eventConnectionStateChanged(const Event_ConnectionStateChanged &event); // void eventConnectionStateChanged(const Event_ConnectionStateChanged &event);

1
cockatrice/src/settings/messagesettings.h
View file

@ -15,6 +15,7 @@ public:
void setCount(int count); void setCount(int count);
void setMessageAt(int index, QString message); void setMessageAt(int index, QString message);
signals: signals:
void messageMacrosChanged();
public slots: public slots: