diff --git a/src/widget/form/genericchatform.h b/src/widget/form/genericchatform.h
index 1be415334..c15188e65 100644
--- a/src/widget/form/genericchatform.h
+++ b/src/widget/form/genericchatform.h
@@ -31,6 +31,7 @@
/**
* Spacing in px inserted when the author of the last message changes
* @note Why the hell is this a thing? surely the different font is enough?
+ * - Even a different font is not enough – TODO #1307 ~~zetok
*/
#define AUTHOR_CHANGE_SPACING 5
diff --git a/src/widget/form/profileform.cpp b/src/widget/form/profileform.cpp
index 60164c8ce..657a9081c 100644
--- a/src/widget/form/profileform.cpp
+++ b/src/widget/form/profileform.cpp
@@ -55,22 +55,6 @@ ProfileForm::ProfileForm(QWidget* parent) :
bodyUI->setupUi(this);
core = Core::getInstance();
- head = new QWidget(this);
- QHBoxLayout* headLayout = new QHBoxLayout();
- head->setLayout(headLayout);
-
- QLabel* imgLabel = new QLabel();
- headLayout->addWidget(imgLabel);
-
- nameLabel = new QLabel();
- QFont bold;
- bold.setBold(true);
- nameLabel->setFont(bold);
- headLayout->addWidget(nameLabel);
- headLayout->addStretch(1);
-
- imgLabel->setPixmap(QPixmap(":/img/settings/identity.png").scaledToHeight(40, Qt::SmoothTransformation));
-
// tox
toxId = new ClickableTE();
toxId->setReadOnly(true);
@@ -86,9 +70,13 @@ ProfileForm::ProfileForm(QWidget* parent) :
bodyUI->toxmeServersList->addItem("toxme.io");
QString toxmeInfo = Settings::getInstance().getToxmeInfo();
if (toxmeInfo.isEmpty()) // User not registered
+ {
showRegisterToxme();
+ }
else
+ {
showExistingToxme();
+ }
bodyUI->qrLabel->setWordWrap(true);
@@ -155,12 +143,11 @@ ProfileForm::~ProfileForm()
Translator::unregister(this);
delete qr;
delete bodyUI;
- head->deleteLater();
}
bool ProfileForm::isShown() const
{
- if (head->isVisible())
+ if (profilePicture->isVisible())
{
window()->windowHandle()->alert(0);
return true;
@@ -171,9 +158,7 @@ bool ProfileForm::isShown() const
void ProfileForm::show(ContentLayout* contentLayout)
{
- contentLayout->mainHead->layout()->addWidget(head);
contentLayout->mainContent->layout()->addWidget(this);
- head->show();
QWidget::show();
prFileLabelUpdate();
bool portable = Settings::getInstance().getMakeToxPortable();
@@ -473,7 +458,6 @@ void ProfileForm::onChangePassClicked()
void ProfileForm::retranslateUi()
{
bodyUI->retranslateUi(this);
- nameLabel->setText(tr("User Profile"));
setPasswordButtonsText();
// 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."));
diff --git a/src/widget/form/profileform.h b/src/widget/form/profileform.h
index 56347bc4e..baafe4f57 100644
--- a/src/widget/form/profileform.h
+++ b/src/widget/form/profileform.h
@@ -96,8 +96,6 @@ private:
void refreshProfiles();
Ui::IdentitySettings* bodyUI;
MaskablePixmapWidget* profilePicture;
- QLabel* nameLabel;
- QWidget* head;
Core* core;
QTimer timer;
bool hasCheck = false;
diff --git a/src/widget/form/profileform.ui b/src/widget/form/profileform.ui
index 28653e6d9..5f73e6512 100644
--- a/src/widget/form/profileform.ui
+++ b/src/widget/form/profileform.ui
@@ -14,17 +14,20 @@
Form
+
+ 0
+
- 9
+ 0
- 9
+ 0
- 9
+ 0
- 9
+ 0
-
@@ -39,14 +42,99 @@
0
0
- 612
- 800
+ 604
+ 853
-
+
9
+
+ 0
+
+
+ 0
+
+
+ 4
+
+
+ 0
+
+
-
+
+
+ 6
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 60
+ 40
+
+
+
+
+
+
+ :/img/settings/identity.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ true
+
+
+
+ My profile
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 5
+
+
+
+ Qt::Horizontal
+
+
+
-
@@ -544,6 +632,8 @@ Profile does not contain your history.
deletePassButton
changePassButton
-
+
+
+
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index a5ca6e77b..318fb0600 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -1409,15 +1409,15 @@ QString Widget::fromDialogType(DialogType type)
switch (type)
{
case AddDialog:
- return tr("Add friend");
+ return tr("Add friend", "title of the window");
case GroupDialog:
- return tr("Group invites");
+ return tr("Group invites", "title of the window");
case TransferDialog:
- return tr("File transfers");
+ return tr("File transfers", "title of the window");
case SettingDialog:
- return tr("Settings");
+ return tr("Settings", "title of the window");
case ProfileDialog:
- return tr("Profile");
+ return tr("My profile", "title of the window");
default:
return QString();
}