diff --git a/data/glade/advanced_notifications_window.glade b/data/glade/advanced_notifications_window.glade
index f526dbcf7..f37f02bb8 100644
--- a/data/glade/advanced_notifications_window.glade
+++ b/data/glade/advanced_notifications_window.glade
@@ -368,12 +368,15 @@
True
- First Message Received
-Next Message Received
+ Receive a Message
Contact Connected
Contact Disconnected
+Contact Change Status
Group Chat Message Highlight
-Group Chat Message Received
+Group Chat Message Received
+File Transfert Resquest
+File Transfert Started
+File Transfert Finished
0
@@ -419,8 +422,8 @@ Group Chat Message Received
True
- contact
-group
+ contact(s)
+group(s)
everybody
@@ -638,6 +641,101 @@ everybody
True
+
+
+
+ True
+ False
+ 0
+
+
+
+ True
+ And I
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ True
+ Have
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ True
+ Don't have
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ a window/tab opened with that contact
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
0
@@ -1098,11 +1196,64 @@ everybody
+
+
+ True
+ False
+ 0
+
+
+
+ True
+ True
+ _Show event in roster
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ True
+ _Disable showing event in roster
+ True
+ GTK_RELIEF_NORMAL
+ True
+ False
+ False
+ True
+
+
+
+ 0
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
+
True
True
- _Activate Windows manager UrgencyHint to make taskbar to flash
+ _Activate Windows manager UrgencyHint to make chat taskbar to flash
True
GTK_RELIEF_NORMAL
True
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a0833cc18..6ff3e6668 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,6 +11,7 @@ data/glade/accounts_window.glade
data/glade/add_new_contact_window.glade
data/glade/advanced_configuration_window.glade
data/glade/advanced_menuitem_menu.glade
+data/glade/advanced_notifications_window.glade
data/glade/change_password_dialog.glade
data/glade/change_status_message_dialog.glade
data/glade/chat_context_menu.glade
diff --git a/src/dialogs.py b/src/dialogs.py
index 80f9b1d03..71cd4f0f1 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1752,6 +1752,11 @@ class AdvancedNotificationsWindow:
self.disable_auto_open_cb = self.xml.get_widget('disable_auto_open_cb')
self.use_systray_cb = self.xml.get_widget('use_systray_cb')
self.disable_systray_cb = self.xml.get_widget('disable_systray_cb')
+ self.use_roster_cb = self.xml.get_widget('use_roster_cb')
+ self.disable_roster_cb = self.xml.get_widget('disable_roster_cb')
+
+ self.tab_opened_cb = self.xml.get_widget('tab_opened_cb')
+ self.not_tab_opened_cb = self.xml.get_widget('not_tab_opened_cb')
model = gtk.ListStore(str)
model.clear()
@@ -1782,7 +1787,10 @@ class AdvancedNotificationsWindow:
# Deal with status line
self.all_status_rb.set_active(True)
self.on_status_radiobutton_toggled(self.all_status_rb)
- self.recipient_type_combobox.set_active(0)
+
+ self.recipient_type_combobox.set_active(0) # 'Contact(s)'
+ self.not_tab_opened_cb.set_active(True)
+ self.tab_opened_cb.set_active(True)
def on_status_radiobutton_toggled(self, widget):
if self.all_status_rb.get_active():
@@ -1814,8 +1822,16 @@ class AdvancedNotificationsWindow:
self.recipient_list.hide()
else:
self.recipient_list.show()
+
+ # tab_opened OR (not xor) not_tab_opened must be active
+ def on_tab_opened_cb_toggled(self, widget):
+ if not self.tab_opened_cb.get_active() and not self.not_tab_opened_cb.get_active():
+ self.not_tab_opened_cb.set_active(True)
+ def on_not_tab_opened_cb_toggled(self, widget):
+ if not self.tab_opened_cb.get_active() and not self.not_tab_opened_cb.get_active():
+ self.tab_opened_cb.set_active(True)
- # 8 next functions : Forbid two incompatible actions to be checked together
+ # 10 next functions : Forbid two incompatible actions to be checked together
def on_use_sound_cb_toggled(self, widget):
if self.use_sound_cb.get_active() and self.disable_sound_cb.get_active():
self.disable_sound_cb.set_active(False)
@@ -1842,6 +1858,12 @@ class AdvancedNotificationsWindow:
def on_disable_systray_cb_toggled(self, widget):
if self.use_systray_cb.get_active() and self.disable_systray_cb.get_active():
self.use_systray_cb.set_active(False)
+ def on_use_roster_cb_toggled(self, widget):
+ if self.use_roster_cb.get_active() and self.disable_roster_cb.get_active():
+ self.disable_roster_cb.set_active(False)
+ def on_disable_roster_cb_toggled(self, widget):
+ if self.use_roster_cb.get_active() and self.disable_roster_cb.get_active():
+ self.use_roster_cb.set_active(False)
def on_close_window(self, widget):
self.window.destroy()