Terminology: room mention count → highlight count

This commit is contained in:
miruka
2020-05-31 19:13:19 -04:00
parent dce3328037
commit 3791a08eea
7 changed files with 32 additions and 31 deletions

View File

@@ -56,7 +56,7 @@ HTile {
indicatorTheme:
theme.mainPane.accountBar.account.unreadIndicator
unreads: model.total_unread
mentions: model.total_mentions
highlights: model.total_highlights
}
}

View File

@@ -19,7 +19,7 @@ HLabel {
background: Rectangle {
color:
mentions ?
highlights ?
indicatorTheme.mentionBackground :
indicatorTheme.background
@@ -31,7 +31,7 @@ HLabel {
property QtObject indicatorTheme
property int unreads: 0
property int mentions: 0
property int highlights: 0
Behavior on scale { HNumberAnimation {} }

View File

@@ -43,7 +43,7 @@ HTile {
indicatorTheme:
theme.mainPane.listView.room.unreadIndicator
unreads: model.unreads
mentions: model.mentions
highlights: model.highlights
}
HIcon {

View File

@@ -140,8 +140,8 @@ HListView {
showItemAtIndex(accountIndice[currentUserId] + 1 + index)
}
function cycleUnreadRooms(forward=true, mentions=false) {
const prop = mentions ? "mentions" : "unreads"
function cycleUnreadRooms(forward=true, highlights=false) {
const prop = highlights ? "highlights" : "unreads"
const start = currentIndex === -1 ? 0 : currentIndex
let index = start
@@ -151,7 +151,7 @@ HListView {
if (index < 0) index = model.count - 1
if (index > model.count - 1) index = 0
if (index === start && mentions)
if (index === start && highlights)
return cycleUnreadRooms(forward, false)
else if (index === start)
return false