Commit 08f58d8b authored by Sébastien Blin's avatar Sébastien Blin

migration: show managerUri and username

Change-Id: I4e14c1d4af567626239319338a2b16af5cc357ba
parent 0a0e3fe2
...@@ -60,12 +60,14 @@ struct _AccountMigrationViewPrivate ...@@ -60,12 +60,14 @@ struct _AccountMigrationViewPrivate
/* main_view */ /* main_view */
GtkWidget *main_view; GtkWidget *main_view;
GtkWidget *label_account_alias; GtkWidget *label_account_alias;
GtkWidget *label_account_ringid; GtkWidget *label_account_username;
GtkWidget *label_account_manager;
GtkWidget *image_avatar; GtkWidget *image_avatar;
GtkWidget *label_migration_error; GtkWidget *label_migration_error;
GtkWidget *entry_password; GtkWidget *entry_password;
GtkWidget *button_migrate_account; GtkWidget *button_migrate_account;
GtkWidget *ringid_row; GtkWidget *username_row;
GtkWidget *manager_row;
GtkWidget *button_delete_account; GtkWidget *button_delete_account;
GtkWidget *hbox_migrating_account_spinner; GtkWidget *hbox_migrating_account_spinner;
...@@ -111,12 +113,14 @@ account_migration_view_class_init(AccountMigrationViewClass *klass) ...@@ -111,12 +113,14 @@ account_migration_view_class_init(AccountMigrationViewClass *klass)
/* main_view */ /* main_view */
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, main_view); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, main_view);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_account_alias); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_account_alias);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_account_ringid); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_account_username);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_account_manager);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, image_avatar); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, image_avatar);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_migration_error); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, label_migration_error);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, entry_password); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, entry_password);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, button_migrate_account); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, button_migrate_account);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, ringid_row); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, username_row);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, manager_row);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, button_delete_account); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, button_delete_account);
gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, hbox_migrating_account_spinner); gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), AccountMigrationView, hbox_migrating_account_spinner);
...@@ -151,6 +155,8 @@ migrate(AccountMigrationView *view) ...@@ -151,6 +155,8 @@ migrate(AccountMigrationView *view)
[=] (const std::string& accountId, bool ok) [=] (const std::string& accountId, bool ok)
{ {
gtk_widget_hide(priv->hbox_migrating_account_spinner); gtk_widget_hide(priv->hbox_migrating_account_spinner);
gtk_widget_set_sensitive(GTK_WIDGET(priv->button_delete_account), true);
gtk_widget_set_sensitive(GTK_WIDGET(priv->button_migrate_account), true);
if (ok) { if (ok) {
g_signal_emit(G_OBJECT(view), account_migration_view_signals[ACCOUNT_MIGRATION_COMPLETED], 0); g_signal_emit(G_OBJECT(view), account_migration_view_signals[ACCOUNT_MIGRATION_COMPLETED], 0);
} else { } else {
...@@ -164,6 +170,8 @@ migrate(AccountMigrationView *view) ...@@ -164,6 +170,8 @@ migrate(AccountMigrationView *view)
gtk_entry_set_text(GTK_ENTRY(priv->entry_password), ""); gtk_entry_set_text(GTK_ENTRY(priv->entry_password), "");
gtk_widget_show_all(priv->hbox_migrating_account_spinner); gtk_widget_show_all(priv->hbox_migrating_account_spinner);
gtk_widget_set_sensitive(GTK_WIDGET(priv->button_delete_account), false);
gtk_widget_set_sensitive(GTK_WIDGET(priv->button_migrate_account), false);
} }
...@@ -211,13 +219,24 @@ build_migration_view(AccountMigrationView *view) ...@@ -211,13 +219,24 @@ build_migration_view(AccountMigrationView *view)
// display the ringID (without "ring:") // display the ringID (without "ring:")
g_debug("MIGRATE FOR %s", (*priv->accountInfo_)->id.c_str()); g_debug("MIGRATE FOR %s", (*priv->accountInfo_)->id.c_str());
std::string username = (*priv->accountInfo_)->profileInfo.uri; std::string username = (*priv->accountInfo_)->registeredName;
if (username.empty()) { try {
username = (*priv->accountInfo_)->profileInfo.uri; auto conf = (*priv->accountInfo_)->accountModel->getAccountConfig((*priv->accountInfo_)->id);
} if (username.empty() && !conf.managerUsername.empty()) {
gtk_label_set_text(GTK_LABEL(priv->label_account_ringid), username.c_str()); username = conf.managerUsername;
if (username.empty()) { }
gtk_widget_hide(priv->ringid_row); gtk_label_set_text(GTK_LABEL(priv->label_account_username), username.c_str());
if (username.empty()) {
gtk_widget_hide(priv->username_row);
}
std::string manager = conf.managerUri;
gtk_label_set_text(GTK_LABEL(priv->label_account_manager), manager.c_str());
if (manager.empty()) {
gtk_widget_hide(priv->manager_row);
}
} catch (...) {
gtk_widget_hide(priv->username_row);
gtk_widget_hide(priv->manager_row);
} }
/* get the current or default profile avatar */ /* get the current or default profile avatar */
......
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
</object> </object>
</child> </child>
<child> <child>
<!-- RingID --> <!-- Username -->
<object class="GtkListBoxRow" id="ringid_row"> <object class="GtkListBoxRow" id="username_row">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="halign">fill</property> <property name="halign">fill</property>
...@@ -124,11 +124,11 @@ ...@@ -124,11 +124,11 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="label" translatable="yes">RingID</property> <property name="label" translatable="yes">Username</property>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkLabel" id="label_account_ringid"> <object class="GtkLabel" id="label_account_username">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
...@@ -182,6 +182,43 @@ ...@@ -182,6 +182,43 @@
</child> </child>
</object> </object>
</child> </child>
<child>
<!-- Manager URI -->
<object class="GtkListBoxRow" id="manager_row">
<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>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Account manager</property>
</object>
</child>
<child>
<object class="GtkLabel" id="label_account_manager">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment