changeset ec8c0c9e69bb in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ec8c0c9e69bb description: fix some windows
diffstat:
data/gui/preferences_window.ui | 590 +++++++++++++++++++++++++++++++++------- src/config.py | 25 +- 2 files changed, 490 insertions(+), 125 deletions(-)
diffs (truncated from 2605 to 300 lines):
diff -r 83bd227fa4f9 -r ec8c0c9e69bb data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Tue Jan 01 11:54:39 2013 +0100 +++ b/data/gui/preferences_window.ui Tue Jan 01 12:45:38 2013 +0100 @@ -1,18 +1,17 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <requires lib="gtk+" version="2.16"/> - <!-- interface-naming-policy toplevel-contextual --> + <!-- interface-requires gtk+ 3.0 --> <object class="GtkAdjustment" id="adjustment1"> - <property name="value">20</property> <property name="lower">1</property> <property name="upper">1440</property> + <property name="value">20</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustment2"> - <property name="value">12</property> <property name="lower">1</property> <property name="upper">720</property> + <property name="value">12</property> <property name="step_increment">1</property> <property name="page_increment">10</property> </object> @@ -149,58 +148,82 @@ </row> </data> </object> + <object class="GtkListStore" id="status_message_liststore"> + <columns> + <!-- column-name name --> + <column type="gchararray"/> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name activity --> + <column type="gchararray"/> + <!-- column-name sub_activity --> + <column type="gchararray"/> + <!-- column-name activity_text --> + <column type="gchararray"/> + <!-- column-name mood --> + <column type="gchararray"/> + <!-- column-name mood_text --> + <column type="gchararray"/> + </columns> + </object> <object class="GtkWindow" id="preferences_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Preferences</property> <property name="role">preferences</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_preferences_window_destroy"/> - <signal name="key_press_event" handler="on_preferences_window_key_press_event"/> + <signal name="destroy" handler="on_preferences_window_destroy" swapped="no"/> + <signal name="key-press-event" handler="on_preferences_window_key_press_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox13"> <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkNotebook" id="preferences_notebook"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="show_border">False</property> - <signal name="switch_page" handler="on_preferences_notebook_switch_page"/> + <signal name="switch-page" handler="on_preferences_notebook_switch_page" swapped="no"/> <child> <object class="GtkVBox" id="vbox41"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">12</property> - <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <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="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment1"> <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">6</property> <property name="left_padding">12</property> <child> <object class="GtkVBox" id="vbox1"> <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="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> <property name="label" translatable="yes">Display a_vatars of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -211,13 +234,16 @@ <child> <object class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton"> <property name="label" translatable="yes">Display status _messages of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -228,13 +254,16 @@ <child> <object class="GtkCheckButton" id="show_mood_in_roster_checkbutton"> <property name="label" translatable="yes">Display m_ood of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -245,13 +274,16 @@ <child> <object class="GtkCheckButton" id="show_activity_in_roster_checkbutton"> <property name="label" translatable="yes">Display _activity of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -262,13 +294,16 @@ <child> <object class="GtkCheckButton" id="show_tunes_in_roster_checkbutton"> <property name="label" translatable="yes">Display _tunes of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -279,14 +314,17 @@ <child> <object class="GtkCheckButton" id="show_location_in_roster_checkbutton"> <property name="label" translatable="yes">Display _location of contacts in roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_text" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -297,48 +335,62 @@ <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">Sort contacts by status</property> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> <property name="label" translatable="yes">in _roster</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> <property name="label" translatable="yes">in _group chats</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/> + <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled" swapped="no"/> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">6</property> </packing> </child> @@ -349,6 +401,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <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="label" translatable="yes"><b>Roster Appearance</b></property> <property name="use_markup">True</property> @@ -357,24 +410,28 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame2"> <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="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment2"> <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>
-
Yann Leboulanger