changeset 8f0e9dc13ff5 in /home/hg/repos/gajim
branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8f0e9dc13ff5 description: coding style
diffstat:
data/gui/chat_control.ui | 2 +- data/gui/groupchat_control.ui | 82 +++++++++++++++++++++++++++++++++++++----- src/chat_control.py | 5 +-- src/groupchat_control.py | 4 +- 4 files changed, 75 insertions(+), 18 deletions(-)
diffs (truncated from 457 to 300 lines):
diff -r ef07d9da7329 -r 8f0e9dc13ff5 data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sun Mar 17 00:36:39 2013 +0400 +++ b/data/gui/chat_control.ui Sun Mar 17 22:33:51 2013 +0400 @@ -560,7 +560,7 @@ <property name="relief">none</property> <property name="focus_on_click">False</property> <child> - <object class="GtkImage" id="image5"> + <object class="GtkImage" id="history_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> diff -r ef07d9da7329 -r 8f0e9dc13ff5 data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Sun Mar 17 00:36:39 2013 +0400 +++ b/data/gui/groupchat_control.ui Sun Mar 17 22:33:51 2013 +0400 @@ -1,29 +1,31 @@ -<?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="GtkHBox" id="groupchat_control_hbox"> <property name="can_focus">True</property> <child> <object class="GtkVBox" id="groupchat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> - <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="bottom_padding">1</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="hbox3024"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkImage" id="gc_banner_status_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> </object> <packing> @@ -36,34 +38,42 @@ <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"><span weight="heavy" size="large">room jid</span></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> </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> @@ -85,12 +95,12 @@ <property name="border_width">3</property> <property name="position">495</property> <property name="position_set">True</property> - <signal name="notify" handler="on_hpaned_notify"/> + <signal name="notify" handler="on_hpaned_notify" swapped="no"/> <child> <object class="GtkVBox" id="gc_textviews_vbox"> <property name="width_request">0</property> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> @@ -98,14 +108,14 @@ <property name="height_request">60</property> <property name="visible">True</property> <property name="can_focus">True</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> @@ -122,6 +132,7 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -137,7 +148,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="list_treeview"> @@ -145,6 +155,9 @@ <property name="can_focus">True</property> <property name="border_width">1</property> <property name="headers_visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -155,27 +168,34 @@ </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="GtkHBox" id="hbox3023"> <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> <child> <object class="GtkImage" id="emoticons_button_image"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-missing-image</property> <property name="icon-size">1</property> </object> @@ -190,22 +210,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="image11"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="stock">gtk-bold</property> <property name="icon-size">1</property> </object> @@ -213,31 +237,37 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkVSeparator" id="vseparator2"> <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> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkButton" id="change_nick_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">Change your nickname (Ctrl+N)</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image4"> <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-edit</property> <property name="icon-size">1</property> @@ -252,16 +282,19 @@ </child> <child> <object class="GtkButton" id="change_subject_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">Change the room's subject (Alt+T)</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image6"> <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-properties</property> <property name="icon-size">1</property> @@ -276,6 +309,7 @@ </child> <child> <object class="GtkButton" id="bookmark_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> @@ -283,10 +317,12 @@ <property name="no_show_all">True</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">Bookmark this room (Ctrl+B)</property> + <property name="use_action_appearance">False</property> <property name="relief">none</property> <child> <object class="GtkImage" id="image7"> <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-add</property> <property name="icon-size">1</property> @@ -301,16 +337,19 @@ </child> <child> <object class="GtkButton" id="history_button"> + <property name="use_action_appearance">False</property> <property name="visible">True</property>