From 1bfa355974ea78267b2ad2113806006f14697ca9 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sun, 16 Oct 2011 12:10:28 +0200 Subject: [PATCH] German translation fix, take bottom card via Ctrl+Drag --- cockatrice/src/messagelogwidget.cpp | 2 +- cockatrice/src/pilezone.cpp | 5 +++-- cockatrice/translations/cockatrice_de.ts | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/messagelogwidget.cpp b/cockatrice/src/messagelogwidget.cpp index 40f4b577..9fa1518a 100644 --- a/cockatrice/src/messagelogwidget.cpp +++ b/cockatrice/src/messagelogwidget.cpp @@ -175,7 +175,7 @@ QPair MessageLogWidget::getFromStr(CardZone *zone, QString car else if (startName == "hand") fromStr = tr(" from hand"); else if (startName == "deck") { - if (position == zone->getCards().size() - 1) { + if (position >= zone->getCards().size() - 1) { if (cardName.isEmpty()) { cardName = isFemale(zone->getPlayer()) ? tr("the bottom card of her library") : tr("the bottom card of his library"); cardNameContainsStartZone = true; diff --git a/cockatrice/src/pilezone.cpp b/cockatrice/src/pilezone.cpp index 340d9bab..aff44dfe 100644 --- a/cockatrice/src/pilezone.cpp +++ b/cockatrice/src/pilezone.cpp @@ -84,8 +84,9 @@ void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event) return; bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier); - CardItem *card = cards.at(0); - const int cardid = contentsKnown() ? card->getId() : 0; + bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier); + CardItem *card = bottomCard ? cards.last() : cards.first(); + const int cardid = contentsKnown() ? card->getId() : (bottomCard ? cards.size() - 1 : 0); CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), faceDown); drag->grabMouse(); setCursor(Qt::OpenHandCursor); diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index 2f0aa820..72056036 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -4218,7 +4218,7 @@ Lokale Version ist %1, Serverversion ist %2. &View library - &Zeige Bibliothek + Bibliothek &ansehen Move top cards to g&raveyard... @@ -4237,7 +4237,7 @@ Lokale Version ist %1, Serverversion ist %2. View &top cards of library... - Zeige die oberen Kar&ten der Bibliothek... + Oberste Karten der Bibliothek a&nsehen... @@ -5589,7 +5589,7 @@ Geben Sie 0 ein für einen unbefristeten Bann. Hash: - + Hash: