From a4c47e661ed9dc027ee26e14f10913d9b1f6b721 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 16 Apr 2005 23:15:03 +0000
Subject: [PATCH] update from trunk
---
src/chat.py | 2 +-
src/common/config.py | 3 +
src/common/connection.py | 13 +-
src/config.py | 41 +++-
src/gtkgui.glade | 392 ++++++++++++++++++++++++++++++++++++---
src/gtkgui.py | 21 +--
6 files changed, 429 insertions(+), 43 deletions(-)
diff --git a/src/chat.py b/src/chat.py
index 6d8b7e7ff..bb92ec156 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -49,7 +49,7 @@ class Chat:
self.nb_unread = {}
self.last_message_time = {}
self.print_time_timeout_id = {}
- self.names = {} # what is printed in the tab : user.name for example
+ self.names = {} # what is printed in the tab (eg. user.name)
self.childs = {}
self.window = self.xml.get_widget(widget_name)
self.widget_name = widget_name
diff --git a/src/common/config.py b/src/common/config.py
index 578e0ef9f..d8481ac8e 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -38,6 +38,9 @@ class Config:
'delroster': [ opt_bool, True ],
'alwaysauth': [ opt_bool, False ],
'autopopup': [ opt_bool, False ],
+ 'notify_on_online': [ opt_bool, True ],
+ 'notify_on_offline': [ opt_bool, False ],
+ 'notify_on_new_message': [ opt_bool, False ],
'autopopupaway': [ opt_bool, False ],
'ignore_unknown_contacts': [ opt_bool, False ],
'showoffline': [ opt_bool, False ],
diff --git a/src/common/connection.py b/src/common/connection.py
index 0cbb05e50..247003364 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -57,8 +57,17 @@ distro_info = {
}
def get_os_info():
- if os.name =='nt':
- return 'windows'
+ if os.name == 'nt':
+ win_version = {(1, 4, 0): '95',\
+ (1, 4, 10): '98',\
+ (1, 4, 90): 'ME',\
+ (2, 4, 0): 'NT',\
+ (2, 5, 0): '2000',\
+ (2, 5, 1): 'XP'
+ }[ os.sys.getwindowsversion()[3],\
+ os.sys.getwindowsversion()[0],\
+ os.sys.getwindowsversion()[1] ]
+ return 'Windows' + ' ' + win_version
elif os.name =='posix':
executable = 'lsb_release'
params = ' --id --codename --release --short'
diff --git a/src/config.py b/src/config.py
index 353a4f615..89f99736a 100644
--- a/src/config.py
+++ b/src/config.py
@@ -363,10 +363,24 @@ class Preferences_window:
else:
window.show_all()
- def on_auto_popup_checkbutton_toggled(self, widget):
+ def on_notify_on_new_message_radiobutton_toggled(self, widget):
+ self.on_checkbutton_toggled(widget, 'notify_on_new_message', \
+ [self.auto_popup_away_checkbutton])
+
+ def on_popup_new_message_radiobutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'autopopup', \
[self.auto_popup_away_checkbutton])
+ def on_only_in_roster_radiobutton_toggled(self, widget):
+ if widget.get_active():
+ self.auto_popup_away_checkbutton.set_sensitive(False)
+
+ def on_notify_on_online_checkbutton_toggled(self, widget):
+ self.on_checkbutton_toggled(widget, 'notify_on_online')
+
+ def on_notify_on_offline_checkbutton_toggled(self, widget):
+ self.on_checkbutton_toggled(widget, 'notify_on_offline')
+
def on_auto_popup_away_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'autopopupaway')
@@ -596,7 +610,14 @@ class Preferences_window:
self.window = self.xml.get_widget('preferences_window')
self.plugin = plugin
self.iconset_combobox = self.xml.get_widget('iconset_combobox')
- self.auto_popup_checkbutton = self.xml.get_widget('auto_popup_checkbutton')
+ self.notify_on_new_message_radiobutton = self.xml.get_widget \
+ ('notify_on_new_message_radiobutton')
+ self.popup_new_message_radiobutton = self.xml.get_widget \
+ ('popup_new_message_radiobutton')
+ self.notify_on_online_checkbutton = self.xml.get_widget \
+ ('notify_on_online_checkbutton')
+ self.notify_on_offline_checkbutton = self.xml.get_widget \
+ ('notify_on_offline_checkbutton')
self.auto_popup_away_checkbutton = self.xml.get_widget \
('auto_popup_away_checkbutton')
self.auto_away_checkbutton = self.xml.get_widget('auto_away_checkbutton')
@@ -728,15 +749,25 @@ class Preferences_window:
self.xml.get_widget('use_emoticons_checkbutton').set_active(st)
self.xml.get_widget('add_remove_emoticons_button').set_sensitive(st)
+ #notify on new message
+ st = gajim.config.get('notify_on_new_message')
+ self.notify_on_new_message_radiobutton.set_active(st)
+
#autopopup
st = gajim.config.get('autopopup')
- self.auto_popup_checkbutton.set_active(st)
+ self.notify_on_online_checkbutton.set_active(st)
+
+ #notify on online statuses
+ st = gajim.config.get('notify_on_online')
+ self.notify_on_online_checkbutton.set_active(st)
+
+ #notify on offline statuses
+ st = gajim.config.get('notify_on_offline')
+ self.notify_on_offline_checkbutton.set_active(st)
#autopopupaway
st = gajim.config.get('autopopupaway')
self.auto_popup_away_checkbutton.set_active(st)
- self.auto_popup_away_checkbutton.set_sensitive(gajim.config.get(\
- 'autopopup'))
#Ignore messages from unknown contacts
self.xml.get_widget('ignore_events_from_unknown_contacts_checkbutton').\
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index e23d5e39c..cb92d747b 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -4287,14 +4287,14 @@
<property name="spacing">5</property>
<child>
- <widget class="GtkFrame" id="frame25">
+ <widget class="GtkFrame" id="frame29">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkAlignment" id="alignment54">
+ <widget class="GtkAlignment" id="alignment58">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -4306,24 +4306,128 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkVBox" id="vbox64">
+ <widget class="GtkVBox" id="vbox67">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkCheckButton" id="auto_popup_checkbutton">
+ <widget class="GtkFrame" id="frame25">
+ <property name="border_width">2</property>
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">If checked, Gajim will automatically show the new received message in a new chat window or tab in an existing chat window. If not checked, Gajim will notify you for new message via popups in the bottom right of the screen</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Automatically _popup new message</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_auto_popup_checkbutton_toggled" last_modification_time="Wed, 06 Apr 2005 12:46:37 GMT"/>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment54">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox2949">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+
+ <child>
+ <widget class="GtkRadioButton" id="notify_on_new_message_radiobutton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Gajim will notify you for new message via a popup in the bottom right of the screen</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Notify me about it</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_notify_on_new_message_radiobutton_toggled" last_modification_time="Sat, 16 Apr 2005 11:10:09 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="popup_new_message_radiobutton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Gajim will automatically show the new received message in a new chat window or tab in an existing chat window</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Pop it up</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">notify_on_new_message_radiobutton</property>
+ <signal name="toggled" handler="on_popup_new_message_radiobutton_toggled" last_modification_time="Sat, 16 Apr 2005 10:32:05 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="only_in_roster_radiobutton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Gajim will only change the icon of the contact that sent the new message</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show only in _roster</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">notify_on_new_message_radiobutton</property>
+ <signal name="toggled" handler="on_only_in_roster_radiobutton_toggled" last_modification_time="Sat, 16 Apr 2005 11:24:29 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label233">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">When new chat nessage is received</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -4332,11 +4436,91 @@
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox2950">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+
+ <child>
+ <widget class="GtkLabel" id="label241">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Notify me about contacts going: </property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="notify_on_online_checkbutton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just went online</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Online</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_notify_on_online_checkbutton_toggled" last_modification_time="Sat, 16 Apr 2005 13:44:52 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="notify_on_offline_checkbutton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just went offline</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Of_fline</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_notify_on_offline_checkbutton_toggled" last_modification_time="Sat, 16 Apr 2005 13:44:48 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
<child>
<widget class="GtkCheckButton" id="auto_popup_away_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Allow automatically popup new message when _away/DND</property>
+ <property name="label" translatable="yes">Allow popup/notifications even when I'm _away/busy</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4357,9 +4541,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label233">
+ <widget class="GtkLabel" id="label240">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>When new chat nessage is received</b></property>
+ <property name="label" translatable="yes"><b>Notifications</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4390,7 +4574,7 @@
<widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Ignore events from contacts not in your roster</property>
+ <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4717,7 +4901,7 @@
<widget class="GtkCheckButton" id="auto_away_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Auto _away after</property>
+ <property name="label" translatable="yes">Auto _away after:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4740,7 +4924,7 @@
<widget class="GtkCheckButton" id="auto_xa_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Auto e_Xtended Away after</property>
+ <property name="label" translatable="yes">Auto e_Xtended Away after:</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -5621,7 +5805,7 @@ Custom</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<child>
<widget class="GtkAlignment" id="alignment56">
@@ -10049,7 +10233,7 @@ send a chat message to</property>
</widget>
<widget class="GtkWindow" id="add_remove_emoticons_window">
- <property name="border_width">5</property>
+ <property name="border_width">4</property>
<property name="width_request">300</property>
<property name="height_request">350</property>
<property name="title" translatable="yes">Add/Remove Emoticons</property>
@@ -10172,4 +10356,168 @@ send a chat message to</property>
</child>
</widget>
+<widget class="GtkDialog" id="new_version_available_dialog">
+ <property name="border_width">4</property>
+ <property name="width_request">490</property>
+ <property name="height_request">250</property>
+ <property name="title" translatable="yes">New version of Gajim available</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="has_separator">False</property>
+ <signal name="delete_event" handler="on_new_version_available_dialog_delete_event" last_modification_time="Thu, 14 Apr 2005 17:45:18 GMT"/>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox9">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area8">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="open_download_page_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="label" translatable="yes">Open Download Page</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_open_download_page_button_clicked" last_modification_time="Thu, 14 Apr 2005 17:51:56 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="information_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkFrame" id="frame28">
+ <property name="border_width">6</property>
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment57">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow34">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTextView" id="changes_textview">
+ <property name="visible">True</property>
+ <property name="editable">False</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">True</property>
+ <property name="justification">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="cursor_visible">False</property>
+ <property name="pixels_above_lines">0</property>
+ <property name="pixels_below_lines">0</property>
+ <property name="pixels_inside_wrap">0</property>
+ <property name="left_margin">0</property>
+ <property name="right_margin">0</property>
+ <property name="indent">0</property>
+ <property name="text" translatable="yes"></property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label239">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Changes in latest version</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
diff --git a/src/gtkgui.py b/src/gtkgui.py
index f215a3f96..f64812493 100644
--- a/src/gtkgui.py
+++ b/src/gtkgui.py
@@ -27,6 +27,7 @@ import os
import sre
from common import gajim
import common.sleepy
+import common.check_for_new_version
from common import i18n
i18n.init()
@@ -317,16 +318,8 @@ class interface:
'soundevents', 'contact_connected', 'enabled'):
self.play_sound('contact_connected')
if not self.windows[account]['chats'].has_key(jid) and \
- not self.queues[account].has_key(jid) and not gajim.config.get( \
- 'autopopup'):
- #FIXME:
- #DOES NOT ALWAYS WORK WHY?
- #I control nkour@lagaule in jabber
- # have nkour@lagaul in nkour@jabber.org
- #go online from psi in lagaule
- #gajim doesn't give a shit
- # WHY? same with offline
- # new message works
+ not self.queues[account].has_key(jid) and \
+ gajim.config.get('notify_on_online'):
instance = dialogs.Popup_window(self, 'Contact Online', jid, \
account)
self.roster.popup_windows.append(instance)
@@ -334,8 +327,8 @@ class interface:
'soundevents', 'contact_disconnected', 'enabled'):
self.play_sound('contact_disconnected')
if not self.windows[account]['chats'].has_key(jid) and \
- not self.queues[account].has_key(jid) and not gajim.config.get( \
- 'autopopup'):
+ not self.queues[account].has_key(jid) and \
+ gajim.config.get('notify_on_offline'):
instance = dialogs.Popup_window(self, 'Contact Offline', jid, \
account)
self.roster.popup_windows.append(instance)
@@ -359,7 +352,7 @@ class interface:
if not self.windows[account]['chats'].has_key(jid) and \
not self.queues[account].has_key(jid):
first = True
- if not gajim.config.get('autopopup'):
+ if gajim.config.get('notify_on_new_message'):
instance = dialogs.Popup_window(self, 'New Message', jid, account)
self.roster.popup_windows.append(instance)
self.roster.on_message(jid, array[1], array[2], account)
@@ -741,6 +734,8 @@ class interface:
if self.systray_capabilities:
self.show_systray()
+ common.check_for_new_version.Check_for_new_version_dialog(self)
+
self.init_regexp()
# get instances for windows/dialogs that will show_all()/hide()