From 7efee472edbb04cbe476edc60b82d3913a10a0b3 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <max.bruker@tu-dortmund.de>
Date: Thu, 17 Nov 2011 21:43:32 +0100
Subject: [PATCH] face down dragging fixed, minor french translation fix

---
 cockatrice/src/carditem.cpp              | 6 +++---
 cockatrice/translations/cockatrice_fr.ts | 2 +-
 servatrice/servatrice.sql                | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp
index 3ae27850..312350c1 100644
--- a/cockatrice/src/carditem.cpp
+++ b/cockatrice/src/carditem.cpp
@@ -454,9 +454,9 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 		if (!owner->getLocal())
 			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();
 		
 		QList<QGraphicsItem *> sel = scene()->selectedItems();
@@ -471,7 +471,7 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 				childPos = c->pos() - pos();
 			else
 				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);
 			scene()->addItem(drag);
 		}
diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts
index b4e91f43..e8409f92 100644
--- a/cockatrice/translations/cockatrice_fr.ts
+++ b/cockatrice/translations/cockatrice_fr.ts
@@ -4385,7 +4385,7 @@ Entrez un nom s&apos;il vous plaît:</translation>
         <location filename="../src/userlist.cpp" line="349"/>
         <source>Show this user&apos;s &amp;games</source>
         <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>
         <location filename="../src/userlist.cpp" line="350"/>
diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql
index acb0a7aa..4bbd6c84 100644
--- a/servatrice/servatrice.sql
+++ b/servatrice/servatrice.sql
@@ -155,6 +155,7 @@ CREATE TABLE `cockatrice_bans` (
  `time_from` datetime NOT NULL,
  `minutes` int(6) 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;