diff --git a/modules/client_entergame/characterlist.lua b/modules/client_entergame/characterlist.lua index 1c8fbd66..5aebcd22 100644 --- a/modules/client_entergame/characterlist.lua +++ b/modules/client_entergame/characterlist.lua @@ -222,11 +222,17 @@ function CharacterList.create(characters, account, otui) -- account if account.premDays > 0 and account.premDays < 65535 then - accountStatusLabel:setText(tr("Account Status:\nPremium Account (%s) days left", account.premDays)) + accountStatusLabel:setText(tr("Premium Account (%s) days left", account.premDays)) elseif account.premDays >= 65535 then - accountStatusLabel:setText(tr("Account Status:\nLifetime Premium Account")) + accountStatusLabel:setText(tr("Lifetime Premium Account")) else - accountStatusLabel:setText(tr('Account Status:\nFree Account')) + accountStatusLabel:setText(tr('Free Account')) + end + + if account.premDays > 0 and account.premDays <= 7 then + accountStatusLabel:setOn(true) + else + accountStatusLabel:setOn(false) end end diff --git a/modules/client_entergame/characterlist.otui b/modules/client_entergame/characterlist.otui index 09eb3e85..0fcf2771 100644 --- a/modules/client_entergame/characterlist.otui +++ b/modules/client_entergame/characterlist.otui @@ -56,7 +56,7 @@ MainWindow anchors.top: parent.top anchors.left: parent.left anchors.right: characterListScrollBar.left - anchors.bottom: accountStatusLabel.top + anchors.bottom: accountStatusCaption.top margin-bottom: 5 padding: 1 focusable: false @@ -65,21 +65,32 @@ MainWindow VerticalScrollBar id: characterListScrollBar anchors.top: parent.top - anchors.bottom: accountStatusLabel.top + anchors.bottom: accountStatusCaption.top anchors.right: parent.right margin-bottom: 5 step: 14 pixels-scroll: true + Label + id: accountStatusCaption + !text: tr('Account Status:') + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: next.top + margin-bottom: 1 + Label id: accountStatusLabel - !text: tr('Account Status:\nFree Account') + !text: tr('Free Account') anchors.left: parent.left anchors.right: parent.right anchors.bottom: separator.top margin-bottom: 5 text-auto-resize: true + $on: + color: #FF0000 + HorizontalSeparator id: separator anchors.left: parent.left