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

German translation fix, take bottom card via Ctrl+Drag

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-10-16 12:10:28 +02:00
parent 3211801e39
commit 1bfa355974
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/messagelogwidget.cpp
View file

@ -175,7 +175,7 @@ QPair<QString, QString> MessageLogWidget::getFromStr(CardZone *zone, QString car
else if (startName == "hand") else if (startName == "hand")
fromStr = tr(" from hand"); fromStr = tr(" from hand");
else if (startName == "deck") { else if (startName == "deck") {
if (position == zone->getCards().size() - 1) { if (position >= zone->getCards().size() - 1) {
if (cardName.isEmpty()) { if (cardName.isEmpty()) {
cardName = isFemale(zone->getPlayer()) ? tr("the bottom card of her library") : tr("the bottom card of his library"); cardName = isFemale(zone->getPlayer()) ? tr("the bottom card of her library") : tr("the bottom card of his library");
cardNameContainsStartZone = true; cardNameContainsStartZone = true;

5
cockatrice/src/pilezone.cpp
View file

@ -84,8 +84,9 @@ void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
return; return;
bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier); bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier);
CardItem *card = cards.at(0); bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier);
const int cardid = contentsKnown() ? card->getId() : 0; 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); CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), faceDown);
drag->grabMouse(); drag->grabMouse();
setCursor(Qt::OpenHandCursor); setCursor(Qt::OpenHandCursor);

6
cockatrice/translations/cockatrice_de.ts
View file

@ -4218,7 +4218,7 @@ Lokale Version ist %1, Serverversion ist %2.</translation>
<message> <message>
<location filename="../src/player.cpp" line="444"/> <location filename="../src/player.cpp" line="444"/>
<source>&amp;View library</source> <source>&amp;View library</source>
<translation>&amp;Zeige Bibliothek</translation> <translation>Bibliothek &amp;ansehen</translation>
</message> </message>
<message> <message>
<source>Move top cards to g&amp;raveyard...</source> <source>Move top cards to g&amp;raveyard...</source>
@ -4237,7 +4237,7 @@ Lokale Version ist %1, Serverversion ist %2.</translation>
<message> <message>
<location filename="../src/player.cpp" line="445"/> <location filename="../src/player.cpp" line="445"/>
<source>View &amp;top cards of library...</source> <source>View &amp;top cards of library...</source>
<translation>Zeige die oberen Kar&amp;ten der Bibliothek...</translation> <translation>Oberste Karten der Bibliothek a&amp;nsehen...</translation>
</message> </message>
<message> <message>
<location filename="../src/player.cpp" line="425"/> <location filename="../src/player.cpp" line="425"/>
@ -5589,7 +5589,7 @@ Geben Sie 0 ein für einen unbefristeten Bann.</translation>
<message> <message>
<location filename="../src/window_deckeditor.cpp" line="118"/> <location filename="../src/window_deckeditor.cpp" line="118"/>
<source>Hash:</source> <source>Hash:</source>
<translation type="unfinished"></translation> <translation>Hash:</translation>
</message> </message>
<message> <message>
<location filename="../src/window_deckeditor.cpp" line="132"/> <location filename="../src/window_deckeditor.cpp" line="132"/>