Commits February 2008

commits@gajim.org

5 participants
62 discussions

[commit-gajim] r9347 - trunk/data/glade
by asterix＠gajim.org 29 Feb '08

29 Feb '08

Author: asterix Date: 2008-02-29 23:34:52 +0100 (Fri, 29 Feb 2008) New Revision: 9347 Modified: trunk/data/glade/manage_pep_services_window.glade Log: remove add and remove buttons from pep window Modified: trunk/data/glade/manage_pep_services_window.glade =================================================================== --- trunk/data/glade/manage_pep_services_window.glade 2008-02-29 22:23:39 UTC (rev 9346) +++ trunk/data/glade/manage_pep_services_window.glade 2008-02-29 22:34:52 UTC (rev 9347) @@ -29,34 +29,8 @@ <widget class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="spacing">6</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> <child> - <widget class="GtkButton" id="add_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="response_id">-5</property> - <signal name="clicked" handler="on_add_button_clicked"/> - </widget> - </child> - <child> - <widget class="GtkButton" id="delete_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="label">gtk-delete</property> - <property name="use_stock">True</property> - <property name="response_id">-5</property> - <signal name="clicked" handler="on_delete_button_clicked"/> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> <widget class="GtkButton" id="configure_button"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -89,9 +63,6 @@ </widget> </child> </widget> - <packing> - <property name="position">2</property> - </packing> </child> <child> <widget class="GtkButton" id="close_button"> @@ -104,7 +75,7 @@ <signal name="clicked" handler="on_close_button_clicked"/> </widget> <packing> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> </widget>

1 0

[commit-gajim] r9346 - in trunk: data/glade src
by asterix＠gajim.org 29 Feb '08

29 Feb '08

Author: asterix Date: 2008-02-29 23:23:39 +0100 (Fri, 29 Feb 2008) New Revision: 9346 Modified: trunk/data/glade/roster_window.glade trunk/src/roster_window.py Log: move configuration of pubsub menuitem to account context menu Modified: trunk/data/glade/roster_window.glade =================================================================== --- trunk/data/glade/roster_window.glade 2008-02-28 18:53:49 UTC (rev 9345) +++ trunk/data/glade/roster_window.glade 2008-02-29 22:23:39 UTC (rev 9346) @@ -193,14 +193,6 @@ </child> </widget> </child> - <child> - <widget class="GtkMenuItem" id="pep_services_menuitem"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">_Services</property> - <property name="use_underline">True</property> - </widget> - </child> </widget> </child> </widget> Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-28 18:53:49 UTC (rev 9345) +++ trunk/src/roster_window.py 2008-02-29 22:23:39 UTC (rev 9346) @@ -941,11 +941,7 @@ service_disco_menuitem = self.xml.get_widget('service_disco_menuitem') advanced_menuitem = self.xml.get_widget('advanced_menuitem') profile_avatar_menuitem = self.xml.get_widget('profile_avatar_menuitem') - pep_services_menuitem = self.xml.get_widget('pep_services_menuitem') - if not gajim.config.get('use_pep'): - pep_services_menuitem.set_no_show_all(True) - pep_services_menuitem.hide() # destroy old advanced menus for m in self.advanced_menus: m.destroy() @@ -968,11 +964,6 @@ self.new_chat_menuitem_handler_id) self.new_chat_menuitem_handler_id = None - if self.pep_services_menuitem_handler_id: - pep_services_menuitem.handler_disconnect( - self.pep_services_menuitem_handler_id) - self.pep_services_menuitem_handler_id = None - if self.single_message_menuitem_handler_id: single_message_menuitem.handler_disconnect( self.single_message_menuitem_handler_id) @@ -991,7 +982,6 @@ new_chat_menuitem.remove_submenu() advanced_menuitem.remove_submenu() profile_avatar_menuitem.remove_submenu() - pep_services_menuitem.remove_submenu() # remove the existing accelerator if self.have_new_chat_accel: @@ -1150,15 +1140,7 @@ if len(connected_accounts_with_vcard) > 1: # 2 or more accounts? make submenus profile_avatar_sub_menu = gtk.Menu() - pep_services_sub_menu = gtk.Menu() for account in connected_accounts_with_vcard: - if gajim.connections[account].pep_supported: - # PEP services - pep_services_item = gtk.MenuItem(_('of account %s') % account, - False) - pep_services_sub_menu.append(pep_services_item) - pep_services_item.connect('activate', - self.on_pep_services_menuitem_activate, account) # profile, avatar profile_avatar_item = gtk.MenuItem(_('of account %s') % account, False) @@ -1167,8 +1149,6 @@ self.on_profile_avatar_menuitem_activate, account) profile_avatar_menuitem.set_submenu(profile_avatar_sub_menu) profile_avatar_sub_menu.show_all() - pep_services_menuitem.set_submenu(pep_services_sub_menu) - pep_services_sub_menu.show_all() elif len(connected_accounts_with_vcard) == 1: # user has only one account account = connected_accounts_with_vcard[0] # profile, avatar @@ -1176,18 +1156,11 @@ self.profile_avatar_menuitem_handler_id = \ profile_avatar_menuitem.connect('activate', self.on_profile_avatar_menuitem_activate, account) - # PEP services - if not self.pep_services_menuitem_handler_id: - self.pep_services_menuitem_handler_id = \ - pep_services_menuitem.connect('activate', - self.on_pep_services_menuitem_activate, account) if len(connected_accounts_with_vcard) == 0: profile_avatar_menuitem.set_sensitive(False) - pep_services_menuitem.set_sensitive(False) else: profile_avatar_menuitem.set_sensitive(True) - pep_services_menuitem.set_sensitive(True) # Advanced Actions if len(gajim.connections) == 0: # user has no accounts @@ -3052,14 +3025,18 @@ pep_submenu = gtk.Menu() pep_menuitem.set_submenu(pep_submenu) if gajim.config.get('publish_mood'): - item = gtk.MenuItem('Mood') + item = gtk.MenuItem(_('Mood')) pep_submenu.append(item) item.connect('activate', self.on_change_mood_activate, account) if gajim.config.get('publish_activity'): - item = gtk.MenuItem('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, + account) else: pep_menuitem.set_no_show_all(True) pep_menuitem.hide() @@ -5427,7 +5404,6 @@ self.new_chat_menuitem_handler_id = False self.single_message_menuitem_handler_id = False self.profile_avatar_menuitem_handler_id = False - self.pep_services_menuitem_handler_id = False self.actions_menu_needs_rebuild = True self.regroup = gajim.config.get('mergeaccounts') self.clicked_path = None # Used remember on wich row we clicked

