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

add disable tearoffmenu option (#3826)

Browse source
This commit is contained in:
ebbit1q 2019-10-02 20:58:22 +02:00 • committed by Zach H
parent bcf505c98b
commit cd29e2f252
11 changed files with 90 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/abstractcounter.cpp
View file

@ -30,13 +30,12 @@ AbstractCounter::AbstractCounter(Player *_player,
shortcutActive = false;
if (player->getLocalOrJudge()) {
menu = new QMenu(name);
menu->setTearOffEnabled(true);
menu = new TearOffMenu(name);
aSet = new QAction(this);
connect(aSet, SIGNAL(triggered()), this, SLOT(setCounter()));
menu->addAction(aSet);
menu->addSeparator();
for (int i = 10; i >= -10; --i)
for (int i = 10; i >= -10; --i) {
if (i == 0) {
menu->addSeparator();
} else {
@ -49,8 +48,10 @@ AbstractCounter::AbstractCounter(Player *_player,
connect(aIncrement, SIGNAL(triggered()), this, SLOT(incrementCounter()));
menu->addAction(aIncrement);
}
} else
}
} else {
menu = nullptr;
}
connect(&settingsCache->shortcuts(), SIGNAL(shortCutChanged()), this, SLOT(refreshShortcuts()));
refreshShortcuts();
@ -107,8 +108,9 @@ void AbstractCounter::setShortcutsInactive()
void AbstractCounter::refreshShortcuts()
{
if (shortcutActive)
if (shortcutActive) {
setShortcutsActive();
}
}
void AbstractCounter::setValue(int _value)
@ -220,4 +222,4 @@ void AbstractCounterDialog::changeValue(int diff)
return;
curValue += diff;
setTextValue(QString::number(curValue));
}
}