diff --git a/data/glade/change_activity_dialog.glade b/data/glade/change_activity_dialog.glade
index 7665916fd..c75019dfa 100644
--- a/data/glade/change_activity_dialog.glade
+++ b/data/glade/change_activity_dialog.glade
@@ -1,158 +1,141 @@
-
-
-
+
+
+
-
-
- 6
-
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 270
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
-
- True
- False
- 6
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
-
- True
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
-
- 0
- False
- False
- GTK_PACK_END
-
-
-
-
-
- True
- 0
- 0.5
- GTK_SHADOW_NONE
-
-
-
- True
- 0.5
- 0.5
- 1
- 1
- 0
- 0
- 12
- 0
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- False
- True
-
-
- 0
- False
- False
-
-
-
-
-
- True
- False
- True
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- ●
- False
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
+
+ 6
+ Set Activity
+ 270
+ GDK_WINDOW_TYPE_HINT_DIALOG
+
+
+
+ True
+ 6
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 3
+ 2
+ 6
+ 6
+
+
+ True
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ ●
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ General:
+
+
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Specific:
+
+
+ 1
+ 2
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Message:
+
+
+ 2
+ 3
+ GTK_FILL
+ GTK_FILL
+
+
+
+
+ 2
+
+
+
+
+ True
+ GTK_BUTTONBOX_END
+
+
+ True
+ True
+ True
+ gtk-cancel
+ True
+ -6
+
+
+
+
+
+ True
+ True
+ True
+ True
+ gtk-ok
+ True
+ -5
+
+
+
+ 1
+
+
+
+
+ False
+ False
+ GTK_PACK_END
+
+
+
+
+
diff --git a/data/glade/change_mood_dialog.glade b/data/glade/change_mood_dialog.glade
index 47122c872..cebb1ea25 100644
--- a/data/glade/change_mood_dialog.glade
+++ b/data/glade/change_mood_dialog.glade
@@ -1,145 +1,112 @@
-
-
-
+
+
+
-
-
- 6
-
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- 270
- True
- False
- True
- False
- False
- GDK_WINDOW_TYPE_HINT_DIALOG
- GDK_GRAVITY_NORTH_WEST
- True
- False
- True
-
-
-
-
- True
- False
- 6
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
-
- True
- True
- True
- gtk-cancel
- True
- GTK_RELIEF_NORMAL
- True
- -6
-
-
-
-
-
-
- True
- True
- True
- True
- gtk-ok
- True
- GTK_RELIEF_NORMAL
- True
- -5
-
-
-
-
-
- 0
- False
- False
- GTK_PACK_END
-
-
-
-
-
- True
- 0
- 0.5
- GTK_SHADOW_NONE
-
-
-
- True
- 0.5
- 0.5
- 1
- 1
- 0
- 0
- 12
- 0
-
-
-
- 6
- True
- False
- 6
-
-
-
- True
- False
- True
-
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- True
- True
- 0
-
- True
- ●
- False
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
- 0
- True
- True
-
-
-
-
-
-
+
+ 6
+ 270
+ GDK_WINDOW_TYPE_HINT_DIALOG
+
+
+
+ True
+ 6
+
+
+ True
+ 2
+ 2
+ 6
+ 6
+
+
+ True
+ True
+ ●
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ Type:
+
+
+
+
+
+
+
+
+ True
+ Message:
+
+
+ 1
+ 2
+
+
+
+
+
+
+ 2
+
+
+
+
+ True
+ GTK_BUTTONBOX_END
+
+
+ True
+ True
+ True
+ gtk-cancel
+ True
+ -6
+
+
+
+
+
+ True
+ True
+ True
+ True
+ gtk-ok
+ True
+ -5
+
+
+
+ 1
+
+
+
+
+ False
+ False
+ GTK_PACK_END
+
+
+
+
+
diff --git a/data/glade/manage_pep_services_window.glade b/data/glade/manage_pep_services_window.glade
index 8d9fd5bfd..ff3002455 100644
--- a/data/glade/manage_pep_services_window.glade
+++ b/data/glade/manage_pep_services_window.glade
@@ -4,6 +4,7 @@
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ PEP Service Configuration
350
150
@@ -16,6 +17,7 @@
True
GTK_POLICY_AUTOMATIC
GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
True
diff --git a/src/config.py b/src/config.py
index d75116208..be4180a69 100644
--- a/src/config.py
+++ b/src/config.py
@@ -3746,4 +3746,6 @@ class ManagePEPServicesWindow:
our_jid = gajim.get_jid_from_account(self.account)
gajim.connections[self.account].send_pb_configure(our_jid, node, form)
window = dialogs.DataFormWindow(form, (on_ok, node))
+ title = "Configure %s" % node
+ window.set_title(title)
window.show_all()
diff --git a/src/dialogs.py b/src/dialogs.py
index e4012e15b..a69e14cd3 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -9,7 +9,7 @@
## Copyright (C) 2005 Norman Rasmussen
## Copyright (C) 2007 Lukas Petrovicky
## Julien Pivotto
-## Stephan Erb
+## Copyright (C) 2007-2008 Stephan Erb
##
## This file is part of Gajim.
##
@@ -372,9 +372,9 @@ class ChooseGPGKeyDialog:
class ChangeActivityDialog:
activities = [_('doing_chores'), _('drinking'), _('eating'),
- _('excercising'), _('grooming'), _('having_appointment'),
- _('inactive'), _('relaxing'), _('talking'), _('traveling'),
- _('working'), ]
+ _('excercising'), _('grooming'), _('having_appointment'),
+ _('inactive'), _('relaxing'), _('talking'), _('traveling'),
+ _('working'), ]
subactivities = [_('at_the_spa'), _('brushing_teeth'),
_('buying_groceries'), _('cleaning'), _('coding'),
_('commuting'), _('cooking'), _('cycling'), _('day_off'),
@@ -401,31 +401,30 @@ class ChangeActivityDialog:
self.xml = gtkgui_helpers.get_glade('change_activity_dialog.glade')
self.window = self.xml.get_widget('change_activity_dialog')
self.window.set_transient_for(gajim.interface.roster.window)
- self.window.set_title(_('Activity'))
- self.entry = self.xml.get_widget('entry')
+ self.entry = self.xml.get_widget('description_entry')
- self.combo1 = self.xml.get_widget('combobox1')
+ self.activity_combo = self.xml.get_widget('activity_combobox')
self.liststore1 = gtk.ListStore(str)
- self.combo1.set_model(self.liststore1)
+ self.activity_combo.set_model(self.liststore1)
for activity in self.activities:
self.liststore1.append((activity,))
cellrenderertext = gtk.CellRendererText()
- self.combo1.pack_start(cellrenderertext, True)
- self.combo1.add_attribute(cellrenderertext, 'text', 0)
+ self.activity_combo.pack_start(cellrenderertext, True)
+ self.activity_combo.add_attribute(cellrenderertext, 'text', 0)
- self.combo2 = self.xml.get_widget('combobox2')
+ self.subactivity_combo = self.xml.get_widget('subactivity_combobox')
self.liststore2 = gtk.ListStore(str)
- self.combo2.set_model(self.liststore2)
+ self.subactivity_combo.set_model(self.liststore2)
for subactivity in self.subactivities:
self.liststore2.append((subactivity,))
cellrenderertext = gtk.CellRendererText()
- self.combo2.pack_start(cellrenderertext, True)
- self.combo2.add_attribute(cellrenderertext, 'text', 0)
+ self.subactivity_combo.pack_start(cellrenderertext, True)
+ self.subactivity_combo.add_attribute(cellrenderertext, 'text', 0)
self.xml.signal_autoconnect(self)
self.window.show_all()
@@ -435,8 +434,8 @@ class ChangeActivityDialog:
activity = None
subactivity = None
message = None
- active1 = self.combo1.get_active()
- active2 = self.combo2.get_active()
+ active1 = self.activity_combo.get_active()
+ active2 = self.subactivity_combo.get_active()
if active1 > -1:
activity = self.liststore1[active1][0].decode('utf-8')
if active2 > -1:
@@ -451,17 +450,29 @@ class ChangeActivityDialog:
self.window.destroy()
class ChangeMoodDialog:
- moods = [_('afraid'), _('amazed'), _('angry'), _('annoyed'), _('anxious'), _('aroused'), _('ashamed'), _('bored'), _('brave'), _('calm'), _('cold'), _('confused'), _('contented'), _('cranky'), _('curious'), _('depressed'), _('disappointed'), _('disgusted'), _('distracted'), _('embarrassed'), _('excited'), _('flirtatious'), _('frustrated'), _('grumpy'), _('guilty'), _('happy'), _('hot'), _('humbled'), _('humiliated'), _('hungry'), _('hurt'), _('impressed'), _('in_awe'), _('in_love'), _('indignant'), _('interested'), _('intoxicated'), _('invincible'), _('jealous'), _('lonely'), _('mean'), _('moody'), _('nervous'), _('neutral'), _('offended'), _('playful'), _('proud'), _('relieved'), _('remorseful'), _('restless'), _('sad'), _('sarcastic'), _('serious'), _('shocked'), _('shy'), _('sick'), _('sleepy'), _('stressed'), _('surprised'), _('thirsty'), _('worried')]
+ moods = [_('afraid'), _('amazed'), _('angry'), _('annoyed'), _('anxious'),
+ _('aroused'), _('ashamed'), _('bored'), _('brave'), _('calm'),
+ _('cold'), _('confused'), _('contented'), _('cranky'), _('curious'),
+ _('depressed'), _('disappointed'), _('disgusted'), _('distracted'),
+ _('embarrassed'), _('excited'), _('flirtatious'), _('frustrated'),
+ _('grumpy'), _('guilty'), _('happy'), _('hot'), _('humbled'),
+ _('humiliated'), _('hungry'), _('hurt'), _('impressed'), _('in_awe'),
+ _('in_love'), _('indignant'), _('interested'), _('intoxicated'),
+ _('invincible'), _('jealous'), _('lonely'), _('mean'), _('moody'),
+ _('nervous'), _('neutral'), _('offended'), _('playful'), _('proud'),
+ _('relieved'), _('remorseful'), _('restless'), _('sad'), _('sarcastic'),
+ _('serious'), _('shocked'), _('shy'), _('sick'), _('sleepy'),
+ _('stressed'), _('surprised'), _('thirsty'), _('worried')]
def __init__(self, account):
self.account = account
self.xml = gtkgui_helpers.get_glade('change_mood_dialog.glade')
self.window = self.xml.get_widget('change_mood_dialog')
self.window.set_transient_for(gajim.interface.roster.window)
- self.window.set_title(_('Mood'))
+ self.window.set_title(_('Set Mood'))
- self.entry = self.xml.get_widget('entry')
+ self.entry = self.xml.get_widget('description_entry')
- self.combo = self.xml.get_widget('combobox')
+ self.combo = self.xml.get_widget('type_combobox')
self.liststore = gtk.ListStore(str)
self.combo.set_model(self.liststore)
diff --git a/src/roster_window.py b/src/roster_window.py
index d966a4c3d..10b63ea33 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -7,7 +7,7 @@
## Copyright (C) 2005-2006 Dimitur Kirov
## Copyright (C) 2007 Lukas Petrovicky
## Copyright (C) 2007 Julien Pivotto
-## Copyright (C) 2007 Stephan Erb
+## Copyright (C) 2007-2008 Stephan Erb
##
## This file is part of Gajim.
##
@@ -3033,21 +3033,35 @@ class RosterWindow:
pep_menuitem = xml.get_widget('pep_menuitem')
if gajim.connections[account].pep_supported:
+ have_mood = gajim.config.get('publish_mood')
+ have_activity = gajim.config.get('publish_activity')
+ have_tune = gajim.config.get('publish_tune')
pep_submenu = gtk.Menu()
pep_menuitem.set_submenu(pep_submenu)
- if gajim.config.get('publish_mood'):
+ if have_mood:
item = gtk.MenuItem(_('Mood'))
pep_submenu.append(item)
item.connect('activate', self.on_change_mood_activate, account)
- if gajim.config.get('publish_activity'):
+ if have_activity:
item = gtk.MenuItem(_('Activity'))
pep_submenu.append(item)
item.connect('activate', self.on_change_activity_activate,
account)
- item = gtk.MenuItem(_('Configure...'))
- pep_submenu.append(item)
- item.connect('activate', self.on_pep_services_menuitem_activate,
+
+ pep_config = gtk.ImageMenuItem(_('Configure Services...'))
+ if have_mood or have_activity or have_tune:
+ item = gtk.SeparatorMenuItem()
+ pep_submenu.append(item)
+ pep_config.set_sensitive(True)
+ else:
+ pep_config.set_sensitive(False)
+ pep_submenu.append(pep_config)
+ pep_config.connect('activate', self.on_pep_services_menuitem_activate,
account)
+ img = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES,
+ gtk.ICON_SIZE_MENU)
+ pep_config.set_image(img)
+
else:
pep_menuitem.set_sensitive(False)