Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Games
Kajongg
Commits
4eafdc99
Commit
4eafdc99
authored
Jan 29, 2022
by
Wolfgang Rohdewald
Browse files
Scoring dialog: show last tile / last meld only when appropriate
parent
67e803d9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/scoringdialog.py
View file @
4eafdc99
...
...
@@ -867,6 +867,11 @@ class ScoringDialog(QWidget):
pGrid
.
addWidget
(
self
.
lblLastMeld
,
8
,
0
,
1
,
2
)
pGrid
.
addWidget
(
self
.
cbLastMeld
,
8
,
2
,
1
,
2
)
self
.
lblLastTile
.
setVisible
(
False
)
self
.
cbLastTile
.
setVisible
(
False
)
self
.
cbLastMeld
.
setVisible
(
False
)
self
.
lblLastMeld
.
setVisible
(
False
)
def
setupUiForPlayer
(
self
,
pGrid
,
idx
):
"""setup UI elements for a player"""
self
.
spValues
[
idx
]
=
QSpinBox
()
...
...
@@ -972,6 +977,10 @@ class ScoringDialog(QWidget):
self
.
wonBoxes
[
idx
].
setChecked
(
False
)
if
newWinner
:
self
.
draw
.
setChecked
(
False
)
self
.
lblLastTile
.
setVisible
(
True
)
self
.
cbLastTile
.
setVisible
(
True
)
self
.
lblLastMeld
.
setVisible
(
False
)
self
.
cbLastMeld
.
setVisible
(
False
)
self
.
fillLastTileCombo
()
self
.
slotInputChanged
()
...
...
@@ -990,10 +999,8 @@ class ScoringDialog(QWidget):
newState
=
bool
(
self
.
game
.
winner
.
handBoard
.
uiTiles
)
except
AttributeError
:
newState
=
False
self
.
lblLastTile
.
setEnabled
(
newState
)
self
.
cbLastTile
.
setEnabled
(
newState
)
self
.
lblLastMeld
.
setEnabled
(
newState
)
self
.
cbLastMeld
.
setEnabled
(
newState
)
self
.
lblLastTile
.
setVisible
(
newState
)
self
.
cbLastTile
.
setVisible
(
newState
)
if
self
.
game
:
for
player
in
self
.
game
.
players
:
player
.
refreshManualRules
(
self
.
sender
())
...
...
@@ -1201,6 +1208,8 @@ class ScoringDialog(QWidget):
if
len
(
winnerMelds
)
==
1
:
self
.
cbLastMeld
.
addItem
(
QIcon
(),
''
,
str
(
winnerMelds
[
0
]))
self
.
cbLastMeld
.
setCurrentIndex
(
0
)
self
.
lblLastMeld
.
setVisible
(
False
)
self
.
cbLastMeld
.
setVisible
(
False
)
return
showCombo
=
True
self
.
__fillLastMeldComboWith
(
winnerMelds
,
indexedMeld
,
lastTile
)
...
...
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