Merge branch 'master' of git://git.linphone.org/linphone

[linphone] / gtk / main.ui

diff --git a/gtk/main.ui b/gtk/main.ui
index 347a402eae529f64574e2ef92a3249d3d1776294..dde462ec34396e050df8ab5233e6c081150615d4 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -7,6 +7,16 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-add</property>
   </object>
+  <object class="GtkImage" id="add_image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
+  <object class="GtkImage" id="add_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
   <object class="GtkWindow" id="dummy_callee_frame">
     <property name="can_focus">False</property>
     <child>
@@ -701,6 +711,16 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-edit</property>
   </object>
+  <object class="GtkImage" id="edit_image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-edit</property>
+  </object>
+  <object class="GtkImage" id="edit_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-edit</property>
+  </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -751,11 +771,21 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-select-color</property>
   </object>
+  <object class="GtkImage" id="image19">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="stock">gtk-refresh</property>
   </object>
+  <object class="GtkImage" id="image20">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-add</property>
+  </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -1088,9 +1118,9 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox">
+                  <object class="GtkHPaned" id="central_paned">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <child>
                       <object class="GtkVBox" id="vbox12">
                         <property name="visible">True</property>
@@ -1144,16 +1174,14 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="has_tooltip">True</property>
                             <child>
                               <object class="GtkButton" id="add_button">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Add</property>
                                 <property name="resize_mode">immediate</property>
                                 <property name="use_action_appearance">False</property>
-                                <property name="image">add_image</property>
+                                <property name="image">add_image2</property>
                                 <property name="xalign">1</property>
                                 <signal name="clicked" handler="linphone_gtk_add_button_clicked" swapped="no"/>
                               </object>
@@ -1168,9 +1196,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip_text" translatable="yes">Edit</property>
                                 <property name="use_action_appearance">False</property>
-                                <property name="image">edit_image</property>
+                                <property name="image">edit_image2</property>
                                 <signal name="clicked" handler="linphone_gtk_edit_button_clicked" swapped="no"/>
                               </object>
                               <packing>
@@ -1185,7 +1212,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="use_action_appearance">False</property>
-                                <property name="image">remove_image</property>
+                                <property name="image">remove_image2</property>
                                 <signal name="clicked" handler="linphone_gtk_remove_button_clicked" swapped="no"/>
                               </object>
                               <packing>
@@ -1203,10 +1230,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="padding">6</property>
-                        <property name="position">0</property>
+                        <property name="resize">False</property>
+                        <property name="shrink">False</property>
                       </packing>
                     </child>
                     <child>
@@ -1353,7 +1378,7 @@
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
                                             <property name="use_action_appearance">False</property>
-                                            <property name="image">image16</property>
+                                            <property name="image">image20</property>
                                             <signal name="clicked" handler="linphone_gtk_add_contact" swapped="no"/>
                                           </object>
                                           <packing>
@@ -1467,10 +1492,8 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="padding">6</property>
-                        <property name="position">1</property>
+                        <property name="resize">True</property>
+                        <property name="shrink">True</property>
                       </packing>
                     </child>
                   </object>
@@ -1529,13 +1552,6 @@
                             <property name="use_action_appearance">False</property>
                             <property name="relief">none</property>
                             <signal name="clicked" handler="on_proxy_refresh_button_clicked" swapped="no"/>
-                            <child>
-                              <object class="GtkImage" id="image20">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="stock">gtk-refresh</property>
-                              </object>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -1880,4 +1896,16 @@
     <property name="tooltip_text" translatable="yes">Delete</property>
     <property name="stock">gtk-remove</property>
   </object>
+  <object class="GtkImage" id="remove_image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">Delete</property>
+    <property name="stock">gtk-remove</property>
+  </object>
+  <object class="GtkImage" id="remove_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">Delete</property>
+    <property name="stock">gtk-remove</property>
+  </object>
 </interface>