StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'thenain38/status-username-dynamic-trans'

Browse Source
This commit is contained in:
agilob 2015-09-27 20:47:49 +01:00
commit 3341834625
No known key found for this signature in database
GPG Key ID: 296F0B764741106C
2 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainwindow.ui
View File

@ -858,9 +858,6 @@ QSplitter:handle{
<property name="cursor"> <property name="cursor">
<cursorShape>PointingHandCursor</cursorShape> <cursorShape>PointingHandCursor</cursorShape>
</property> </property>
<property name="text">
<string>Your name</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -940,9 +937,6 @@ QSplitter:handle{
<pointsize>8</pointsize> <pointsize>8</pointsize>
</font> </font>
</property> </property>
<property name="text">
<string>Your status</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

37
src/widget/widget.cpp
View File

@ -793,8 +793,17 @@ void Widget::onUsernameChanged(const QString& newUsername, const QString& oldUse
void Widget::setUsername(const QString& username) void Widget::setUsername(const QString& username)
{ {
if (username.isEmpty())
{
ui->nameLabel->setText(tr("Your name"));
ui->nameLabel->setToolTip(tr("Your name"));
}
else
{
ui->nameLabel->setText(username); ui->nameLabel->setText(username);
ui->nameLabel->setToolTip(username); // for overlength names ui->nameLabel->setToolTip(username); // for overlength names
}
QString sanename = username; QString sanename = username;
sanename.remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]")); sanename.remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]"));
nameMention = QRegExp("\\b" + QRegExp::escape(username) + "\\b", Qt::CaseInsensitive); nameMention = QRegExp("\\b" + QRegExp::escape(username) + "\\b", Qt::CaseInsensitive);
@ -809,8 +818,16 @@ void Widget::onStatusMessageChanged(const QString& newStatusMessage)
void Widget::setStatusMessage(const QString &statusMessage) void Widget::setStatusMessage(const QString &statusMessage)
{ {
if (statusMessage.isEmpty())
{
ui->statusLabel->setText(tr("Your status"));
ui->statusLabel->setToolTip(tr("Your status"));
}
else
{
ui->statusLabel->setText(statusMessage); ui->statusLabel->setText(statusMessage);
ui->statusLabel->setToolTip(statusMessage); // for overlength messsages ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
}
} }
void Widget::reloadHistory() void Widget::reloadHistory()
@ -2016,9 +2033,29 @@ void Widget::setActiveToolMenuButton(ActiveToolMenuButton newActiveButton)
void Widget::retranslateUi() void Widget::retranslateUi()
{ {
QString name = ui->nameLabel->text(), status = ui->statusLabel->text(); QString name = ui->nameLabel->text(), status = ui->statusLabel->text();
Core* core = Nexus::getCore();
ui->retranslateUi(this); ui->retranslateUi(this);
if (core->getUsername().isEmpty())
{
ui->nameLabel->setText(tr("Your name"));
ui->nameLabel->setToolTip(tr("Your name"));
}
else
{
ui->nameLabel->setText(name); ui->nameLabel->setText(name);
ui->nameLabel->setToolTip(name);
}
if (core->getStatusMessage().isEmpty())
{
ui->statusLabel->setText(tr("Your status"));
ui->statusLabel->setToolTip(tr("Your status"));
}
else
{
ui->statusLabel->setText(status); ui->statusLabel->setText(status);
ui->statusLabel->setToolTip(status);
}
filterDisplayName->setText(tr("By Name")); filterDisplayName->setText(tr("By Name"));
filterDisplayActivity->setText(tr("By Activity")); filterDisplayActivity->setText(tr("By Activity"));