]> sjero.net Git - linphone/commitdiff
improve incoming call tab
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 27 Sep 2010 09:06:20 +0000 (11:06 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 27 Sep 2010 09:06:20 +0000 (11:06 +0200)
gtk/incall_view.c
gtk/main.ui

index 0ea060241c1b0eba2f2233a8ea08536efd42df5f..83df3a44754075406dc1fae01f37c2db19b25a82 100644 (file)
@@ -142,13 +142,14 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call, bool_t with_paus
        GtkWidget *callview=(GtkWidget*)linphone_call_get_user_pointer(call);
        GtkWidget *status=linphone_gtk_get_widget(callview,"in_call_status");
        GtkWidget *callee=linphone_gtk_get_widget(callview,"in_call_uri");
-       GtkWidget *duration=linphone_gtk_get_widget(callview,"in_call_duration");
        GtkWidget *animation=linphone_gtk_get_widget(callview,"in_call_animation");
        GdkPixbufAnimation *pbuf=create_pixbuf_animation("calling_anim.gif");
        GtkWidget *answer_button;
 
        gtk_label_set_markup(GTK_LABEL(status),_("<b>Incoming call</b>"));
        gtk_widget_show_all(linphone_gtk_get_widget(callview,"answer_decline_panel"));
+       gtk_widget_hide(linphone_gtk_get_widget(callview,"duration_frame"));
+       gtk_widget_hide(linphone_gtk_get_widget(callview,"mute_pause_buttons"));
        display_peer_name_in_label(callee,linphone_call_get_remote_address (call));
 
        answer_button=linphone_gtk_get_widget(callview,"accept_call");
@@ -161,7 +162,6 @@ void linphone_gtk_in_call_view_set_incoming(LinphoneCall *call, bool_t with_paus
        gtk_button_set_image(GTK_BUTTON(linphone_gtk_get_widget(callview,"decline_call")),
                         create_pixmap (linphone_gtk_get_ui_config("stop_call_icon","stopcall-red.png")));
        
-       gtk_label_set_text(GTK_LABEL(duration),_("00::00::00"));
        if (pbuf!=NULL){
                gtk_image_set_from_animation(GTK_IMAGE(animation),pbuf);
                g_object_unref(G_OBJECT(pbuf));
@@ -178,6 +178,8 @@ void linphone_gtk_in_call_view_set_in_call(LinphoneCall *call){
        
        display_peer_name_in_label(callee,linphone_call_get_remote_address (call));
 
+       gtk_widget_show(linphone_gtk_get_widget(callview,"duration_frame"));
+       gtk_widget_show(linphone_gtk_get_widget(callview,"mute_pause_buttons"));
        gtk_widget_hide(linphone_gtk_get_widget(callview,"answer_decline_panel"));
        gtk_label_set_markup(GTK_LABEL(status),_("<b>In call</b>"));
 
index e1ea351ea4c4adeb14452c5bb4891d1c5d9ae2aa..0d207b8d58e1be424eb442b67c01cea30e3ce167 100644 (file)
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">2</property>
           </packing>
         </child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkFrame" id="frame1">
+                  <object class="GtkFrame" id="duration_frame">
                     <property name="visible">True</property>
                     <property name="label_xalign">0</property>
                     <child>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHButtonBox" id="hbuttonbox4">
+                  <object class="GtkHButtonBox" id="mute_pause_buttons">
                     <property name="visible">True</property>
                     <property name="layout_style">spread</property>
                     <child>