commit cba03951ad4d7f30d03348722d77f85205a987a1
author AmarOk <contact@enconn.fr> Mon Jul 17 10:13:49 2017 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Mon Jul 17 17:41:24 2017 -0400
tree 9e36d8be4385fada5bc173556c339b9abb599202
parent e7c02971627ef376507b43d87ac4d11efbcd6e8b

chatview: improve ui for combobox_cm

If a contact have multiple cm, we should show the combobox_cm, but if
they only have one cm, the combobox should be a label instead of a
combobox.

Change-Id: I0b5bbdec4873352f5138daabd698249304af10f6

src/chatview.cpp

diff --git a/src/chatview.cpp b/src/chatview.cpp
index 75203f3..7c6b8af 100644
--- a/src/chatview.cpp
+++ b/src/chatview.cpp
@@ -62,6 +62,7 @@
     GtkWidget *hbox_chat_info;
     GtkWidget *label_peer;
     GtkWidget *combobox_cm;
+    GtkWidget *label_cm;
     GtkWidget *button_close_chatview;
     GtkWidget *button_placecall;
     GtkWidget *button_send_invitation;
@@ -249,6 +250,7 @@
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, scrolledwindow_chat);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, hbox_chat_info);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, label_peer);
+    gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, label_cm);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, combobox_cm);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, button_close_chatview);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), ChatView, button_placecall);
@@ -523,8 +525,21 @@
     }
 
     /* if there is only one CM, make the combo box insensitive */
-    if (cms.size() < 2)
-        gtk_widget_set_sensitive(priv->combobox_cm, FALSE);
+    if (cms.size() < 2) {
+        auto active = cms.at(gtk_combo_box_get_active(GTK_COMBO_BOX(priv->combobox_cm)));
+        std::string ring_id = active->roleData(static_cast<int>(Ring::Role::Number)).toString().toUtf8().constData();
+        std::string displayed = gtk_label_get_text(GTK_LABEL(priv->label_peer));
+        gtk_label_set_text(GTK_LABEL(priv->label_cm), ring_id.c_str());
+        gtk_widget_hide(priv->combobox_cm);
+        if (displayed == ring_id) {
+            gtk_widget_hide(priv->label_cm);
+        } else {
+            gtk_widget_show(priv->label_cm);
+        }
+    } else {
+        gtk_widget_show(priv->combobox_cm);
+        gtk_widget_hide(priv->label_cm);
+    }
 
     /* if no CMs make the call button insensitive */
     gtk_widget_set_sensitive(priv->button_placecall, !cms.isEmpty());