Move app password label above credentials form

2 files changed, 11 insertions, 24 deletions

diff --git a/src/gui/newwizard/pages/basiccredentialssetupwizardpage.cpp b/src/gui/newwizard/pages/basiccredentialssetupwizardpage.cpp
index 4e0444eab..a220b74e2 100644
--- a/src/gui/newwizard/pages/basiccredentialssetupwizardpage.cpp
+++ b/src/gui/newwizard/pages/basiccredentialssetupwizardpage.cpp
@@ -32,20 +32,7 @@ BasicCredentialsSetupWizardPage::BasicCredentialsSetupWizardPage(const QUrl &ser
         _ui->usernameLineEdit->setFocus();
     });
 
-    // branding
-    const QString usernameLabelText = []() {
-        switch (Theme::instance()->userIDType()) {
-        case Theme::UserIDUserName:
-            return tr("Username");
-        case Theme::UserIDEmail:
-            return tr("E-mail address");
-        case Theme::UserIDCustom:
-            return Theme::instance()->customUserID();
-        default:
-            Q_UNREACHABLE();
-        }
-    }();
-
+    const QString usernameLabelText = Utility::enumToDisplayName(Theme::instance()->userIDType());
     _ui->usernameLabel->setText(usernameLabelText);
     _ui->usernameLineEdit->setPlaceholderText(usernameLabelText);
 
diff --git a/src/gui/newwizard/pages/basiccredentialssetupwizardpage.ui b/src/gui/newwizard/pages/basiccredentialssetupwizardpage.ui
index 525a913e0..ec3d1e5ba 100644
--- a/src/gui/newwizard/pages/basiccredentialssetupwizardpage.ui
+++ b/src/gui/newwizard/pages/basiccredentialssetupwizardpage.ui
@@ -60,6 +60,16 @@
     </spacer>
    </item>
    <item>
+    <widget class="QLabel" name="appPasswordLabel">
+     <property name="text">
+      <string notr="true">&lt;app password text&gt; (placeholder)</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="horizontalSpacer">
@@ -137,16 +147,6 @@
     </layout>
    </item>
    <item>
-    <widget class="QLabel" name="appPasswordLabel">
-     <property name="text">
-      <string notr="true">&lt;app password text&gt; (placeholder)</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>