mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge pull request #4467
Yuri (1): feat(toxid): Show NoSpam and checksum parts of ToxID in colors.
This commit is contained in:
commit
b39a15873d
|
@ -62,8 +62,6 @@ ProfileForm::ProfileForm(QWidget* parent)
|
|||
|
||||
// tox
|
||||
toxId = new ClickableTE();
|
||||
toxId->setReadOnly(true);
|
||||
toxId->setFrame(false);
|
||||
toxId->setFont(Style::getFont(Style::Small));
|
||||
toxId->setToolTip(bodyUI->toxId->toolTip());
|
||||
|
||||
|
@ -213,13 +211,11 @@ void ProfileForm::showProfilePictureContextMenu(const QPoint& point)
|
|||
|
||||
void ProfileForm::copyIdClicked()
|
||||
{
|
||||
toxId->selectAll();
|
||||
QString txt = toxId->text();
|
||||
txt.replace('\n', "");
|
||||
txt.remove(QRegularExpression("<[^>]*>"));
|
||||
QApplication::clipboard()->setText(txt, QClipboard::Clipboard);
|
||||
if (QApplication::clipboard()->supportsSelection())
|
||||
QApplication::clipboard()->setText(txt, QClipboard::Selection);
|
||||
toxId->setCursorPosition(0);
|
||||
|
||||
if (!hasCheck) {
|
||||
bodyUI->toxIdLabel->setText(bodyUI->toxIdLabel->text() + " ✔");
|
||||
|
@ -245,8 +241,12 @@ void ProfileForm::onSelfAvatarLoaded(const QPixmap& pic)
|
|||
|
||||
void ProfileForm::setToxId(const ToxId& id)
|
||||
{
|
||||
toxId->setText(id.toString());
|
||||
toxId->setCursorPosition(0);
|
||||
auto idString = id.toString();
|
||||
static const QString ToxIdColor = QStringLiteral("%1<span style='color:blue'>%2</span><span style='color:gray'>%3</span>");
|
||||
toxId->setText(ToxIdColor
|
||||
.arg(idString.mid(0, 64))
|
||||
.arg(idString.mid(64, 8))
|
||||
.arg(idString.mid(72, 4)));
|
||||
|
||||
delete qr;
|
||||
qr = new QRWidget();
|
||||
|
@ -466,7 +466,8 @@ void ProfileForm::retranslateUi()
|
|||
// We have to add the toxId tooltip here and not in the .ui or Qt won't know how to translate it
|
||||
// dynamically
|
||||
toxId->setToolTip(tr("This bunch of characters tells other Tox clients how to contact "
|
||||
"you.\nShare it with your friends to communicate."));
|
||||
"you.\nShare it with your friends to communicate.\n\n"
|
||||
"This ID includes the NoSpam code (in blue), and the checksum (in gray)."));
|
||||
}
|
||||
|
||||
void ProfileForm::showRegisterToxme()
|
||||
|
|
|
@ -36,7 +36,7 @@ namespace Ui {
|
|||
class IdentitySettings;
|
||||
}
|
||||
|
||||
class ClickableTE : public QLineEdit
|
||||
class ClickableTE : public QLabel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
|
@ -206,12 +206,12 @@ Share it with your friends to communicate.</string>
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="toxId">
|
||||
<widget class="QLabel" name="toxId">
|
||||
<property name="accessibleDescription">
|
||||
<string>Your Tox ID</string>
|
||||
</property>
|
||||
<property name="frame">
|
||||
<bool>true</bool>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
Loading…
Reference in New Issue
Block a user