1 0

[commit-gajim] r9345 - in trunk: data/glade src
by steve-e＠gajim.org 28 Feb '08

28 Feb '08

Author: steve-e Date: 2008-02-28 19:53:49 +0100 (Thu, 28 Feb 2008) New Revision: 9345 Modified: trunk/data/glade/profile_window.glade trunk/data/glade/vcard_information_window.glade trunk/src/vcard.py Log: Alignement and bold typing changes in vcard and profile window. Nothing as usual. Modified: trunk/data/glade/profile_window.glade =================================================================== --- trunk/data/glade/profile_window.glade 2008-02-27 21:33:50 UTC (rev 9344) +++ trunk/data/glade/profile_window.glade 2008-02-28 18:53:49 UTC (rev 9345) @@ -9,7 +9,6 @@ <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="spacing">12</property> <child> <widget class="GtkNotebook" id="information_notebook"> <property name="visible">True</property> @@ -23,305 +22,105 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHBox" id="hbox3"> - <property name="visible">True</property> - <child> - <widget class="GtkButton" id="PHOTO_button"> - <property name="can_focus">True</property> - <property name="response_id">0</property> - <signal name="button_press_event" handler="on_PHOTO_button_press_event"/> - <child> - <widget class="GtkEventBox" id="PHOTO_eventbox3"> - <property name="visible">True</property> - <property name="visible_window">False</property> - <child> - <widget class="GtkImage" id="PHOTO_image"> - <property name="visible">True</property> - <property name="yalign">0</property> - <property name="stock">gtk-missing-image</property> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="NOPHOTO_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Click to set your avatar</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <signal name="button_press_event" handler="on_PHOTO_button_press_event"/> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options"></property> - <property name="y_options">GTK_EXPAND</property> - </packing> + <placeholder/> </child> <child> - <widget class="GtkLabel" id="label58"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Avatar:</property> - </widget> - <packing> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> + <placeholder/> </child> <child> - <widget class="GtkLabel" id="label57"> + <widget class="GtkEntry" id="FN_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">E-Mail:</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEventBox" id="eventbox1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> - <child> - <widget class="GtkLabel" id="label13"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Birthday:</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label23"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Phone No.:</property> - </widget> - <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Nickname:</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Name:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="TEL_HOME_NUMBER_entry"> - <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="URL_entry"> + <widget class="GtkEntry" id="EMAIL_HOME_USERID_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label22"> + <widget class="GtkExpander" id="expander1"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Homepage:</property> - </widget> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="BDAY_entry"> - <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander2"> - <property name="visible">True</property> - <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table_ADR_STREET"> + <widget class="GtkTable" id="table3"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> <property name="n_columns">4</property> - <property name="column_spacing">5</property> - <property name="row_spacing">5</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Country:</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> + <placeholder/> </child> <child> - <widget class="GtkLabel" id="label26"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Postal Code:</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> + <placeholder/> </child> <child> - <widget class="GtkLabel" id="label29"> + <widget class="GtkEntry" id="N_FAMILY_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Extra Address:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label27"> + <widget class="GtkEntry" id="N_GIVEN_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">State:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label28"> + <widget class="GtkEntry" id="N_MIDDLE_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">City:</property> + <property name="can_focus">True</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label31"> + <widget class="GtkEntry" id="N_PREFIX_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Street:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_CTRY_entry"> + <widget class="GtkEntry" id="N_SUFFIX_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">3</property> @@ -332,79 +131,90 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_REGION_entry"> + <widget class="GtkLabel" id="label18"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Family Name">Family:</property> + <property name="use_markup">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_PCODE_entry"> + <widget class="GtkLabel" id="label16"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Middle Name">Middle:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_LOCALITY_entry"> + <widget class="GtkLabel" id="label15"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Prefix in Name">Prefix:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_EXTADR_entry"> + <widget class="GtkLabel" id="label17"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Given Name">Given:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_HOME_STREET_entry"> + <widget class="GtkLabel" id="label14"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Suffix in Name">Suffix:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> </widget> </child> <child> - <widget class="GtkLabel" id="label30"> + <widget class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Address</property> + <property name="label" translatable="yes">Full Name</property> + <property name="use_markup">True</property> </widget> <packing> <property name="type">label_item</property> @@ -413,8 +223,8 @@ </widget> <packing> <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -422,7 +232,6 @@ <widget class="GtkEntry" id="NICKNAME_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">3</property> @@ -431,11 +240,11 @@ </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <widget class="GtkExpander" id="expander2"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table3"> + <widget class="GtkTable" id="table_ADR_STREET"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> @@ -443,75 +252,86 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <placeholder/> + <widget class="GtkEntry" id="ADR_HOME_STREET_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> </child> <child> - <placeholder/> + <widget class="GtkEntry" id="ADR_HOME_EXTADR_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="y_options"></property> + </packing> </child> <child> - <widget class="GtkLabel" id="label14"> + <widget class="GtkEntry" id="ADR_HOME_LOCALITY_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Suffix in Name">Suffix:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label17"> + <widget class="GtkEntry" id="ADR_HOME_PCODE_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Given Name">Given:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label15"> + <widget class="GtkEntry" id="ADR_HOME_REGION_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Prefix in Name">Prefix:</property> + <property name="can_focus">True</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label16"> + <widget class="GtkEntry" id="ADR_HOME_CTRY_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Middle Name">Middle:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <widget class="GtkLabel" id="label31"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Family Name">Family:</property> + <property name="label" translatable="yes">Street:</property> + <property name="use_markup">True</property> </widget> <packing> <property name="x_options">GTK_FILL</property> @@ -519,79 +339,93 @@ </packing> </child> <child> - <widget class="GtkEntry" id="N_SUFFIX_entry"> + <widget class="GtkLabel" id="label28"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">City:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="N_PREFIX_entry"> + <widget class="GtkLabel" id="label27"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">State:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="N_MIDDLE_entry"> + <widget class="GtkLabel" id="label29"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Extra Address:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="N_GIVEN_entry"> + <widget class="GtkLabel" id="label26"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Postal Code:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="N_FAMILY_entry"> + <widget class="GtkLabel" id="label25"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Country:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> </widget> </child> <child> - <widget class="GtkLabel" id="label19"> + <widget class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Full Name</property> + <property name="label" translatable="yes">Address</property> + <property name="use_markup">True</property> </widget> <packing> <property name="type">label_item</property> @@ -600,41 +434,218 @@ </widget> <packing> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="EMAIL_HOME_USERID_entry"> + <widget class="GtkEntry" id="BDAY_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Homepage:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="URL_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="FN_entry"> + <widget class="GtkEntry" id="TEL_HOME_NUMBER_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="y_options"></property> </packing> </child> + <child> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Name:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Nickname:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Phone No.:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> + <child> + <widget class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Birthday:</property> + <property name="use_markup">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label57"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">E-Mail:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label58"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Avatar:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <child> + <widget class="GtkButton" id="PHOTO_button"> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="response_id">0</property> + <signal name="button_press_event" handler="on_PHOTO_button_press_event"/> + <child> + <widget class="GtkEventBox" id="PHOTO_eventbox3"> + <property name="visible">True</property> + <property name="visible_window">False</property> + <child> + <widget class="GtkImage" id="PHOTO_image"> + <property name="visible">True</property> + <property name="yalign">0</property> + <property name="stock">gtk-missing-image</property> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="NOPHOTO_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">Click to set your avatar</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="response_id">0</property> + <signal name="button_press_event" handler="on_PHOTO_button_press_event"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </widget> - <packing> - <property name="tab_expand">False</property> - </packing> </child> <child> <widget class="GtkLabel" id="label4"> @@ -645,14 +656,13 @@ </widget> <packing> <property name="type">tab</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> <child> <widget class="GtkTable" id="table5"> <property name="visible">True</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="n_rows">5</property> <property name="n_columns">4</property> <property name="column_spacing">12</property> @@ -664,100 +674,63 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label33"> + <widget class="GtkEntry" id="ORG_ORGNAME_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Phone No.:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label32"> + <widget class="GtkEntry" id="ORG_ORGUNIT_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">E-Mail:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label41"> + <widget class="GtkEntry" id="TITLE_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Role:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label43"> + <widget class="GtkEntry" id="ROLE_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Department:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label42"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Position:</property> - </widget> - <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label44"> + <widget class="GtkEntry" id="EMAIL_WORK_USERID_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Company:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEntry" id="TEL_WORK_NUMBER_entry"> - <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -771,88 +744,89 @@ <property name="border_width">6</property> <property name="n_rows">3</property> <property name="n_columns">4</property> - <property name="column_spacing">5</property> - <property name="row_spacing">5</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label34"> + <widget class="GtkEntry" id="ADR_WORK_STREET_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Country:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label35"> + <widget class="GtkEntry" id="ADR_WORK_EXTADR_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Postal Code:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="ADR_WORK_LOCALITY_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label38"> + <widget class="GtkEntry" id="ADR_WORK_PCODE_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Extra Address:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label36"> + <widget class="GtkEntry" id="ADR_WORK_REGION_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">State:</property> + <property name="can_focus">True</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label37"> + <widget class="GtkEntry" id="ADR_WORK_CTRY_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">City:</property> + <property name="can_focus">True</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> <widget class="GtkLabel" id="label39"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Street:</property> + <property name="label" translatable="yes">Street:</property> + <property name="use_markup">True</property> </widget> <packing> <property name="x_options">GTK_FILL</property> @@ -860,93 +834,93 @@ </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_CTRY_entry"> + <widget class="GtkLabel" id="label37"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">City:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_REGION_entry"> + <widget class="GtkLabel" id="label36"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">State:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_PCODE_entry"> + <widget class="GtkLabel" id="label38"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Extra Address:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_LOCALITY_entry"> + <widget class="GtkLabel" id="label35"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Postal Code:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ADR_WORK_EXTADR_entry"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Country:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> - <child> - <widget class="GtkEntry" id="ADR_WORK_STREET_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> </widget> </child> <child> <widget class="GtkLabel" id="label40"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Address</property> + <property name="label" translatable="yes">Address</property> + <property name="use_markup">True</property> </widget> <packing> <property name="type">label_item</property> @@ -961,75 +935,111 @@ </packing> </child> <child> - <widget class="GtkEntry" id="EMAIL_WORK_USERID_entry"> + <widget class="GtkEntry" id="TEL_WORK_NUMBER_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ROLE_entry"> + <widget class="GtkLabel" id="label44"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Company:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label42"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Position:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="TITLE_entry"> + <widget class="GtkLabel" id="label43"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Department:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label41"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Role:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ORG_ORGUNIT_entry"> + <widget class="GtkLabel" id="label32"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">E-Mail:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="ORG_ORGNAME_entry"> + <widget class="GtkLabel" id="label33"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">*</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Phone No.:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> </widget> <packing> <property name="position">1</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1042,7 +1052,6 @@ <packing> <property name="type">tab</property> <property name="position">1</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1065,7 +1074,6 @@ </widget> <packing> <property name="position">2</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1078,7 +1086,6 @@ <packing> <property name="type">tab</property> <property name="position">2</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> Modified: trunk/data/glade/vcard_information_window.glade =================================================================== --- trunk/data/glade/vcard_information_window.glade 2008-02-27 21:33:50 UTC (rev 9344) +++ trunk/data/glade/vcard_information_window.glade 2008-02-28 18:53:49 UTC (rev 9345) @@ -43,51 +43,80 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEventBox" id="status_label_eventbox"> + <widget class="GtkLabel" id="label51"> <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> - </child> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Jabber ID:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label53"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Resource:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label54"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Status:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="os_label"> + <widget class="GtkLabel" id="label55"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="wrap">True</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Client:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label56"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">System:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="client_name_version_label"> + <widget class="GtkLabel" id="jid_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -95,13 +124,10 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -130,7 +156,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="jid_label"> + <widget class="GtkLabel" id="client_name_version_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -138,81 +164,61 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label56"> + <widget class="GtkLabel" id="os_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">OS:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label55"> + <widget class="GtkEventBox" id="status_label_eventbox"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Client:</property> + <child> + <widget class="GtkLabel" id="status_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + </widget> + </child> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label54"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Status:</property> - </widget> - <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options">GTK_FILL</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label53"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Resource:</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label51"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Jabber ID:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> </widget> </child> <child> @@ -222,6 +228,7 @@ <child> <widget class="GtkLabel" id="user_avatar_label"> <property name="no_show_all">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">User avatar:</property> </widget> <packing> @@ -251,6 +258,7 @@ <child> <widget class="GtkLabel" id="custom_avatar_label"> <property name="no_show_all">True</property> + <property name="xalign">0</property> <property name="label" translatable="yes">Configured avatar:</property> </widget> <packing> @@ -292,32 +300,26 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="ask_title_label"> + <widget class="GtkEventBox" id="subscription_label_eventbox"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Given Name">Ask:</property> + <property name="visible_window">False</property> + <child> + <widget class="GtkLabel" id="subscription_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="subscription_title_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Family Name">Subscription:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> <widget class="GtkEventBox" id="ask_label_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> @@ -338,25 +340,33 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="subscription_label_eventbox"> + <widget class="GtkLabel" id="subscription_title_label"> <property name="visible">True</property> - <property name="visible_window">False</property> - <child> - <widget class="GtkLabel" id="subscription_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Family Name">Subscription:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> + <child> + <widget class="GtkLabel" id="ask_title_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Given Name">Ask:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> </widget> </child> <child> @@ -407,280 +417,93 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="BDAY_label"> + <widget class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="TEL_HOME_NUMBER_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="EMAIL_HOME_USERID_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="FN_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="NICKNAME_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label57"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">E-Mail:</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEventBox" id="eventbox1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> <child> - <widget class="GtkLabel" id="label13"> + <widget class="GtkTable" id="table3"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Birthday:</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label23"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Phone No.:</property> - </widget> - <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Nickname:</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Name:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Homepage:</property> - </widget> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <widget class="GtkTable" id="table_ADR_STREET"> - <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> <property name="n_columns">4</property> - <property name="column_spacing">5</property> - <property name="row_spacing">5</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label25"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Country:</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> + <placeholder/> </child> <child> - <widget class="GtkLabel" id="label26"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Postal Code:</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> + <placeholder/> </child> <child> - <widget class="GtkLabel" id="label29"> + <widget class="GtkLabel" id="N_FAMILY_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Extra Address:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label27"> + <widget class="GtkLabel" id="N_GIVEN_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">State:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label28"> + <widget class="GtkLabel" id="N_MIDDLE_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">City:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label31"> + <widget class="GtkLabel" id="N_PREFIX_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Street:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_CTRY_label"> + <widget class="GtkLabel" id="N_SUFFIX_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -698,99 +521,89 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_REGION_label"> + <widget class="GtkLabel" id="label18"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes" comments="Family Name">Family:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_PCODE_label"> + <widget class="GtkLabel" id="label16"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes" comments="Middle Name">Middle:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_LOCALITY_label"> + <widget class="GtkLabel" id="label15"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes" comments="Prefix in Name">Prefix:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_EXTADR_label"> + <widget class="GtkLabel" id="label17"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes" comments="Given Name">Given:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_STREET_label"> + <widget class="GtkLabel" id="label14"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes" comments="Suffix in Name">Suffix:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> </widget> </child> <child> - <widget class="GtkLabel" id="label30"> + <widget class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Address</property> + <property name="label" translatable="yes">Full Name</property> + <property name="use_markup">True</property> </widget> <packing> <property name="type">label_item</property> @@ -799,101 +612,111 @@ </widget> <packing> <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkExpander" id="expander1"> + <widget class="GtkExpander" id="expander2"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTable" id="table3"> + <widget class="GtkTable" id="table_ADR_STREET"> <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> <property name="n_columns">4</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> + <property name="column_spacing">5</property> + <property name="row_spacing">5</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkLabel" id="label14"> + <widget class="GtkLabel" id="ADR_HOME_STREET_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Suffix in Name">Suffix:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label17"> + <widget class="GtkLabel" id="ADR_HOME_EXTADR_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Given Name">Given:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label15"> + <widget class="GtkLabel" id="ADR_HOME_LOCALITY_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Prefix in Name">Prefix:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label16"> + <widget class="GtkLabel" id="ADR_HOME_PCODE_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Middle Name">Middle:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <widget class="GtkLabel" id="ADR_HOME_REGION_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Family Name">Family:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="N_SUFFIX_label"> + <widget class="GtkLabel" id="ADR_HOME_CTRY_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -911,81 +734,106 @@ </packing> </child> <child> - <widget class="GtkLabel" id="N_PREFIX_label"> + <widget class="GtkLabel" id="label31"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Street:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">City:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label27"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">State:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="N_MIDDLE_label"> + <widget class="GtkLabel" id="label29"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Extra Address:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="N_GIVEN_label"> + <widget class="GtkLabel" id="label26"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Postal Code:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="N_FAMILY_label"> + <widget class="GtkLabel" id="label25"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Country:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> </widget> </child> <child> - <widget class="GtkLabel" id="label19"> + <widget class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Full Name</property> + <property name="label" translatable="yes">Address</property> + <property name="use_markup">True</property> </widget> <packing> <property name="type">label_item</property> @@ -994,11 +842,192 @@ </widget> <packing> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Homepage:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Name:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Nickname:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Phone No.:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> + <child> + <widget class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Birthday:</property> + <property name="use_markup">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label57"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">E-Mail:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="NICKNAME_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="FN_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="EMAIL_HOME_USERID_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="TEL_HOME_NUMBER_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="BDAY_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="position">1</property> @@ -1032,92 +1061,76 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label33"> + <widget class="GtkLabel" id="ORG_ORGNAME_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Phone No.:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label32"> + <widget class="GtkLabel" id="ORG_ORGUNIT_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">E-Mail:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label41"> + <widget class="GtkLabel" id="TITLE_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Role:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label43"> + <widget class="GtkLabel" id="ROLE_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Department:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label42"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Position:</property> - </widget> - <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label44"> + <widget class="GtkLabel" id="EMAIL_WORK_USERID_label"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Company:</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="TEL_WORK_NUMBER_label"> - <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> @@ -1127,9 +1140,9 @@ </widget> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -1146,88 +1159,88 @@ <property name="column_spacing">5</property> <property name="row_spacing">5</property> <child> - <widget class="GtkLabel" id="label34"> + <widget class="GtkLabel" id="ADR_WORK_STREET_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Country:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label35"> + <widget class="GtkLabel" id="ADR_WORK_EXTADR_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Postal Code:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label38"> + <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Extra Address:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label36"> + <widget class="GtkLabel" id="ADR_WORK_PCODE_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">State:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label37"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">City:</property> - </widget> - <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label39"> + <widget class="GtkLabel" id="ADR_WORK_REGION_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Street:</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> @@ -1250,88 +1263,95 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_REGION_label"> + <widget class="GtkLabel" id="label39"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Street:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_PCODE_label"> + <widget class="GtkLabel" id="label37"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">City:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label"> + <widget class="GtkLabel" id="label36"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">State:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label38"> + <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Extra Address:</property> + <property name="use_markup">True</property> + <property name="single_line_mode">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_EXTADR_label"> + <widget class="GtkLabel" id="label35"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Postal Code:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_STREET_label"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Country:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1342,7 +1362,8 @@ <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Address</property> + <property name="label" translatable="yes">Address</property> + <property name="use_markup">True</property> </widget> <packing> <property name="type">label_item</property> @@ -1357,7 +1378,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="EMAIL_WORK_USERID_label"> + <widget class="GtkLabel" id="TEL_WORK_NUMBER_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1368,77 +1389,99 @@ </widget> <packing> <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ROLE_label"> + <widget class="GtkLabel" id="label44"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Company:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label42"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Position:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="TITLE_label"> + <widget class="GtkLabel" id="label43"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Department:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label41"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Role:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ORG_ORGUNIT_label"> + <widget class="GtkLabel" id="label32"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">E-Mail:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ORG_ORGNAME_label"> + <widget class="GtkLabel" id="label33"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Phone No.:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2008-02-27 21:33:50 UTC (rev 9344) +++ trunk/src/vcard.py 2008-02-28 18:53:49 UTC (rev 9345) @@ -166,8 +166,10 @@ if value and entry_name == 'URL_label': if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0): widget = gtk.LinkButton(value, value) + widget.set_alignment(0, 0) else: widget = gtk.Label(value) + widget.set_alignment(0, 0) widget.set_selectable(True) widget.show() table = self.xml.get_widget('personal_info_table') @@ -448,9 +450,11 @@ if value and entry_name == 'URL_label': if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0): widget = gtk.LinkButton(value, value) + widget.set_alignment(0, 0) else: widget = gtk.Label(value) widget.set_selectable(True) + widget.set_alignment(0, 0) table = self.xml.get_widget('personal_info_table') table.attach(widget, 1, 4, 3, 4, yoptions = 0) else:

