Merge branch 'master' of github.com:cnlpete/ttrss

This commit is contained in:
Hauke Schade 2014-11-24 21:13:29 +01:00
commit c4b3468530

View file

@ -112,7 +112,9 @@ ListItem {
}
Label {
width: parent.width
text: qsTr("Note: %1").arg(model.note !== undefined ? model.note : "")
text: model.note === undefined || model.note === "" ?
"" :
qsTr("Note: %1").arg(model.note)
color: model.unread > 0 ?
(listItem.highlighted ? Theme.highlightColor : Theme.primaryColor) :
(listItem.highlighted ? Theme.secondaryHighlightColor : Theme.secondaryColor)
@ -123,7 +125,7 @@ ListItem {
font.weight: Font.Light
font.italic: true
font.pixelSize: Theme.fontSizeExtraSmall
visible: settings.showNote && model.note !== undefined && model.note !== ""
visible: settings.showNote && text !== ""
}
Grid {