Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
7efee472
Commit
7efee472
authored
Nov 17, 2011
by
Max-Wilhelm Bruker
Browse files
face down dragging fixed, minor french translation fix
parent
6b18ba6b
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/carditem.cpp
View file @
7efee472
...
...
@@ -454,9 +454,9 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
if
(
!
owner
->
getLocal
())
return
;
bool
faceDown
=
event
->
modifiers
().
testFlag
(
Qt
::
ShiftModifier
)
||
facedown
;
bool
f
orceF
aceDown
=
event
->
modifiers
().
testFlag
(
Qt
::
ShiftModifier
);
createDragItem
(
id
,
event
->
pos
(),
event
->
scenePos
(),
faceDown
);
createDragItem
(
id
,
event
->
pos
(),
event
->
scenePos
(),
face
down
||
forceFace
Down
);
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
);
}
...
...
cockatrice/translations/cockatrice_fr.ts
View file @
7efee472
...
...
@@ -4385,7 +4385,7 @@ Entrez un nom s'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
"
/>
...
...
servatrice/servatrice.sql
View file @
7efee472
...
...
@@ -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
;
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment