diff --git a/data/glade/preferences_window.glade b/data/glade/preferences_window.glade
index c4e2ebea9..697d0e711 100644
--- a/data/glade/preferences_window.glade
+++ b/data/glade/preferences_window.glade
@@ -130,37 +130,61 @@
6
6
-
- 50
+
True
- Detached roster with detached chats
-Detached roster with single chat
-Single window for everything
-Detached roster with chat grouped by account
-Detached roster with chat grouped by type
-
+ 0
+ 1
+ _Window behavior:
+ True
+ one_window_type_combobox
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+
1
2
- 1
- 2
-
+
+ True
+ If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons
+
+
+ True
+ 0
+ 1
+ Emoticons:
+
+
+
+
+ GTK_FILL
+
+
+
+
True
- 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.
- _Highlight misspelled words
+ Hide all buttons in chat windows
+ _Make message windows compact
True
0
True
-
+
2
- 4
- 5
+ 2
+ 3
GTK_FILL
@@ -183,62 +207,38 @@ Detached roster with chat grouped by type
-
+
True
- Hide all buttons in chat windows
- _Make message windows compact
+ 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.
+ _Highlight misspelled words
True
0
True
-
+
2
- 2
- 3
+ 4
+ 5
GTK_FILL
-
+
+ 50
True
- If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons
-
-
- True
- 0
- 1
- Emoticons:
-
-
-
-
- GTK_FILL
-
-
-
-
- True
-
+ Detached roster with detached chats
+Detached roster with single chat
+Single window for everything
+Detached roster with chat grouped by account
+Detached roster with chat grouped by type
+
1
2
-
-
-
-
- True
- 0
- 1
- _Window behavior:
- True
- one_window_type_combobox
-
-
1
2
- GTK_FILL
@@ -478,51 +478,17 @@ Show only in roster
True
6
-
+
True
- 6
- True
-
-
- True
- True
- Play _sounds
- True
- 0
- True
-
-
-
-
-
- 5
-
-
- True
- _Player:
- True
- soundplayer_entry
-
-
-
-
- True
- True
-
-
-
- 1
-
-
-
-
- 1
-
-
+ True
+ Play _sounds
+ True
+ 0
+ True
+
False
- False
@@ -657,7 +623,7 @@ Show only in roster
6
6
-
+
True
All chat states
Composing only
@@ -666,23 +632,8 @@ Disabled
1
2
-
-
-
-
- True
- Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.
-
-
- True
- 0
- _Send chat state notifications:
- True
-
-
-
-
- GTK_FILL
+ 1
+ 2
@@ -705,7 +656,24 @@ Disabled
-
+
+ True
+ Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.
+
+
+ True
+ 0
+ _Send chat state notifications:
+ True
+
+
+
+
+ GTK_FILL
+
+
+
+
True
All chat states
Composing only
@@ -714,8 +682,6 @@ Disabled
1
2
- 1
- 2
@@ -759,89 +725,7 @@ Disabled
6
6
-
- True
- 0
- 1
- Allow others to see your:
- True
- one_window_type_combobox
-
-
- GTK_FILL
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Tune
- True
- 0
- True
-
-
-
- 2
- 3
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- 0
- 1
- Receive your contact's:
- True
- True
- one_window_type_combobox
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Tune
- True
- 0
- True
-
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Activity
- True
- 0
- True
-
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
+
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
@@ -849,11 +733,13 @@ Disabled
True
0
True
-
+
1
2
+ 1
+ 2
GTK_FILL
@@ -877,7 +763,7 @@ Disabled
-
+
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
@@ -885,16 +771,96 @@ Disabled
True
0
True
-
+
1
2
+ GTK_FILL
+
+
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Activity
+ True
+ 0
+ True
+
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Tune
+ True
+ 0
+ True
+
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ 1
+ Receive your contact's:
+ True
+ True
+ one_window_type_combobox
+
+
1
2
GTK_FILL
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Tune
+ True
+ 0
+ True
+
+
+
+ 2
+ 3
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ 1
+ Allow others to see your:
+ True
+ one_window_type_combobox
+
+
+ GTK_FILL
+
+
@@ -957,33 +923,90 @@ Disabled
12
6
-
+
True
True
- The auto not available status message. If empty, Gajim will not change the current status message
-
+ If checked, Gajim will change status to Away when the computer is unused.
+ _Away after:
+ True
+ 0
+ True
+
- 3
- 4
- 1
- 2
+ GTK_FILL
-
+
True
True
- The auto away status message. If empty, Gajim will not change the current status message
-
+ If checked, Gajim will change status to Not Available when the computer has not been used even longer
+ _Not available after:
+ True
+ 0
+ True
+
- 3
- 4
+ 1
+ 2
+ GTK_FILL
+
+
+ True
+ 0
+ minutes
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ minutes
+
+
+ 2
+ 3
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 1
+ 0
+
+
+ 50
+ True
+ True
+ 12 1 720 1 10 10
+ 1
+
+
+
+
+
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
True
@@ -1010,87 +1033,30 @@ Disabled
-
- True
- 1
- 0
-
-
- 50
- True
- True
- 12 1 720 1 10 10
- 1
-
-
-
-
-
- 1
- 2
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- 0
- minutes
-
-
- 2
- 3
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- 0
- minutes
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
+
True
True
- If checked, Gajim will change status to Not Available when the computer has not been used even longer
- _Not available after:
- True
- 0
- True
-
+ The auto away status message. If empty, Gajim will not change the current status message
+
- 1
- 2
- GTK_FILL
+ 3
+ 4
-
+
True
True
- If checked, Gajim will change status to Away when the computer is unused.
- _Away after:
- True
- 0
- True
-
+ The auto not available status message. If empty, Gajim will not change the current status message
+
- GTK_FILL
+ 3
+ 4
+ 1
+ 2
@@ -1250,46 +1216,6 @@ Disabled
-
-
- True
- True
- GTK_POLICY_NEVER
- GTK_POLICY_NEVER
- GTK_SHADOW_IN
-
-
- True
- True
- 3
- GTK_WRAP_WORD
-
-
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
-
-
- True
- True
- False
-
-
-
-
-
-
True
@@ -1328,6 +1254,46 @@ Disabled
GTK_FILL
+
+
+ True
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+
+
+ True
+ True
+ False
+
+
+
+
+
+
+
+
+ True
+ True
+ GTK_POLICY_NEVER
+ GTK_POLICY_NEVER
+ GTK_SHADOW_IN
+
+
+ True
+ True
+ 3
+ GTK_WRAP_WORD
+
+
+
+
+ 1
+ 2
+ GTK_FILL
+
+
@@ -1390,14 +1356,14 @@ Disabled
-
+
True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Chat message:
+ True
+ 0
- GTK_FILL
- GTK_FILL
+ 1
+ 2
@@ -1418,14 +1384,14 @@ Disabled
-
+
True
- True
- 0
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Chat message:
- 1
- 2
+ GTK_FILL
+ GTK_FILL
@@ -1475,18 +1441,62 @@ Disabled
-
+
True
- 0
- T_heme:
+ True
+ If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)
+ Use _transports icons
True
- theme_combobox
+ 0
+ True
+
+ 1
+ 3
+ 2
+ 3
+
+
+
+
+ True
+
+
+
+ 1
+ 2
+ 1
+ 2
GTK_FILL
GTK_FILL
+
+
+ True
+ 0
+ Status _iconset:
+ True
+ iconset_combobox
+
+
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+
+
+
+ 1
+ 2
+
+
True
@@ -1505,62 +1515,18 @@ Disabled
-
- True
-
-
-
- 1
- 2
-
-
-
-
+
True
0
- Status _iconset:
+ T_heme:
True
- iconset_combobox
+ theme_combobox
- 1
- 2
GTK_FILL
GTK_FILL
-
-
- True
-
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- True
- If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)
- Use _transports icons
- True
- 0
- True
-
-
-
- 1
- 3
- 2
- 3
-
-
@@ -1599,6 +1565,135 @@ Disabled
4
12
6
+
+
+ True
+ 0
+ _Incoming message:
+ True
+ GTK_JUSTIFY_CENTER
+ True
+ incoming_msg_colorbutton
+
+
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ True
+ True
+ True
+ 0
+
+
+
+ 1
+ 2
+
+
+
+
+
+
+ True
+ 0
+ _Outgoing message:
+ True
+ GTK_JUSTIFY_CENTER
+ True
+ outgoing_msg_colorbutton
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ 0
+
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ _Status message:
+ True
+ GTK_JUSTIFY_CENTER
+ True
+ status_msg_colorbutton
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ 0
+
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+
+ True
+ 0
+ _URL highlight:
+ True
+ url_msg_colorbutton
+
+
+ 2
+ 3
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ 0
+
+
+
+ 3
+ 4
+ 1
+ 2
+ GTK_FILL
+
+
+
True
@@ -1667,135 +1762,6 @@ Disabled
GTK_FILL
-
-
- True
- True
- 0
-
-
-
- 3
- 4
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- 0
- _URL highlight:
- True
- url_msg_colorbutton
-
-
- 2
- 3
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- True
- 0
-
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
- True
- 0
- _Status message:
- True
- GTK_JUSTIFY_CENTER
- True
- status_msg_colorbutton
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- True
- 0
-
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- 0
- _Outgoing message:
- True
- GTK_JUSTIFY_CENTER
- True
- outgoing_msg_colorbutton
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
- True
- True
- True
- True
- True
- 0
-
-
-
- 1
- 2
-
-
-
-
-
-
- True
- 0
- _Incoming message:
- True
- GTK_JUSTIFY_CENTER
- True
- incoming_msg_colorbutton
-
-
- GTK_FILL
-
-
-
@@ -1880,56 +1846,16 @@ Custom
12
6
-
- True
- 0
- _Browser:
- True
- custom_browser_entry
-
-
- GTK_FILL
-
-
-
-
-
- True
- 0
- _Mail client:
- True
- custom_mail_client_entry
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
+
True
True
-
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- True
-
+
1
2
+ 2
+ 3
@@ -1949,16 +1875,56 @@ Custom
-
+
True
True
-
+
1
2
- 2
- 3
+
+
+
+
+
+ True
+ True
+
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ 0
+ _Mail client:
+ True
+ custom_mail_client_entry
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ _Browser:
+ True
+ custom_browser_entry
+
+
+ GTK_FILL
@@ -2022,19 +1988,18 @@ Custom
6
6
-
+
True
True
- If checked, Gajim log GPG or E2E encrypted messages. However, when using E2E encryption the remote site has to agree on logging. If the other side has declined logging, your messages will NOT be logged.
- Log _encrypted chat session
+ If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster
+ _Ignore events from contacts not in the roster
True
0
True
-
+
- 2
- 3
+ GTK_FILL
@@ -2054,18 +2019,19 @@ Custom
-
+
True
True
- If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster
- _Ignore events from contacts not in the roster
+ If checked, Gajim log GPG or E2E encrypted messages. However, when using E2E encryption the remote site has to agree on logging. If the other side has declined logging, your messages will NOT be logged.
+ Log _encrypted chat session
True
0
True
-
+
- GTK_FILL
+ 2
+ 3
diff --git a/src/config.py b/src/config.py
index 43ede20f8..7c58705e7 100644
--- a/src/config.py
+++ b/src/config.py
@@ -298,27 +298,20 @@ class PreferencesWindow:
self.auto_popup_away_checkbutton.set_active(st)
# sounds
- if ((os.name == 'nt') or (sys.platform == 'darwin')):
- # if windows, player must not become visible on show_all
- soundplayer_hbox = self.xml.get_widget('soundplayer_hbox')
- soundplayer_hbox.set_no_show_all(True)
if gajim.config.get('sounds_on'):
self.xml.get_widget('play_sounds_checkbutton').set_active(True)
else:
- self.xml.get_widget('soundplayer_hbox').set_sensitive(False)
self.xml.get_widget('sounds_scrolledwindow').set_sensitive(False)
self.xml.get_widget('browse_sounds_hbox').set_sensitive(False)
# sound player
player = gajim.config.get('soundplayer')
- self.xml.get_widget('soundplayer_entry').set_text(player)
if player == '': # only on first time Gajim starts
commands = ('aplay', 'play', 'esdplay', 'artsplay')
for command in commands:
if helpers.is_in_path(command):
if command == 'aplay':
command += ' -q'
- self.xml.get_widget('soundplayer_entry').set_text(command)
gajim.config.set('soundplayer', command)
break
@@ -775,14 +768,9 @@ class PreferencesWindow:
def on_play_sounds_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'sounds_on',
- [self.xml.get_widget('soundplayer_hbox'),
- self.xml.get_widget('sounds_scrolledwindow'),
+ [self.xml.get_widget('sounds_scrolledwindow'),
self.xml.get_widget('browse_sounds_hbox')])
- def on_soundplayer_entry_changed(self, widget):
- gajim.config.set('soundplayer', widget.get_text().decode('utf-8'))
- gajim.interface.save_config()
-
def on_sounds_treemodel_row_changed(self, model, path, iter):
sound_event = model[iter][3].decode('utf-8')
gajim.config.set_per('soundevents', sound_event, 'enabled',