Commit 3b4a2ffb authored by smorlat's avatar smorlat
Browse files

set good icons and improve layout.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@605 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent a8367a62
......@@ -479,7 +479,7 @@ void linphone_gtk_call_terminated(const char *error){
GtkWidget *mw=linphone_gtk_get_main_window();
gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"terminate_call"),FALSE);
gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"start_call"),TRUE);
gtk_widget_hide(linphone_gtk_get_widget(mw,"go_to_call_view_box"));
gtk_widget_hide_all(linphone_gtk_get_widget(mw,"go_to_call_view_box"));
linphone_gtk_in_call_view_terminate(error);
update_video_title();
g_object_set_data(G_OBJECT(mw),"incoming_call",NULL);
......@@ -498,7 +498,7 @@ static gboolean in_call_timer(){
static void linphone_gtk_call_started(GtkWidget *mw){
gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"start_call"),FALSE);
gtk_widget_set_sensitive(linphone_gtk_get_widget(mw,"terminate_call"),TRUE);
gtk_widget_show(linphone_gtk_get_widget(mw,"go_to_call_view_box"));
gtk_widget_show_all(linphone_gtk_get_widget(mw,"go_to_call_view_box"));
update_video_title();
g_timeout_add(250,(GSourceFunc)in_call_timer,NULL);
}
......@@ -941,6 +941,7 @@ static void linphone_gtk_configure_main_window(){
if (stop_call_icon){
GdkPixbuf *pbuf=create_pixbuf(stop_call_icon);
gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"terminate_call_icon")),pbuf);
gtk_image_set_from_pixbuf(GTK_IMAGE(linphone_gtk_get_widget(w,"in_call_terminate_icon")),pbuf);
g_object_unref(G_OBJECT(pbuf));
}
if (home){
......
......@@ -835,6 +835,7 @@ Online users</property>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
......@@ -961,56 +962,57 @@ Online users</property>
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox7">
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">center</property>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox1">
<widget class="GtkButton" id="in_call_terminate">
<property name="visible">True</property>
<property name="layout_style">center</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="linphone_gtk_terminate_call"/>
<child>
<widget class="GtkButton" id="in_call_terminate">
<widget class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="clicked" handler="linphone_gtk_terminate_call"/>
<child>
<widget class="GtkHBox" id="hbox8">
<widget class="GtkImage" id="in_call_terminate_icon">
<property name="visible">True</property>
<child>
<widget class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon-size">3</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Terminate call&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
<property name="stock">gtk-close</property>
<property name="icon-size">3</property>
</widget>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Terminate call&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">8</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">8</property>
<property name="position">3</property>
</packing>
</child>
<child>
<widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="layout_style">center</property>
<child>
<widget class="GtkButton" id="idle_view_button">
<property name="visible">True</property>
......@@ -1023,7 +1025,7 @@ Online users</property>
<child>
<widget class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="stock">gtk-undo</property>
<property name="stock">gtk-go-back</property>
<property name="icon-size">1</property>
</widget>
<packing>
......@@ -1046,14 +1048,14 @@ Online users</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
<property name="position">0</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="padding">8</property>
<property name="position">3</property>
<property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
</widget>
......
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