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
edde8bec
Commit
edde8bec
authored
Dec 03, 2011
by
Daenyth
Browse files
Add Planeswalker loyalty to CardInfoWidget
CIW will also dynamically hide/show power/toughness as well as loyalty.
parent
c12d7a08
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/cardinfowidget.cpp
View file @
edde8bec
...
...
@@ -43,6 +43,8 @@ CardInfoWidget::CardInfoWidget(ResizeMode _mode, QWidget *parent, Qt::WindowFlag
cardtypeLabel2
->
setWordWrap
(
true
);
powtoughLabel1
=
new
QLabel
;
powtoughLabel2
=
new
QLabel
;
loyaltyLabel1
=
new
QLabel
;
loyaltyLabel2
=
new
QLabel
;
textLabel
=
new
QTextEdit
();
textLabel
->
setReadOnly
(
true
);
...
...
@@ -60,6 +62,8 @@ CardInfoWidget::CardInfoWidget(ResizeMode _mode, QWidget *parent, Qt::WindowFlag
grid
->
addWidget
(
cardtypeLabel2
,
row
++
,
1
);
grid
->
addWidget
(
powtoughLabel1
,
row
,
0
);
grid
->
addWidget
(
powtoughLabel2
,
row
++
,
1
);
grid
->
addWidget
(
loyaltyLabel1
,
row
,
0
);
grid
->
addWidget
(
loyaltyLabel2
,
row
++
,
1
);
grid
->
addWidget
(
textLabel
,
row
,
0
,
-
1
,
2
);
grid
->
setRowStretch
(
row
,
1
);
grid
->
setColumnStretch
(
1
,
1
);
...
...
@@ -86,12 +90,24 @@ void CardInfoWidget::minimizeClicked(int newMinimized)
settingsCache
->
setCardInfoMinimized
(
newMinimized
);
}
bool
CardInfoWidget
::
shouldShowPowTough
()
{
return
(
!
info
->
getPowTough
().
isEmpty
());
}
bool
CardInfoWidget
::
shouldShowLoyalty
()
{
return
(
info
->
getMainCardType
()
==
"Planeswalker"
);
}
void
CardInfoWidget
::
setMinimized
(
int
_minimized
)
{
minimized
=
_minimized
;
// Toggle oracle fields according to selected view.
bool
showAll
=
((
minimized
==
1
)
||
(
minimized
==
2
));
bool
showPowTough
=
showAll
&&
shouldShowPowTough
();
bool
showLoyalty
=
showAll
&&
shouldShowLoyalty
();
if
(
mode
==
ModeGameTab
)
{
nameLabel1
->
setVisible
(
showAll
);
nameLabel2
->
setVisible
(
showAll
);
...
...
@@ -99,8 +115,10 @@ void CardInfoWidget::setMinimized(int _minimized)
manacostLabel2
->
setVisible
(
showAll
);
cardtypeLabel1
->
setVisible
(
showAll
);
cardtypeLabel2
->
setVisible
(
showAll
);
powtoughLabel1
->
setVisible
(
showAll
);
powtoughLabel2
->
setVisible
(
showAll
);
powtoughLabel1
->
setVisible
(
showPowTough
);
powtoughLabel2
->
setVisible
(
showPowTough
);
loyaltyLabel1
->
setVisible
(
showLoyalty
);
loyaltyLabel2
->
setVisible
(
showLoyalty
);
textLabel
->
setVisible
(
showAll
);
}
...
...
@@ -133,7 +151,13 @@ void CardInfoWidget::setCard(CardInfo *card)
manacostLabel2
->
setText
(
card
->
getManaCost
());
cardtypeLabel2
->
setText
(
card
->
getCardType
());
powtoughLabel2
->
setText
(
card
->
getPowTough
());
loyaltyLabel2
->
setText
(
QString
::
number
(
card
->
getLoyalty
()));
textLabel
->
setText
(
card
->
getText
());
powtoughLabel1
->
setVisible
(
shouldShowPowTough
());
powtoughLabel2
->
setVisible
(
shouldShowPowTough
());
loyaltyLabel1
->
setVisible
(
shouldShowLoyalty
());
loyaltyLabel2
->
setVisible
(
shouldShowLoyalty
());
}
void
CardInfoWidget
::
setCard
(
const
QString
&
cardName
)
...
...
@@ -166,6 +190,7 @@ void CardInfoWidget::retranslateUi()
manacostLabel1
->
setText
(
tr
(
"Mana cost:"
));
cardtypeLabel1
->
setText
(
tr
(
"Card type:"
));
powtoughLabel1
->
setText
(
tr
(
"P / T:"
));
loyaltyLabel1
->
setText
(
tr
(
"Loyalty:"
));
}
void
CardInfoWidget
::
resizeEvent
(
QResizeEvent
*
/*event*/
)
...
...
@@ -180,4 +205,4 @@ void CardInfoWidget::resizeEvent(QResizeEvent * /*event*/)
QString
CardInfoWidget
::
getCardName
()
const
{
return
nameLabel2
->
text
();
}
\ No newline at end of file
}
cockatrice/src/cardinfowidget.h
View file @
edde8bec
...
...
@@ -23,6 +23,7 @@ private:
int
pixmapWidth
;
qreal
cardHeightOffset
;
qreal
aspectRatio
;
// XXX: Why isn't this an eunm?
int
minimized
;
// 0 - card, 1 - oracle only, 2 - full
ResizeMode
mode
;
...
...
@@ -32,8 +33,12 @@ private:
QLabel
*
manacostLabel1
,
*
manacostLabel2
;
QLabel
*
cardtypeLabel1
,
*
cardtypeLabel2
;
QLabel
*
powtoughLabel1
,
*
powtoughLabel2
;
QLabel
*
loyaltyLabel1
,
*
loyaltyLabel2
;
QTextEdit
*
textLabel
;
bool
shouldShowPowTough
();
bool
shouldShowLoyalty
();
CardInfo
*
info
;
void
setMinimized
(
int
_minimized
);
...
...
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