aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

face down dragging fixed, minor french translation fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-11-17 21:43:32 +01:00
parent 6b18ba6bac
commit 7efee472ed
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/carditem.cpp
View file

@ -454,9 +454,9 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
if (!owner->getLocal()) if (!owner->getLocal())
return; return;
bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier) || facedown; bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
createDragItem(id, event->pos(), event->scenePos(), faceDown); createDragItem(id, event->pos(), event->scenePos(), facedown || forceFaceDown);
dragItem->grabMouse(); dragItem->grabMouse();
QList<QGraphicsItem *> sel = scene()->selectedItems(); QList<QGraphicsItem *> sel = scene()->selectedItems();
@ -471,7 +471,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
childPos = c->pos() - pos(); childPos = c->pos() - pos();
else else
childPos = QPointF(j * CARD_WIDTH / 2, 0); childPos = QPointF(j * CARD_WIDTH / 2, 0);
CardDragItem *drag = new CardDragItem(c, c->getId(), childPos, c->getFaceDown(), dragItem); CardDragItem *drag = new CardDragItem(c, c->getId(), childPos, c->getFaceDown() || forceFaceDown, dragItem);
drag->setPos(dragItem->pos() + childPos); drag->setPos(dragItem->pos() + childPos);
scene()->addItem(drag); scene()->addItem(drag);
} }

2
cockatrice/translations/cockatrice_fr.ts
View file

@ -4385,7 +4385,7 @@ Entrez un nom s&apos;il vous plaît:</translation>
<location filename="../src/userlist.cpp" line="349"/> <location filename="../src/userlist.cpp" line="349"/>
<source>Show this user&apos;s &amp;games</source> <source>Show this user&apos;s &amp;games</source>
<translatorcomment>Missing the female version : &quot;Montrer les parties de cette joueuse&quot;</translatorcomment> <translatorcomment>Missing the female version : &quot;Montrer les parties de cette joueuse&quot;</translatorcomment>
<translation>Montrer les &amp;parties de de ce joueur</translation> <translation>Montrer les &amp;parties de ce joueur</translation>
</message> </message>
<message> <message>
<location filename="../src/userlist.cpp" line="350"/> <location filename="../src/userlist.cpp" line="350"/>

3
servatrice/servatrice.sql
View file

@ -155,6 +155,7 @@ CREATE TABLE `cockatrice_bans` (
`time_from` datetime NOT NULL, `time_from` datetime NOT NULL,
`minutes` int(6) NOT NULL, `minutes` int(6) NOT NULL,
`reason` text NOT NULL, `reason` text NOT NULL,
KEY `id_user` (`id_user`) PRIMARY KEY (`user_name`,`time_from`),
KEY `time_from` (`time_from`,`ip_address`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;