From c8d1a87280192539d138c69906858f828afa1141 Mon Sep 17 00:00:00 2001
From: Amin Bandali <amin.bandali@savoirfairelinux.com>
Date: Fri, 25 Sep 2020 11:50:32 -0400
Subject: [PATCH] accountcreationwizard: update some strings
Update some strings in the account creation wizard to further
homogenize jami-gnome with other clients. Also, in the import backup
pane, move 'Archive' above the 'Password' field, matching jami-qt.
Further, update the strings in the 'Connect to a JAMS server" screen
and rearrange components to more closely match jami-qt.
Gitlab: #1197
Change-Id: I87a411dda881dd6ffd4249744060755ad6b74f22
---
src/accountcreationwizard.cpp | 41 +++----
ui/accountcreationwizard.ui | 198 ++++++++++++++++++----------------
2 files changed, 128 insertions(+), 111 deletions(-)
diff --git a/src/accountcreationwizard.cpp b/src/accountcreationwizard.cpp
index 1b43afaf..79622837 100644
--- a/src/accountcreationwizard.cpp
+++ b/src/accountcreationwizard.cpp
@@ -81,8 +81,8 @@ struct _AccountCreationWizardPrivate
GtkWidget *row_pin;
GtkWidget *button_pin_info;
GtkWidget *row_pin_label;
- GtkWidget *button_import_from_next;
- GtkWidget *button_import_from_previous;
+ GtkWidget *button_import_from_do;
+ GtkWidget *button_import_from_back;
GtkWidget *entry_existing_account_pin;
GtkWidget *entry_existing_account_archive;
GtkWidget *entry_existing_account_password;
@@ -95,7 +95,7 @@ struct _AccountCreationWizardPrivate
GtkWidget *entry_password_confirm;
GtkWidget *label_password_error;
GtkWidget *button_account_creation_next;
- GtkWidget *button_account_creation_previous;
+ GtkWidget *button_account_creation_back;
GtkWidget *box_avatarselection;
GtkWidget *avatar_manipulation;
GtkWidget *label_register;
@@ -130,8 +130,8 @@ struct _AccountCreationWizardPrivate
GtkWidget *entry_account_manager_username;
GtkWidget *entry_account_manager_password;
GtkWidget *entry_account_manager_uri;
- GtkWidget *button_account_manager_connect_previous;
- GtkWidget *button_account_manager_connect_next;
+ GtkWidget *button_account_manager_connect_back;
+ GtkWidget *button_account_manager_connect_connect;
lrc::api::AVModel* avModel_;
lrc::api::NewAccountModel* accountModel_;
@@ -209,8 +209,8 @@ account_creation_wizard_class_init(AccountCreationWizardClass *klass)
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, row_pin);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_pin_info);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, row_pin_label);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_import_from_next);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_import_from_previous);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_import_from_do);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_import_from_back);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_existing_account_pin);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_existing_account_archive);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_existing_account_password);
@@ -221,7 +221,7 @@ account_creation_wizard_class_init(AccountCreationWizardClass *klass)
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_password);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_password_confirm);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_account_creation_next);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_account_creation_previous);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_account_creation_back);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, box_avatarselection);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, label_password_error);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, label_register);
@@ -255,8 +255,8 @@ account_creation_wizard_class_init(AccountCreationWizardClass *klass)
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_account_manager_username);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_account_manager_password);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, entry_account_manager_uri);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_account_manager_connect_previous);
- gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_account_manager_connect_next);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_account_manager_connect_back);
+ gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountCreationWizard, button_account_manager_connect_connect);
/* add signals */
account_creation_wizard_signals[ACCOUNT_CREATION_COMPLETED] = g_signal_new("account-creation-completed",
@@ -612,7 +612,8 @@ show_import_from_device(AccountCreationWizard *view)
{
auto* priv = ACCOUNT_CREATION_WIZARD_GET_PRIVATE(view);
- gtk_label_set_text(GTK_LABEL(priv->existing_account_label), _("Import from device"));
+ gtk_label_set_text(GTK_LABEL(priv->existing_account_label), _("Enter Jami account password"));
+ gtk_button_set_label(GTK_BUTTON(priv->button_import_from_do), _("Link device"));
gtk_entry_set_text(GTK_ENTRY(priv->entry_existing_account_pin), "");
gtk_entry_set_text(GTK_ENTRY(priv->entry_existing_account_password), "");
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(priv->entry_existing_account_archive), nullptr);
@@ -632,6 +633,7 @@ show_import_from_backup(AccountCreationWizard *view)
auto* priv = ACCOUNT_CREATION_WIZARD_GET_PRIVATE(view);
gtk_label_set_text(GTK_LABEL(priv->existing_account_label), _("Import from backup"));
+ gtk_button_set_label(GTK_BUTTON(priv->button_import_from_do), _("Restore an account from backup"));
gtk_entry_set_text(GTK_ENTRY(priv->entry_existing_account_pin), "");
gtk_entry_set_text(GTK_ENTRY(priv->entry_existing_account_password), "");
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(priv->entry_existing_account_archive), nullptr);
@@ -691,7 +693,7 @@ entries_existing_account_changed(G_GNUC_UNUSED GtkEntry *entry, AccountCreationW
(not hasPin)
);
gtk_widget_set_sensitive(
- priv->button_import_from_next,
+ priv->button_import_from_do,
(hasArchive || hasPin)
);
@@ -728,7 +730,7 @@ entries_connect_account_manager_changed(AccountCreationWizard *view)
const std::string managerUri = gtk_entry_get_text(GTK_ENTRY(priv->entry_account_manager_uri));
const std::string password = gtk_entry_get_text(GTK_ENTRY(priv->entry_account_manager_password));
- gtk_widget_set_sensitive(priv->button_account_manager_connect_next, (!username.empty() && !managerUri.empty() && !password.empty()));
+ gtk_widget_set_sensitive(priv->button_account_manager_connect_connect, (!username.empty() && !managerUri.empty() && !password.empty()));
}
static void
@@ -887,7 +889,7 @@ build_creation_wizard_view(AccountCreationWizard *view)
/* account_creation signals */
g_signal_connect_swapped(priv->entry_username, "changed", G_CALLBACK(entries_new_account_changed), view);
g_signal_connect(priv->button_account_creation_next, "clicked", G_CALLBACK(account_creation_next_clicked), view);
- g_signal_connect(priv->button_account_creation_previous, "clicked", G_CALLBACK(account_creation_previous_clicked), view);
+ g_signal_connect(priv->button_account_creation_back, "clicked", G_CALLBACK(account_creation_previous_clicked), view);
g_signal_connect_swapped(priv->entry_password, "changed", G_CALLBACK(entries_new_account_changed), view);
g_signal_connect_swapped(priv->entry_password_confirm, "changed", G_CALLBACK(entries_new_account_changed), view);
g_signal_connect_swapped(priv->entry_display_name, "changed", G_CALLBACK(entries_new_account_changed), view);
@@ -895,9 +897,9 @@ build_creation_wizard_view(AccountCreationWizard *view)
g_signal_connect_swapped(priv->username_registration_box, "username-availability-changed", G_CALLBACK(username_availability_changed), view);
/* existing_account signals */
- g_signal_connect_swapped(priv->button_import_from_previous, "clicked", G_CALLBACK(show_choose_account_type), view);
+ g_signal_connect_swapped(priv->button_import_from_back, "clicked", G_CALLBACK(show_choose_account_type), view);
g_signal_connect_swapped(priv->button_pin_info, "clicked", G_CALLBACK(show_pin_label), view);
- g_signal_connect_swapped(priv->button_import_from_next, "clicked", G_CALLBACK(existing_account_next_clicked), view);
+ g_signal_connect_swapped(priv->button_import_from_do, "clicked", G_CALLBACK(existing_account_next_clicked), view);
g_signal_connect(priv->entry_existing_account_pin, "changed", G_CALLBACK(entries_existing_account_changed), view);
g_signal_connect(priv->entry_existing_account_archive, "file-set", G_CALLBACK(entries_existing_account_changed), view);
g_signal_connect(priv->entry_existing_account_password, "changed", G_CALLBACK(entries_existing_account_changed), view);
@@ -915,8 +917,8 @@ build_creation_wizard_view(AccountCreationWizard *view)
g_signal_connect_swapped(priv->entry_account_manager_username, "changed", G_CALLBACK(entries_connect_account_manager_changed), view);
g_signal_connect_swapped(priv->entry_account_manager_password, "changed", G_CALLBACK(entries_connect_account_manager_changed), view);
g_signal_connect_swapped(priv->entry_account_manager_uri, "changed", G_CALLBACK(entries_connect_account_manager_changed), view);
- g_signal_connect(priv->button_account_manager_connect_previous, "clicked", G_CALLBACK(connect_account_manager_previous_clicked), view);
- g_signal_connect(priv->button_account_manager_connect_next, "clicked", G_CALLBACK(connect_account_manager_next_clicked), view);
+ g_signal_connect(priv->button_account_manager_connect_back, "clicked", G_CALLBACK(connect_account_manager_previous_clicked), view);
+ g_signal_connect(priv->button_account_manager_connect_connect, "clicked", G_CALLBACK(connect_account_manager_next_clicked), view);
show_choose_account_type(view);
@@ -926,7 +928,8 @@ build_creation_wizard_view(AccountCreationWizard *view)
gtk_css_provider_load_from_data(provider,
".black { color: grey; font-size: 0.8em; }\
.transparent-button { margin-left: 0; border: 0; background-color: rgba(0,0,0,0); margin-right: 0; padding-right: 0;}\
- .infos-button { margin: 0; border: 0; background-color: rgba(0,0,0,0); padding: 0; box-shadow: 0;}",
+ .infos-button { margin: 0; border: 0; background-color: rgba(0,0,0,0); padding: 0; box-shadow: 0;}\
+ .smaller {font-size: 0.87em;}",
-1, nullptr
);
gtk_style_context_add_provider_for_screen(gdk_display_get_default_screen(gdk_display_get_default()),
diff --git a/ui/accountcreationwizard.ui b/ui/accountcreationwizard.ui
index 0266c810..a3724373 100644
--- a/ui/accountcreationwizard.ui
+++ b/ui/accountcreationwizard.ui
@@ -73,7 +73,7 @@
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="button_new_account">
- <property name="label" translatable="yes">Create local account</property>
+ <property name="label" translatable="yes">Create a Jami account</property>
<property name="tooltip_text" translatable="yes">Create a new Jami account on this device (for new users)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -81,7 +81,7 @@
</child>
<child>
<object class="GtkButton" id="button_new_rendezvous">
- <property name="label" translatable="yes">Create a Rendezvous point</property>
+ <property name="label" translatable="yes">Create a rendezvous point</property>
<property name="tooltip_text" translatable="yes">Create a Rendezvous point</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -89,7 +89,7 @@
</child>
<child>
<object class="GtkButton" id="button_import_from_device">
- <property name="label" translatable="yes">Import from device</property>
+ <property name="label" translatable="yes">Link this device to an existing account</property>
<property name="tooltip_text" translatable="yes">Import an account with your PIN generated on another device</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -97,7 +97,7 @@
</child>
<child>
<object class="GtkButton" id="button_import_from_backup">
- <property name="label" translatable="yes">Import from archive backup</property>
+ <property name="label" translatable="yes">Restore an account from backup</property>
<property name="tooltip_text" translatable="yes">Import an account via your archive</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -105,7 +105,7 @@
</child>
<child>
<object class="GtkButton" id="button_show_advanced">
- <property name="label" translatable="yes">Advanced…</property>
+ <property name="label" translatable="yes">Advanced features</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<style>
@@ -116,7 +116,7 @@
</child>
<child>
<object class="GtkButton" id="button_connect_account_manager">
- <property name="label" translatable="yes">Connect to account manager</property>
+ <property name="label" translatable="yes">Connect to a JAMS server</property>
<property name="tooltip_text" translatable="yes">Get your account via your credentials.</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
@@ -124,7 +124,7 @@
</child>
<child>
<object class="GtkButton" id="button_new_sip_account">
- <property name="label" translatable="yes">Add a new SIP account</property>
+ <property name="label" translatable="yes">Add a SIP account</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
</object>
@@ -177,8 +177,8 @@
<property name="selection_mode">none</property>
<child>
- <!-- Password -->
- <object class="GtkListBoxRow">
+ <!-- Account archive -->
+ <object class="GtkListBoxRow" id="row_archive">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">fill</property>
@@ -196,19 +196,30 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Password</property>
+ <property name="label" translatable="yes">Archive</property>
</object>
</child>
<child>
- <object class="GtkEntry" id="entry_existing_account_password">
- <property name="halign">center</property>
+ <object class="GtkButton" id="button_backup_info">
+ <property name="image">image-infos-backup</property>
+ <property name="tooltip_text" translatable="yes">Informations.</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">fill</property>
+ <property name="margin_right">10</property>
+ <style>
+ <class name="infos-button"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <object class="GtkFileChooserButton" id="entry_existing_account_archive">
<property name="width_request">320</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="xalign">0.5</property>
- <property name="primary_icon_stock">gtk-dialog-authentication</property>
- <property name="input_purpose">password</property>
- <property name="visibility">False</property>
+ <property name="halign">center</property>
+ <property name="title" translatable="yes"/>
</object>
<packing>
<property name="pack_type">end</property>
@@ -220,8 +231,8 @@
</child>
<child>
- <!-- Account archive -->
- <object class="GtkListBoxRow" id="row_archive">
+ <!-- Label backup -->
+ <object class="GtkListBoxRow" id="row_backup_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">fill</property>
@@ -235,34 +246,56 @@
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
<property name="spacing">10</property>
+ <property name="valign">center</property>
+ <property name="halign">center</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Archive</property>
+ <property name="wrap">True</property>
+ <property name="justify">fill</property>
+ <property name="max-width-chars">40</property>
+ <property name="label" translatable="yes">You can obtain an archive by clicking on "Backup account" in the account settings. This will create a .gz file on your device.</property>
</object>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+
+ <child>
+ <!-- Password -->
+ <object class="GtkListBoxRow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">fill</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="halign">fill</property>
+ <property name="orientation">horizontal</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
+ <property name="spacing">10</property>
<child>
- <object class="GtkButton" id="button_backup_info">
- <property name="image">image-infos-backup</property>
- <property name="tooltip_text" translatable="yes">Informations.</property>
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">fill</property>
- <property name="margin_right">10</property>
- <style>
- <class name="infos-button"/>
- </style>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Password</property>
</object>
</child>
<child>
- <object class="GtkFileChooserButton" id="entry_existing_account_archive">
+ <object class="GtkEntry" id="entry_existing_account_password">
+ <property name="halign">center</property>
<property name="width_request">320</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">center</property>
- <property name="title" translatable="yes"/>
+ <property name="xalign">0.5</property>
+ <property name="primary_icon_stock">gtk-dialog-authentication</property>
+ <property name="input_purpose">password</property>
+ <property name="visibility">False</property>
</object>
<packing>
<property name="pack_type">end</property>
@@ -329,39 +362,6 @@
</object>
</child>
- <child>
- <!-- Label backup -->
- <object class="GtkListBoxRow" id="row_backup_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">fill</property>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="halign">fill</property>
- <property name="orientation">horizontal</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
- <property name="margin_top">10</property>
- <property name="margin_bottom">10</property>
- <property name="spacing">10</property>
- <property name="valign">center</property>
- <property name="halign">center</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="wrap">True</property>
- <property name="justify">fill</property>
- <property name="max-width-chars">40</property>
- <property name="label" translatable="yes">You can obtain an archive by clicking on "Export account" in the account settings. This will create a .gz file on your device.</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
-
<child>
<!-- Label PIN -->
<object class="GtkListBoxRow" id="row_pin_label">
@@ -387,7 +387,7 @@
<property name="wrap">True</property>
<property name="justify">fill</property>
<property name="max-width-chars">40</property>
- <property name="label" translatable="yes">To obtain a PIN (valid for 10 minutes), you need to open the account settings on the other device and click on "Link to another device".</property>
+ <property name="label" translatable="yes">Enter the PIN from another configured Jami account. Use the "Link Another Device" feature to obtain a PIN.</property>
</object>
</child>
</object>
@@ -406,16 +406,15 @@
<object class="GtkButtonBox">
<property name="visible">True</property>
<child>
- <object class="GtkButton" id="button_import_from_previous">
- <property name="label" translatable="yes">Previous</property>
+ <object class="GtkButton" id="button_import_from_back">
+ <property name="label" translatable="yes">Back</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">start</property>
</object>
</child>
<child>
- <object class="GtkButton" id="button_import_from_next">
- <property name="label" translatable="yes">Next</property>
+ <object class="GtkButton" id="button_import_from_do">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -706,8 +705,8 @@
<object class="GtkButtonBox">
<property name="visible">True</property>
<child>
- <object class="GtkButton" id="button_account_creation_previous">
- <property name="label" translatable="yes">Previous</property>
+ <object class="GtkButton" id="button_account_creation_back">
+ <property name="label" translatable="yes">Back</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">start</property>
@@ -941,7 +940,7 @@
<property name="visible">True</property>
<property name="halign">start</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Sign in</property>
+ <property name="label" translatable="yes">Enter Jami Account Management Server (JAMS) URL</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -967,13 +966,13 @@
<property name="halign">fill</property>
<property name="selection_mode">none</property>
<child>
- <!-- entry username -->
+ <!-- Account Manager URL -->
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">fill</property>
<child>
- <object class="GtkBox" id="box_account_manager_username_entry">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="halign">fill</property>
<property name="orientation">horizontal</property>
@@ -981,15 +980,16 @@
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
+ <property name="spacing">10</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Username</property>
+ <property name="label" translatable="yes">JAMS URL</property>
</object>
</child>
<child>
- <object class="GtkEntry" id="entry_account_manager_username">
+ <object class="GtkEntry" id="entry_account_manager_uri">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
@@ -1002,13 +1002,28 @@
</object>
</child>
<child>
- <!-- Password -->
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Enter your JAMS credentials</property>
+ <style>
+ <class name="smaller"/>
+ </style>
+ </object>
+ </child>
+ <child>
+ <!-- entry username -->
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">fill</property>
<child>
- <object class="GtkBox">
+ <object class="GtkBox" id="box_account_manager_username_entry">
<property name="visible">True</property>
<property name="halign">fill</property>
<property name="orientation">horizontal</property>
@@ -1016,21 +1031,17 @@
<property name="margin_right">10</property>
<property name="margin_top">10</property>
<property name="margin_bottom">10</property>
- <property name="spacing">10</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Password</property>
+ <property name="label" translatable="yes">Username</property>
</object>
</child>
<child>
- <object class="GtkEntry" id="entry_account_manager_password">
+ <object class="GtkEntry" id="entry_account_manager_username">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="primary_icon_stock">gtk-dialog-authentication</property>
- <property name="visibility">False</property>
- <property name="input_purpose">password</property>
</object>
<packing>
<property name="pack_type">end</property>
@@ -1041,7 +1052,7 @@
</object>
</child>
<child>
- <!-- Account Manager URL -->
+ <!-- Password -->
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1060,13 +1071,16 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Account manager</property>
+ <property name="label" translatable="yes">Password</property>
</object>
</child>
<child>
- <object class="GtkEntry" id="entry_account_manager_uri">
+ <object class="GtkEntry" id="entry_account_manager_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="primary_icon_stock">gtk-dialog-authentication</property>
+ <property name="visibility">False</property>
+ <property name="input_purpose">password</property>
</object>
<packing>
<property name="pack_type">end</property>
@@ -1086,16 +1100,16 @@
<object class="GtkButtonBox">
<property name="visible">True</property>
<child>
- <object class="GtkButton" id="button_account_manager_connect_previous">
- <property name="label" translatable="yes">Previous</property>
+ <object class="GtkButton" id="button_account_manager_connect_back">
+ <property name="label" translatable="yes">Back</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">start</property>
</object>
</child>
<child>
- <object class="GtkButton" id="button_account_manager_connect_next">
- <property name="label" translatable="yes">Next</property>
+ <object class="GtkButton" id="button_account_manager_connect_connect">
+ <property name="label" translatable="yes">Connect</property>
<property name="sensitive">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
--
GitLab