changeset c42677f32401 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=c42677f32401
description: add missin pref window changes. Fixes #7023
diffstat:
data/gui/preferences_window.ui | 560 ++++++++++++++++++++++++++++++++--------
1 files changed, 444 insertions(+), 116 deletions(-)
diffs (truncated from 2341 to 300 lines):
diff -r 60d50b443753 -r c42677f32401 data/gui/preferences_window.ui
--- a/data/gui/preferences_window.ui Thu Nov 10 20:37:48 2011 +0100
+++ b/data/gui/preferences_window.ui Thu Nov 10 20:39:24 2011 +0100
@@ -1,7 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="2.22"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <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="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>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name item -->
@@ -124,17 +137,29 @@
</row>
</data>
</object>
+ <object class="GtkListStore" id="liststore8">
+ <columns>
+ <!-- column-name item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">None</col>
+ </row>
+ </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"/>
- <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">
@@ -144,26 +169,28 @@
<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">
@@ -172,9 +199,10 @@
<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"/>
+ <signal name="toggled"
handler="on_show_avatars_in_roster_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -189,9 +217,10 @@
<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"/>
+ <signal name="toggled"
handler="on_show_status_msgs_in_roster_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -206,9 +235,10 @@
<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"/>
+ <signal name="toggled"
handler="on_show_mood_in_roster_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -223,9 +253,10 @@
<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"/>
+ <signal name="toggled"
handler="on_show_activity_in_roster_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -240,9 +271,10 @@
<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"/>
+ <signal name="toggled"
handler="on_show_tunes_in_roster_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -258,9 +290,10 @@
<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"/>
+ <signal name="toggled"
handler="on_show_location_in_roster_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -271,14 +304,17 @@
<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>
@@ -288,12 +324,14 @@
<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"/>
+ <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>
@@ -303,16 +341,21 @@
<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"/>
+ <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>
@@ -323,6 +366,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>
@@ -331,24 +375,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>
<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>
@@ -357,6 +405,7 @@
<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>
@@ -372,7 +421,8 @@
<child>
<object class="GtkComboBox"
id="emoticons_combobox">
<property name="visible">True</property>
- <signal name="changed"
handler="on_emoticons_combobox_changed"/>
+ <property name="can_focus">False</property>
+ <signal name="changed"
handler="on_emoticons_combobox_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -382,10 +432,12 @@
<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>
@@ -403,9 +455,10 @@
<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"/>
+ <signal name="toggled"
handler="on_compact_view_checkbutton_toggled" swapped="no"/>
</object>
<packing>
<property name="right_attach">2</property>
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
