diff --git a/data/glade/vcard_information_window.glade b/data/glade/vcard_information_window.glade index c1f3c7aec..942233b6a 100644 --- a/data/glade/vcard_information_window.glade +++ b/data/glade/vcard_information_window.glade @@ -43,80 +43,52 @@ 12 6 - + True - 1 - 0 - <b>Jabber ID:</b> - True - - - GTK_FILL - - - - - - True - 1 - 0 - <b>Resource:</b> - True - - - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - <b>Status:</b> - True + + + True + True + 0 + 0 + 5 + 5 + True + PANGO_ELLIPSIZE_END + + + 1 + 2 2 3 GTK_FILL - + GTK_FILL - + True - 1 + True + 0 0 - <b>Client:</b> - True - - - 3 - 4 - GTK_FILL - - - - - - True - 1 - 0 - <b>System:</b> - True + 5 + 5 + True + True + PANGO_ELLIPSIZE_END + 1 + 2 4 5 - GTK_FILL - + True True 0 @@ -124,10 +96,13 @@ 5 5 True + PANGO_ELLIPSIZE_END 1 2 + 3 + 4 @@ -156,7 +131,7 @@ - + True True 0 @@ -164,59 +139,84 @@ 5 5 True - PANGO_ELLIPSIZE_END 1 2 - 3 - 4 - + True - True - 0 + 1 0 - 5 - 5 - True - True - PANGO_ELLIPSIZE_END + <b>System:</b> + True - 1 - 2 4 5 + GTK_FILL - + True - - - True - True - 0 - 0 - 5 - 5 - True - PANGO_ELLIPSIZE_END - - + 1 + 0 + <b>Client:</b> + True + + + 3 + 4 + GTK_FILL + + + + + + True + 1 + 0 + <b>Status:</b> + True - 1 - 2 2 3 GTK_FILL - GTK_FILL + + + + + + True + 1 + 0 + <b>Resource:</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 1 + 0 + <b>Jabber ID:</b> + True + + + GTK_FILL + @@ -300,22 +300,30 @@ 12 6 - + True - False - - - True - 0 - 0 - 5 - 5 - - + 0 + 0 + <b>Ask:</b> + True - 1 - 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + <b>Subscription:</b> + True + + + GTK_FILL @@ -340,30 +348,22 @@ - + True - 0 - 0 - <b>Subscription:</b> - True + False + + + True + 0 + 0 + 5 + 5 + + - GTK_FILL - - - - - - True - 0 - 0 - <b>Ask:</b> - True - - - 2 - 3 - GTK_FILL + 1 + 2 @@ -417,490 +417,101 @@ - + True True - - - True - 6 - 3 - 4 - 12 - 6 - - - - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - 2 - 3 - - - - - - True - 1 - 0 - <b>Family:</b> - True - - - GTK_FILL - - - - - - True - 1 - 0 - <b>Middle:</b> - True - - - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - <b>Prefix:</b> - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - <b>Given:</b> - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - <b>Suffix:</b> - True - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - - - True - 0 - 0 - <b>Full Name</b> - True - - - label_item - - - - - 4 - 1 - 2 - - - - - - True - True - - - True - 6 - 3 - 4 - 5 - 5 - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - 2 - 3 - - - - - - True - 1 - 0 - <b>Street:</b> - True - - - GTK_FILL - - - - - - True - 1 - 0 - <b>City:</b> - True - - - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - <b>State:</b> - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - <b>Extra Address:</b> - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - <b>Postal Code:</b> - True - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - 0 - <b>Country:</b> - True - - - 2 - 3 - 2 - 3 - GTK_FILL - - - - - - - - True - 0 - 0 - <b>Address</b> - True - - - label_item - - - - - 4 - 2 - 3 - - - - - - True - 1 - 0 - <b>Homepage:</b> - True - - - 3 - 4 - - - - - - - True 0 0 - <b>Name:</b> - True - - - GTK_FILL - - - - - - True - 0 - 0 - <b>Nickname:</b> - True - - - 2 - 3 - GTK_FILL - - - - - - True - 1 - 0 - <b>Phone No.:</b> - True + 5 + 5 + True + 3 + 4 5 6 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 5 + 6 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 4 + 4 + 5 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + + + + + + True + 1 + <b>E-Mail:</b> + True + + + 4 + 5 GTK_FILL @@ -929,102 +540,491 @@ - + True 1 - <b>E-Mail:</b> + 0 + <b>Phone No.:</b> True - 4 - 5 + 5 + 6 GTK_FILL - + True - True 0 0 - 5 - 5 - True + <b>Nickname:</b> + True + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + <b>Name:</b> + True + + + GTK_FILL + + + + + + True + 1 + 0 + <b>Homepage:</b> + True + + + 3 + 4 + + + + + + + True + True + + + True + 6 + 3 + 4 + 5 + 5 + + + True + 0 + 0 + <b>Country:</b> + True + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + <b>Postal Code:</b> + True + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + <b>Extra Address:</b> + True + + + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + <b>State:</b> + True + + + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + <b>City:</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 1 + 0 + <b>Street:</b> + True + + + GTK_FILL + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + 2 + 3 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 2 + 3 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + + + + + + + + True + 0 + 0 + <b>Address</b> + True + + + label_item + + - 3 4 + 2 + 3 - + True True - 0 - 0 - 5 - 5 - True + + + True + 6 + 3 + 4 + 12 + 6 + + + + + + + + + True + 0 + 0 + <b>Suffix:</b> + True + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + + True + 0 + 0 + <b>Given:</b> + True + + + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + <b>Prefix:</b> + True + + + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + <b>Middle:</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 1 + 0 + <b>Family:</b> + True + + + GTK_FILL + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + 2 + 3 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 2 + 3 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + + + + + + + + True + 0 + 0 + <b>Full Name</b> + True + + + label_item + + - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 4 - 4 - 5 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 5 - 6 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - 5 - 6 + 1 + 2 @@ -1061,88 +1061,110 @@ - + True - True - 0 + 1 0 - 5 - 5 - True + <b>Phone No.:</b> + True - 1 - 2 + 4 + 5 + GTK_FILL - + True - True - 0 + 1 0 - 5 - 5 - True + <b>E-Mail:</b> + True - 3 - 4 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 4 3 4 + GTK_FILL + + + + + + True + 0 + 0 + <b>Role:</b> + True + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + 0 + <b>Department:</b> + True + + + 2 + 3 + GTK_FILL + + + + + + True + 1 + 0 + <b>Position:</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 1 + 0 + <b>Company:</b> + True + + + GTK_FILL + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 4 + 5 @@ -1159,164 +1181,18 @@ 5 5 - + True - True 0 0 - 5 - 5 - True - - - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - 1 - 2 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - 0 - 0 - 5 - 5 - True - - - 3 - 4 - 2 - 3 - - - - - - True - 1 - 0 - <b>Street:</b> + <b>Country:</b> True - - GTK_FILL - - - - - - True - 1 - 0 - <b>City:</b> - True - - - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - <b>State:</b> - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - <b>Extra Address:</b> - True - True - 2 3 + 2 + 3 GTK_FILL @@ -1339,22 +1215,168 @@ - + True 0 0 - <b>Country:</b> + <b>Extra Address:</b> True + True 2 3 + GTK_FILL + + + + + + True + 1 + 0 + <b>State:</b> + True + + 2 3 GTK_FILL + + + True + 1 + 0 + <b>City:</b> + True + + + 1 + 2 + GTK_FILL + + + + + + True + 1 + 0 + <b>Street:</b> + True + + + GTK_FILL + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + 2 + 3 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 2 + 3 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 3 + 4 + + + + + + True + True + 0 + 0 + 5 + 5 + True + + + 1 + 2 + + + @@ -1378,7 +1400,7 @@ - + True True 0 @@ -1389,99 +1411,81 @@ 1 - 2 - 4 - 5 - - - - - - True - 1 - 0 - <b>Company:</b> - True - - - GTK_FILL - - - - - - True - 1 - 0 - <b>Position:</b> - True - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - 0 - <b>Department:</b> - True - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - <b>Role:</b> - True - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 1 - 0 - <b>E-Mail:</b> - True - - + 4 3 4 - GTK_FILL - + True - 1 + True + 0 0 - <b>Phone No.:</b> - True + 5 + 5 + True + PANGO_ELLIPSIZE_END - 4 - 5 - GTK_FILL + 3 + 4 + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + PANGO_ELLIPSIZE_END + + + 1 + 2 + 1 + 2 + + + + + + True + True + 0 + 0 + 5 + 5 + True + PANGO_ELLIPSIZE_END + + + 3 + 4 + + + + + + True + True + 0 + 0 + 5 + 5 + True + PANGO_ELLIPSIZE_END + + + 1 + 2 diff --git a/src/common/connection.py b/src/common/connection.py index a685fd787..0ce9ea976 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -792,9 +792,9 @@ class Connection(ConnectionHandlers): return iq def activate_privacy_rule(self, name): + '''activate a privacy rule''' if not self.connection: return - '''activate a privacy rule''' iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '') iq.getTag('query').setTag('active', {'name': name}) self.connection.send(iq) diff --git a/src/vcard.py b/src/vcard.py index 66ed3b66d..ea7800b11 100644 --- a/src/vcard.py +++ b/src/vcard.py @@ -305,11 +305,11 @@ class VcardWindow: subscription_label = self.xml.get_widget('subscription_label') ask_label = self.xml.get_widget('ask_label') if self.gc_contact: - self.xml.get_widget('subscription_title_label').set_text(_("Role:")) + self.xml.get_widget('subscription_title_label').set_markup(_("Role:")) uf_role = helpers.get_uf_role(self.gc_contact.role) subscription_label.set_text(uf_role) - self.xml.get_widget('ask_title_label').set_text(_("Affiliation:")) + self.xml.get_widget('ask_title_label').set_markup(_("Affiliation:")) uf_affiliation = helpers.get_uf_affiliation(self.gc_contact.affiliation) ask_label.set_text(uf_affiliation) else: @@ -330,8 +330,10 @@ class VcardWindow: ask_label.set_text(uf_ask) eb = self.xml.get_widget('ask_label_eventbox') if self.contact.ask == 'subscribe': - tooltips.set_tip(eb, - _("You are waiting contact's answer about your subscription request")) + tt_text = _("You are waiting contact's answer about your subscription request") + else: + tt_text = _("There is no pending subscription request.") + tooltips.set_tip(eb, tt_text) resources = '%s (%s)' % (self.contact.resource, unicode( self.contact.priority))