changeset 1cf0e5dfbb96 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=1cf0e5dfbb96
description: do not require gtk+ v 2.22 in glade file. Fixes #7058
diffstat:
data/gui/preferences_window.ui | 456 +++++++---------------------------------
1 files changed, 84 insertions(+), 372 deletions(-)
diffs (truncated from 2256 to 300 lines):
diff -r 455ef83aece5 -r 1cf0e5dfbb96 data/gui/preferences_window.ui
--- a/data/gui/preferences_window.ui Tue Dec 06 19:11:34 2011 +0100
+++ b/data/gui/preferences_window.ui Tue Dec 06 22:10:45 2011 +0300
@@ -1,17 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<interface>
- <requires lib="gtk+" version="2.22"/>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
<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,17 +150,15 @@
</data>
</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"
swapped="no"/>
- <signal name="key-press-event"
handler="on_preferences_window_key_press_event" swapped="no"/>
+ <signal name="destroy" handler="on_preferences_window_destroy"/>
+ <signal name="key_press_event"
handler="on_preferences_window_key_press_event"/>
<child>
<object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkNotebook" id="preferences_notebook">
@@ -169,27 +168,23 @@
<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="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="spacing">6</property>
<child>
@@ -199,10 +194,9 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_show_avatars_in_roster_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_show_avatars_in_roster_checkbutton_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -217,10 +211,9 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_show_status_msgs_in_roster_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_show_status_msgs_in_roster_checkbutton_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -235,10 +228,9 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_show_mood_in_roster_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_show_mood_in_roster_checkbutton_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -253,10 +245,9 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_show_activity_in_roster_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_show_activity_in_roster_checkbutton_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -271,10 +262,9 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_show_tunes_in_roster_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_show_tunes_in_roster_checkbutton_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -290,10 +280,9 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_show_location_in_roster_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_show_location_in_roster_checkbutton_toggled"/>
</object>
<packing>
<property name="expand">False</property>
@@ -304,17 +293,14 @@
<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>
@@ -324,14 +310,12 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_sort_by_show_in_roster_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_sort_by_show_in_roster_checkbutton_toggled"/>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -341,21 +325,16 @@
<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="draw_indicator">True</property>
- <signal name="toggled"
handler="on_sort_by_show_in_muc_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_sort_by_show_in_muc_checkbutton_toggled"/>
</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>
@@ -366,7 +345,6 @@
<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>
@@ -375,28 +353,24 @@
</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>
<property name="border_width">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table1">
<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="n_rows">6</property>
<property name="n_columns">2</property>
@@ -405,7 +379,6 @@
<child>
<object class="GtkLabel" id="label379">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">1</property>
<property name="label"
translatable="yes">_Window behavior:</property>
@@ -421,8 +394,7 @@
<child>
<object class="GtkComboBox"
id="emoticons_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <signal name="changed"
handler="on_emoticons_combobox_changed" swapped="no"/>
+ <signal name="changed"
handler="on_emoticons_combobox_changed"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -432,12 +404,10 @@
<child>
<object class="GtkEventBox" id="eventbox5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)'
with equivalent animated or static graphical emoticons</property>
<child>
<object class="GtkLabel" id="label381">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">1</property>
<property name="label"
translatable="yes">_Emoticons:</property>
@@ -455,10 +425,9 @@
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Hide all buttons in chat windows</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_compact_view_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_compact_view_checkbutton_toggled"/>
</object>
<packing>
<property name="right_attach">2</property>
@@ -474,10 +443,9 @@
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Some messages may include rich content (formatting, colors
etc). If checked, Gajim will just display the raw message text.</property>
- <property
name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_xhtml_checkbutton_toggled" swapped="no"/>
+ <signal name="toggled"
handler="on_xhtml_checkbutton_toggled"/>
</object>
<packing>
<property name="right_attach">2</property>
@@ -492,10 +460,9 @@
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">If checked, Gajim will highlight spelling errors in input
fields of chat windows. If no language is explicitly set via right click on the
input field, the default language will be used for this contact or group
chat.</property>
- <property
name="use_action_appearance">False</property>
_______________________________________________
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
