diff --git a/ChangeLog.txt b/ChangeLog.txt index a48a2979b..6f7c8c958 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,7 +2,7 @@ TeamTalk ---------------------------------------------- -Version 5.17.1, unreleased +Version 5.18, unreleased Default Qt Client - Media tab in main window for controlling media file streaming - Support "{username}" variable for majority of TTS and status events related to user action @@ -11,6 +11,7 @@ Default Qt Client - All byte sizes converted to local format - Option to use TeamTalk Sound Output device for default sound event playback mode - Option to choose bitween text or emoji for user and channel info in channel list +- Last login time display in "User Accounts" dialog - Fixed gender changed from female to male when migrating to 5.17 release - Fixed sound events disabled when migrating to 5.17 release - Fixed language not set at first start diff --git a/Client/qtTeamTalk/useraccountdlg.cpp b/Client/qtTeamTalk/useraccountdlg.cpp index 316f9d98e..8e462d103 100644 --- a/Client/qtTeamTalk/useraccountdlg.cpp +++ b/Client/qtTeamTalk/useraccountdlg.cpp @@ -117,6 +117,7 @@ UserAccountDlg::UserAccountDlg(UserAccountDlgType type, const UserAccount& usera this->setAccessibleDescription(tr("Add User on Server")); ui->typeComboBox->setCurrentIndex(ui->typeComboBox->findData(USERTYPE_DEFAULT)); ui->lastEditLabel->setVisible(false); + ui->lastLoginLabel->setVisible(false); ui->typeComboBox->setFocus(); break; case USER_UPDATE : @@ -369,6 +370,7 @@ void UserAccountDlg::showUserAccount(const UserAccount& useraccount) ui->noteEdit->setPlainText(_Q(useraccount.szNote)); ui->channelComboBox->lineEdit()->setText(_Q(useraccount.szInitChannel)); ui->lastEditLabel->setText(tr("Last edited: %1").arg(getFormattedDateTime(_Q(useraccount.szLastModified), "yyyy/MM/dd hh:mm"))); + ui->lastLoginLabel->setText(tr("Last login: %1").arg(getFormattedDateTime(_Q(useraccount.szLastLoginTime), "yyyy/MM/dd hh:mm"))); updateUserRights(useraccount); diff --git a/Client/qtTeamTalk/useraccountdlg.ui b/Client/qtTeamTalk/useraccountdlg.ui index e4e52c999..d27f1a4cd 100644 --- a/Client/qtTeamTalk/useraccountdlg.ui +++ b/Client/qtTeamTalk/useraccountdlg.ui @@ -146,6 +146,16 @@ + + + + + + + Qt::StrongFocus + + + diff --git a/Client/qtTeamTalk/useraccountsmodel.cpp b/Client/qtTeamTalk/useraccountsmodel.cpp index 454b565ba..1af695875 100644 --- a/Client/qtTeamTalk/useraccountsmodel.cpp +++ b/Client/qtTeamTalk/useraccountsmodel.cpp @@ -38,6 +38,7 @@ QVariant UserAccountsModel::headerData(int section, Qt::Orientation orientation, case COLUMN_INDEX_NOTE: return tr("Note"); case COLUMN_INDEX_CHANNEL: return tr("Channel"); case COLUMN_INDEX_MODIFIED : return tr("Modified"); + case COLUMN_INDEX_LASTLOGIN : return tr("Last Login"); } } return QVariant(); @@ -76,6 +77,8 @@ QVariant UserAccountsModel::data(const QModelIndex & index, int role /*= Qt::Dis return _Q(m_users[index.row()].szInitChannel); case COLUMN_INDEX_MODIFIED : return getFormattedDateTime(_Q(m_users[index.row()].szLastModified), "yyyy/MM/dd hh:mm"); + case COLUMN_INDEX_LASTLOGIN : + return getFormattedDateTime(_Q(m_users[index.row()].szLastLoginTime), "yyyy/MM/dd hh:mm"); } break; case Qt::AccessibleTextRole: diff --git a/Client/qtTeamTalk/useraccountsmodel.h b/Client/qtTeamTalk/useraccountsmodel.h index 21a15e8a9..15d53daa1 100644 --- a/Client/qtTeamTalk/useraccountsmodel.h +++ b/Client/qtTeamTalk/useraccountsmodel.h @@ -31,6 +31,7 @@ enum COLUMN_INDEX_NOTE, COLUMN_INDEX_CHANNEL, COLUMN_INDEX_MODIFIED, + COLUMN_INDEX_LASTLOGIN, COLUMN_COUNT_USERACCOUNTS, };