1 0

[commit-gajim] r9344 - trunk/src
by asterix＠gajim.org 27 Feb '08

27 Feb '08

Author: asterix Date: 2008-02-27 22:33:50 +0100 (Wed, 27 Feb 2008) New Revision: 9344 Modified: trunk/src/chat_control.py trunk/src/notify.py Log: don't always show events in systray when notify_on_all_muc_mesages is False Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-27 18:25:42 UTC (rev 9343) +++ trunk/src/chat_control.py 2008-02-27 21:33:50 UTC (rev 9344) @@ -685,7 +685,7 @@ show_in_roster = notify.get_show_in_roster(event, self.account, self.contact) show_in_systray = notify.get_show_in_systray(event, - self.account, self.contact) + self.account, self.contact, type_) event = gajim.events.create_event(type_, None, show_in_roster = show_in_roster, show_in_systray = show_in_systray) Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-02-27 18:25:42 UTC (rev 9343) +++ trunk/src/notify.py 2008-02-27 21:33:50 UTC (rev 9344) @@ -70,7 +70,7 @@ return False return True -def get_show_in_systray(event, account, contact): +def get_show_in_systray(event, account, contact, type_=None): '''Return True if this event must be shown in systray, else False''' num = get_advanced_notification(event, account, contact) if num != None: @@ -78,6 +78,10 @@ return True if gajim.config.get_per('notifications', str(num), 'systray') == 'no': return False + if type_ == 'printed_gc_msg' and not gajim.config.get( + 'notify_on_all_muc_messages'): + # it's not an highlighted message, don't show in systray + return False return gajim.config.get('trayicon_notification_on_events') def get_advanced_notification(event, account, contact):

1 0

[commit-gajim] r9343 - trunk/src
by asterix＠gajim.org 27 Feb '08

27 Feb '08

Author: asterix Date: 2008-02-27 19:25:42 +0100 (Wed, 27 Feb 2008) New Revision: 9343 Modified: trunk/src/chat_control.py Log: don't always show events in systray when notify_on_all_muc_messages is on and trayicon_notification_on_event is off Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-27 16:12:09 UTC (rev 9342) +++ trunk/src/chat_control.py 2008-02-27 18:25:42 UTC (rev 9343) @@ -676,19 +676,16 @@ # other_tags_for_text == ['marked'] --> highlighted gc message type_ = 'printed_' + self.type_id event = 'message_received' + if gc_message: + if other_tags_for_text == ['marked']: + type_ = 'printed_marked_gc_msg' + else: + type_ = 'printed_gc_msg' + event = 'gc_message_received' show_in_roster = notify.get_show_in_roster(event, self.account, self.contact) show_in_systray = notify.get_show_in_systray(event, self.account, self.contact) - if gc_message: - type_ = 'printed_gc_msg' - event = 'gc_message_received' - show_in_roster = True - show_in_systray = False - if gajim.config.get('notify_on_all_muc_messages'): - show_in_systray = True - if other_tags_for_text == ['marked']: - type_ = 'printed_marked_gc_msg' event = gajim.events.create_event(type_, None, show_in_roster = show_in_roster, show_in_systray = show_in_systray)

1 0

[commit-gajim] r9342 - trunk/src
by asterix＠gajim.org 27 Feb '08

27 Feb '08

Author: asterix Date: 2008-02-27 17:12:09 +0100 (Wed, 27 Feb 2008) New Revision: 9342 Modified: trunk/src/htmltextview.py Log: handle ascii_formatting option in htmltextview Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2008-02-27 10:18:56 UTC (rev 9341) +++ trunk/src/htmltextview.py 2008-02-27 16:12:09 UTC (rev 9342) @@ -220,6 +220,7 @@ except: pass + view.emot_pattern_re = re.compile(emoticons_pattern, re.IGNORECASE) # because emoticons match later (in the string) they need to be after # basic matches that may occur earlier emot_and_basic_pattern = basic_pattern + emoticons_pattern @@ -732,10 +733,16 @@ def handle_specials(self, text): index = 0 se = self.textview.config.get('show_ascii_formatting_chars') + af = gajim.config.get('ascii_formatting') if self.textview.config.get('emoticons_theme'): - iterator = self.textview.emot_and_basic_re.finditer(text) + if af: + iterator = self.textview.emot_and_basic_re.finditer(text) + else: + iterator = self.textview.emot_pattern_re.finditer(text) + elif af: + iterator = self.textview.basic_pattern_re.finditer(text) else: - iterator = self.textview.basic_pattern_re.finditer(text) + iterator = [] for match in iterator: start, end = match.span() special_text = text[start:end] @@ -754,7 +761,7 @@ img.show() # TODO: add alt/tooltip with the special_text (a11y) self.textview.add_child_at_anchor(img, anchor) - else: + elif af: # now print it if special_text.startswith('/'): # it's explicit italics self.startElement('i', {})

1 0

[commit-gajim] r9341 - trunk/src
by asterix＠gajim.org 27 Feb '08

27 Feb '08

Author: asterix Date: 2008-02-27 11:18:56 +0100 (Wed, 27 Feb 2008) New Revision: 9341 Modified: trunk/src/roster_window.py Log: search lowercase in roster. see #3749 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-26 10:10:48 UTC (rev 9340) +++ trunk/src/roster_window.py 2008-02-27 10:18:56 UTC (rev 9341) @@ -5340,7 +5340,8 @@ self.draw_contact(jid, account, selected = True) def search_roster_func(self, model, column, key, iter): - if model[iter][C_NAME].decode('utf-8').startswith(gobject.markup_escape_text(key)): + if model[iter][C_NAME].decode('utf-8').lower().startswith( + gobject.markup_escape_text(key.lower())): return False return True

1 0

[commit-gajim] r9340 - www-website
by asterix＠gajim.org 26 Feb '08

26 Feb '08

Author: asterix Date: 2008-02-26 11:10:48 +0100 (Tue, 26 Feb 2008) New Revision: 9340 Modified: www-website/docs.php Log: remove dead link on website Modified: www-website/docs.php =================================================================== --- www-website/docs.php 2008-02-26 09:46:27 UTC (rev 9339) +++ www-website/docs.php 2008-02-26 10:10:48 UTC (rev 9340) @@ -69,8 +69,6 @@ print (" <h1>\n"); print _(" Structure\n"); print (" </h1>\n"); -print _(" You can see how Gajim is structured")." <a href=\"pydoc/\">"._("here")."</a>.\n"; -print (" \n"); print _(" You can understand how Gajim works")." <a href=\"http://trac.gajim.org/wiki/DevInfos\">"._("here")."</a>.\n"; print (" "); print _(" Gajim uses the")." <a href=\"http://xmpppy.sourceforge.net/\">xmpppy</a> "._("library to do the interface with Jabber network.\n");

1 0

[commit-gajim] r9339 - trunk/src
by asterix＠gajim.org 26 Feb '08

26 Feb '08

Author: asterix Date: 2008-02-26 10:46:27 +0100 (Tue, 26 Feb 2008) New Revision: 9339 Modified: trunk/src/gajim.py Log: remove useless else Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-26 08:31:48 UTC (rev 9338) +++ trunk/src/gajim.py 2008-02-26 09:46:27 UTC (rev 9339) @@ -1204,7 +1204,6 @@ ctrl.print_conversation(' (', 'status', simple=True) ctrl.print_conversation('%s' % (status), 'status', simple=True) ctrl.print_conversation(')', 'status', simple=True) - else: ctrl.parent_win.redraw_tab(ctrl) ctrl.update_ui() if self.remote_ctrl:

1 0

[commit-gajim] r9338 - trunk/src
by asterix＠gajim.org 26 Feb '08

26 Feb '08

Author: asterix Date: 2008-02-26 09:31:48 +0100 (Tue, 26 Feb 2008) New Revision: 9338 Modified: trunk/src/chat_control.py trunk/src/conversation_textview.py trunk/src/gajim.py trunk/src/roster_window.py Log: [shivan] don't trat emoticons created with parenthesis arround status message. fixes #3368 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-25 20:41:41 UTC (rev 9337) +++ trunk/src/chat_control.py 2008-02-26 08:31:48 UTC (rev 9338) @@ -643,9 +643,8 @@ self.orig_msg = None def print_conversation_line(self, text, kind, name, tim, - other_tags_for_name = [], other_tags_for_time = [], - other_tags_for_text = [], count_as_new = True, - subject = None, old_kind = None, xhtml = None): + other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], + count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False): '''prints 'chat' type messages''' jid = self.contact.jid full_jid = self.get_full_jid() @@ -655,7 +654,7 @@ end = True textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml) + subject, old_kind, xhtml, simple=simple) if not count_as_new: return @@ -1518,8 +1517,8 @@ self._show_lock_image(e2e_is_active, 'E2E', e2e_is_active, self.session and \ self.session.is_loggable()) - def print_conversation(self, text, frm = '', tim = None, - encrypted = False, subject = None, xhtml = None): + def print_conversation(self, text, frm='', tim=None, encrypted=False, + subject=None, xhtml=None, simple=False): '''Print a line in the conversation: if contact is set to status: it's a status message if contact is set to another value: it's an outgoing message @@ -1567,7 +1566,8 @@ if xhtml: xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.print_conversation_line(self, text, kind, name, tim, - subject = subject, old_kind = self.old_msg_kind, xhtml = xhtml) + subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, + simple=simple) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2008-02-25 20:41:41 UTC (rev 9337) +++ trunk/src/conversation_textview.py 2008-02-26 08:31:48 UTC (rev 9338) @@ -982,8 +982,8 @@ buffer.insert_with_tags_by_name(end_iter, '\n', 'eol') def print_conversation_line(self, text, jid, kind, name, tim, - other_tags_for_name = [], other_tags_for_time = [], other_tags_for_text = [], - subject = None, old_kind = None, xhtml = None): + other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], + subject=None, old_kind=None, xhtml=None, simple=False): '''prints 'chat' type messages''' buffer = self.tv.get_buffer() buffer.begin_user_action() @@ -1004,7 +1004,8 @@ # else twice (one for end bound, one for start bound) mark = None if buffer.get_char_count() > 0: - buffer.insert_with_tags_by_name(end_iter, '\n', 'eol') + if not simple: + buffer.insert_with_tags_by_name(end_iter, '\n', 'eol') mark = buffer.create_mark(None, end_iter, left_gravity=True) self.marks_queue.put(mark) if not mark: @@ -1019,12 +1020,12 @@ # We don't have tim for outgoing messages... tim = time.localtime() current_print_time = gajim.config.get('print_time') - if current_print_time == 'always' and kind != 'info': + if current_print_time == 'always' and kind != 'info' and not simple: timestamp_str = self.get_time_to_show(tim) timestamp = time.strftime(timestamp_str, tim) buffer.insert_with_tags_by_name(end_iter, timestamp, *other_tags_for_time) - elif current_print_time == 'sometimes' and kind != 'info': + elif current_print_time == 'sometimes' and kind != 'info' and not simple: every_foo_seconds = 60 * gajim.config.get( 'print_ichat_every_foo_minutes') seconds_passed = time.mktime(tim) - self.last_time_printout Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-02-25 20:41:41 UTC (rev 9337) +++ trunk/src/gajim.py 2008-02-26 08:31:48 UTC (rev 9338) @@ -1198,12 +1198,13 @@ contact.show = show contact.status = status uf_show = helpers.get_uf_show(show) + ctrl.print_conversation(_('%s is now %s') % (nick, uf_show), + 'status') if status: - ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show, - status), 'status') + ctrl.print_conversation(' (', 'status', simple=True) + ctrl.print_conversation('%s' % (status), 'status', simple=True) + ctrl.print_conversation(')', 'status', simple=True) else: - ctrl.print_conversation(_('%s is now %s') % (nick, uf_show), - 'status') ctrl.parent_win.redraw_tab(ctrl) ctrl.update_ui() if self.remote_ctrl: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-02-25 20:41:41 UTC (rev 9337) +++ trunk/src/roster_window.py 2008-02-26 08:31:48 UTC (rev 9338) @@ -1402,12 +1402,12 @@ win.redraw_tab(ctrl) uf_show = helpers.get_uf_show(show) + ctrl.print_conversation(_('%s is now %s') % (name, uf_show), + 'status') if status: - ctrl.print_conversation(_('%s is now %s (%s)') % (name, uf_show, - status), 'status') - else: # No status message - ctrl.print_conversation(_('%s is now %s') % (name, uf_show), - 'status') + ctrl.print_conversation(' (', 'status', simple=True) + ctrl.print_conversation('%s' % (status), 'status', simple=True) + ctrl.print_conversation(')', 'status', simple=True) # unset custom status if gajim.interface.status_sent_to_users.has_key(account) and \

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2008