changeset 02568b3d4553 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=02568b3d4553 description: Add letters to dialpad in chat_control.ui. Fixes #7238

diffstat:

data/gui/chat_control.ui | 323 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 271 insertions(+), 52 deletions(-)

diffs (truncated from 1061 to 300 lines):

diff -r d7419a1c66f9 -r 02568b3d4553 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Thu Feb 14 20:26:50 2013 +0400 +++ b/data/gui/chat_control.ui Fri Feb 15 00:29:16 2013 +0400 @@ -1,7 +1,18 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy project-wide --> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="upper">110</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + <property name="page_size">10</property> + </object> <object class="GtkHBox" id="chat_control_hbox"> <property name="can_focus">True</property> <property name="spacing">1</property> @@ -9,26 +20,29 @@ <object class="GtkVBox" id="chat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="orientation">vertical</property> <property name="spacing">1</property> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="left_padding">3</property> <property name="right_padding">3</property> <child> <object class="GtkEventBox" id="banner_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox3004"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="ypad">5</property> <property name="stock">gtk-missing-image</property> </object> @@ -42,44 +56,54 @@ <child> <object class="GtkVBox" id="banner_vbox"> <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="border_width">5</property> - <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">&lt;span weight="heavy" size="large"&gt;Contact name&lt;/span&gt;</property> <property name="use_markup">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> - <signal name="populate_popup" handler="on_banner_label_populate_popup"/> + <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">4</property> <child> <object class="GtkImage" id="mood_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -92,6 +116,7 @@ </child> <child> <object class="GtkImage" id="activity_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -104,6 +129,7 @@ </child> <child> <object class="GtkImage" id="tune_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -117,9 +143,11 @@ <child> <object class="GtkEventBox" id="location_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="location_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -134,6 +162,7 @@ </child> <child> <object class="GtkImage" id="audio_banner_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -146,6 +175,7 @@ </child> <child> <object class="GtkImage" id="video_banner_image"> + <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -160,6 +190,7 @@ <object class="GtkAlignment" id="alignment3"> <property name="width_request">11</property> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <placeholder/> </child> @@ -180,10 +211,12 @@ <child> <object class="GtkEventBox" id="avatar_eventbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="visible_window">False</property> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> </child> @@ -208,37 +241,41 @@ <child> <object class="GtkVBox" id="vbox106"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <placeholder/> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkHBox" id="hbox"> <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> <child> <object class="GtkButton" id="authentication_button"> + <property name="use_action_appearance">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="lock_image"> + <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="stock">gtk-dialog-authentication</property> <property name="icon-size">1</property> @@ -247,6 +284,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -263,36 +301,45 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="actions_hbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkButton" id="emoticons_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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> <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="emoticons_button_image"> <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="stock">gtk-missing-image</property> <property name="icon-size">1</property> @@ -301,22 +348,26 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="formattings_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</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> <property name="tooltip_text" translatable="yes">Show a list of formattings</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="image10">