commit 6f5e04a8e92280dccf9f3c9b242bf8a02f386592
author Nicolas Jager <nicolas.jager@savoirfairelinux.com> Wed May 18 15:04:59 2016 -0400
committer Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Mon Jun 06 11:11:33 2016 -0400
tree 07a0a348121fc6b2c2cb2d8b82ef5103ef7b2983
parent b413b300b7d0ff1c863c8aae59c42e87c34f0737

profile : allows to edit profile in the settings

allows to edit the avatar and the name in settings.

Tuleap: #717
Change-Id: I9fcb3606087f2e5a6680a2ea5ba9c7c5cc23d1b1

src/ringmainwindow.cpp

diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp
index d796116..f574c18 100644
--- a/src/ringmainwindow.cpp
+++ b/src/ringmainwindow.cpp
@@ -423,6 +423,10 @@
         if (priv->last_settings_view == priv->media_settings_view)
             media_settings_view_show_preview(MEDIA_SETTINGS_VIEW(priv->media_settings_view), TRUE);
 
+        /* make sure to show the profile if we're showing the general settings */
+        if (priv->last_settings_view == priv->general_settings_view)
+            general_settings_view_show_profile(GENERAL_SETTINGS_VIEW(priv->general_settings_view), TRUE);
+
         gtk_stack_set_transition_type(GTK_STACK(priv->stack_main_view), GTK_STACK_TRANSITION_TYPE_SLIDE_UP);
         gtk_stack_set_visible_child(GTK_STACK(priv->stack_main_view), priv->last_settings_view);
 
@@ -448,6 +452,7 @@
 
         /* make sure video preview is stopped, in case it was started */
         media_settings_view_show_preview(MEDIA_SETTINGS_VIEW(priv->media_settings_view), FALSE);
+        general_settings_view_show_profile(GENERAL_SETTINGS_VIEW(priv->general_settings_view), FALSE);
 
         gtk_stack_set_transition_type(GTK_STACK(priv->stack_main_view), GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN);
         gtk_stack_set_visible_child_name(GTK_STACK(priv->stack_main_view), CALL_VIEW_NAME);
@@ -493,9 +498,12 @@
     RingMainWindowPrivate *priv = RING_MAIN_WINDOW_GET_PRIVATE(win);
 
     if (gtk_toggle_button_get_active(navbutton)) {
+        general_settings_view_show_profile(GENERAL_SETTINGS_VIEW(priv->general_settings_view), TRUE);
         gtk_stack_set_transition_type(GTK_STACK(priv->stack_main_view), GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT);
         gtk_stack_set_visible_child_name(GTK_STACK(priv->stack_main_view), GENERAL_SETTINGS_VIEW_NAME);
         priv->last_settings_view = priv->general_settings_view;
+    } else {
+        general_settings_view_show_profile(GENERAL_SETTINGS_VIEW(priv->general_settings_view), FALSE);
     }
 }