gossip r2779 - in trunk: . data/glade src
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: gossip r2779 - in trunk: . data/glade src
- Date: Sun, 30 Mar 2008 22:11:51 +0100 (BST)
Author: mr
Date: Sun Mar 30 22:11:51 2008
New Revision: 2779
URL: http://svn.gnome.org/viewvc/gossip?rev=2779&view=rev
Log:
Make the libebook part of the vcard dialog more discrete.
Modified:
trunk/ChangeLog
trunk/data/glade/main.glade
trunk/src/gossip-account-widget-jabber.c
trunk/src/gossip-popup-button.c
trunk/src/gossip-vcard-dialog.c
Modified: trunk/data/glade/main.glade
==============================================================================
--- trunk/data/glade/main.glade (original)
+++ trunk/data/glade/main.glade Sun Mar 30 22:11:51 2008
@@ -2293,9 +2293,85 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
+ <widget class="GtkButton" id="button_import">
+ <property name="tooltip" translatable="yes">Import your personal information from your desktop settings and use it here</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">1</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment35">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox195">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image902">
+ <property name="visible">True</property>
+ <property name="stock">gtk-convert</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label652">
+ <property name="visible">True</property>
+ <property name="label">_Import</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkButton" id="button_cancel">
<property name="visible">True</property>
<property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
@@ -2309,13 +2385,12 @@
<widget class="GtkButton" id="button_save">
<property name="visible">True</property>
<property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-save</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
+ <property name="response_id">0</property>
</widget>
</child>
</widget>
@@ -2377,233 +2452,166 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox_ebook">
+ <widget class="GtkVBox" id="vbox_details">
+ <property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">16</property>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator3">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkTable" id="table_ebook">
+ <widget class="GtkHBox" id="hbox172">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">12</property>
-
- <child>
- <widget class="GtkImage" id="image_ebook">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-info</property>
- <property name="icon_size">6</property>
- <property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
+ <property name="spacing">18</property>
<child>
- <widget class="GtkButton" id="button_ebook_retrieve">
+ <widget class="GtkTable" id="table14">
<property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
+ <property name="n_rows">7</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <widget class="GtkAlignment" id="alignment34">
+ <widget class="GtkScrolledWindow" id="scrolledwindow7">
+ <property name="width_request">200</property>
<property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <widget class="GtkHBox" id="hbox194">
+ <widget class="GtkTextView" id="textview_description">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image901">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label650">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Retrieve From Desktop</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="overwrite">False</property>
+ <property name="accepts_tab">True</property>
+ <property name="justification">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="cursor_visible">True</property>
+ <property name="pixels_above_lines">3</property>
+ <property name="pixels_below_lines">3</property>
+ <property name="pixels_inside_wrap">0</property>
+ <property name="left_margin">0</property>
+ <property name="right_margin">0</property>
+ <property name="indent">3</property>
+ <property name="text" translatable="yes"></property>
</widget>
</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">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
</child>
- </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">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label651">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Your desktop personal information can be used here to fill in the details below.
-Similarly, you can choose to set this information which is used by the email
-client and other desktop applications. </property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="label_description">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Description:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">textview_description</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkCheckButton" id="checkbutton_ebook_sync">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Synchroni_ze when saving</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">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="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkLabel" id="label_avatar">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">A_vatar:</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">0</property>
+ <property name="ypad">5</property>
+ <property name="mnemonic_widget">button_image</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkHBox" id="hbox193">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
- <child>
- <widget class="GtkVBox" id="vbox_details">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <child>
+ <widget class="GtkButton" id="button_image">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
- <child>
- <widget class="GtkHBox" id="hbox172">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">18</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkTable" id="table14">
- <property name="visible">True</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkLabel" id="label_name">
+ <widget class="GtkLabel" id="label_birthday">
<property name="visible">True</property>
- <property name="label" translatable="yes">N_ame:</property>
+ <property name="label" translatable="yes">_Birthday:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2613,7 +2621,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">entry_name</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -2622,41 +2629,69 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_name">
+ <widget class="GtkHBox" id="hbox173">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">This name will be used to identify you when new contacts lookup your details</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- <property name="width_chars">22</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkEntry" id="entry_birthday">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">â</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox_birthday_placeholder">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_nickname">
+ <widget class="GtkLabel" id="label_web_site">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Nickname:</property>
+ <property name="label" translatable="yes">_Web site:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2666,7 +2701,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">entry_nickname</property>
+ <property name="mnemonic_widget">entry_web_site</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -2675,17 +2710,16 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_nickname">
+ <widget class="GtkEntry" id="entry_web_site">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">This name will be used to identify you in chat windows</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@@ -2698,8 +2732,8 @@
<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">4</property>
+ <property name="bottom_attach">5</property>
<property name="y_options"></property>
</packing>
</child>
@@ -2726,8 +2760,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@@ -2748,16 +2782,16 @@
<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="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_web_site">
+ <widget class="GtkLabel" id="label_nickname">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Web site:</property>
+ <property name="label" translatable="yes">_Nickname:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2767,7 +2801,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">entry_web_site</property>
+ <property name="mnemonic_widget">entry_nickname</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -2776,16 +2810,17 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_web_site">
+ <widget class="GtkEntry" id="entry_nickname">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">This name will be used to identify you in chat windows</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@@ -2798,229 +2833,50 @@
<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="label_birthday">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Birthday:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">fill</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox173">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkEntry" id="entry_birthday">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">â</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox_birthday_placeholder">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </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">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="table15">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow7">
- <property name="width_request">200</property>
+ <widget class="GtkEntry" id="entry_name">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">This name will be used to identify you when new contacts lookup your details</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="textview_description">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">3</property>
- <property name="pixels_below_lines">3</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">3</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_description">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Description:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">textview_description</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_padding">5</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox193">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="button_image">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
+ <property name="has_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ <property name="width_chars">22</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">fill</property>
- <property name="y_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_avatar">
+ <widget class="GtkLabel" id="label_name">
<property name="visible">True</property>
- <property name="label" translatable="yes">A_vatar:</property>
+ <property name="label" translatable="yes">N_ame:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
- <property name="yalign">0</property>
+ <property name="yalign">0.5</property>
<property name="xpad">0</property>
- <property name="ypad">5</property>
- <property name="mnemonic_widget">button_image</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">entry_name</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
@@ -3032,7 +2888,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -7420,9 +7276,9 @@
</child>
<child>
- <widget class="GtkButton" id="button_ebook_retrieve">
+ <widget class="GtkButton" id="button_import">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Populate from your desktop personal details (set in the Evolution email client or the About Me application).</property>
+ <property name="tooltip" translatable="yes">Import your personal information from your desktop settings and use it here</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
Modified: trunk/src/gossip-account-widget-jabber.c
==============================================================================
--- trunk/src/gossip-account-widget-jabber.c (original)
+++ trunk/src/gossip-account-widget-jabber.c Sun Mar 30 22:11:51 2008
@@ -58,7 +58,7 @@
GtkWidget *vbox_settings;
- GtkWidget *button_ebook_retrieve;
+ GtkWidget *button_import;
GtkWidget *button_register;
GtkWidget *button_forget;
@@ -120,10 +120,8 @@
GossipAccountWidgetJabber *settings);
static void account_widget_jabber_button_register_clicked_cb (GtkWidget *button,
GossipAccountWidgetJabber *settings);
-static void
- account_widget_jabber_button_ebook_retrieve_clicked_cb (GtkWidget *button,
+static void account_widget_jabber_button_import_clicked_cb (GtkWidget *button,
GossipAccountWidgetJabber *settings);
-
static void account_widget_jabber_button_forget_clicked_cb (GtkWidget *button,
GossipAccountWidgetJabber *settings);
static void account_widget_jabber_cp_entry_activate_cb (GtkWidget *entry,
@@ -163,7 +161,7 @@
"vbox_jabber_settings",
NULL,
"vbox_jabber_settings", &priv->vbox_settings,
- "button_ebook_retrieve", &priv->button_ebook_retrieve,
+ "button_import", &priv->button_import,
"button_register", &priv->button_register,
"button_forget", &priv->button_forget,
"button_change_password", &priv->button_change_password,
@@ -182,7 +180,7 @@
gossip_glade_connect (glade,
settings,
- "button_ebook_retrieve", "clicked", account_widget_jabber_button_ebook_retrieve_clicked_cb,
+ "button_import", "clicked", account_widget_jabber_button_import_clicked_cb,
"button_register", "clicked", account_widget_jabber_button_register_clicked_cb,
"button_forget", "clicked", account_widget_jabber_button_forget_clicked_cb,
"button_change_password", "clicked", account_widget_jabber_button_change_password_clicked_cb,
@@ -197,9 +195,9 @@
g_object_unref (glade);
#ifdef HAVE_EBOOK
- gtk_widget_show (priv->button_ebook_retrieve);
+ gtk_widget_show (priv->button_import);
#else
- gtk_widget_hide (priv->button_ebook_retrieve);
+ gtk_widget_hide (priv->button_import);
#endif
/* We do this manually so we can block it. */
@@ -697,8 +695,8 @@
}
static void
-account_widget_jabber_button_ebook_retrieve_clicked_cb (GtkWidget *button,
- GossipAccountWidgetJabber *settings)
+account_widget_jabber_button_import_clicked_cb (GtkWidget *button,
+ GossipAccountWidgetJabber *settings)
{
#ifdef HAVE_EBOOK
GossipAccountWidgetJabberPriv *priv;
@@ -707,9 +705,41 @@
priv = GET_PRIV (settings);
str = gossip_ebook_get_jabber_id ();
- if (!G_STR_EMPTY (str)) {
+ if (G_STR_EMPTY (str)) {
+ GtkWidget *toplevel;
+ GtkWidget *md;
+ const gchar *msg1, *msg2;
+
+ toplevel = gtk_widget_get_toplevel (priv->vbox_settings);
+ if (GTK_WIDGET_TOPLEVEL (toplevel) != TRUE ||
+ GTK_WIDGET_TYPE (toplevel) != GTK_TYPE_WINDOW) {
+ toplevel = NULL;
+ }
+
+ msg1 = _("No Jabber account details available");
+ msg2 = _("Your desktop settings don't include any "
+ "information about your Jabber account.\n"
+ "\n"
+ "To set your Jabber information, use the "
+ "'About Me' application");
+
+ md = gtk_message_dialog_new (GTK_WINDOW (toplevel),
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_CLOSE,
+ msg1);
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (md),
+ msg2);
+
+ g_signal_connect_swapped (md, "response",
+ G_CALLBACK (gtk_widget_destroy),
+ md);
+
+ gtk_widget_show_all (md);
+ } else {
gtk_entry_set_text (GTK_ENTRY (priv->entry_id), str);
}
+
g_free (str);
#endif
}
Modified: trunk/src/gossip-popup-button.c
==============================================================================
--- trunk/src/gossip-popup-button.c (original)
+++ trunk/src/gossip-popup-button.c Sun Mar 30 22:11:51 2008
@@ -123,6 +123,7 @@
button = g_object_new (GOSSIP_TYPE_POPUP_BUTTON,
"label", label,
+ "use-underline", TRUE,
NULL);
return button;
Modified: trunk/src/gossip-vcard-dialog.c
==============================================================================
--- trunk/src/gossip-vcard-dialog.c (original)
+++ trunk/src/gossip-vcard-dialog.c Sun Mar 30 22:11:51 2008
@@ -64,6 +64,8 @@
#define AVATAR_MAX_HEIGHT 96
#define AVATAR_MAX_WIDTH 96
+#define RESPONSE_IMPORT 1
+
typedef struct {
GtkWidget *dialog;
@@ -71,10 +73,6 @@
GtkWidget *label_account;
GtkWidget *account_chooser;
- GtkWidget *vbox_ebook;
- GtkWidget *checkbutton_ebook_sync;
- GtkWidget *button_ebook_retrieve;
-
GtkWidget *vbox_details;
GtkWidget *label_name;
@@ -95,6 +93,7 @@
GtkWidget *calendar;
+ GtkWidget *button_import;
GtkWidget *button_cancel;
GtkWidget *button_save;
@@ -277,8 +276,7 @@
}
static void
-vcard_dialog_button_ebook_retrieve_clicked_cb (GtkWidget *button,
- GossipVCardDialog *dialog)
+vcard_dialog_import (GossipVCardDialog *dialog)
{
#ifdef HAVE_EBOOK
GossipAvatar *avatar;
@@ -586,8 +584,8 @@
GossipAccountChooser *account_chooser;
gtk_widget_set_sensitive (dialog->vbox_details, FALSE);
- gtk_widget_set_sensitive (dialog->vbox_ebook, FALSE);
gtk_widget_set_sensitive (dialog->account_chooser, FALSE);
+ gtk_widget_set_sensitive (dialog->button_import, FALSE);
gtk_widget_set_sensitive (dialog->button_save, FALSE);
dialog->timeout_id = g_timeout_add (VCARD_TIMEOUT,
@@ -620,8 +618,8 @@
dialog->requesting_vcard = FALSE;
gtk_widget_set_sensitive (dialog->vbox_details, TRUE);
- gtk_widget_set_sensitive (dialog->vbox_ebook, TRUE);
gtk_widget_set_sensitive (dialog->account_chooser, TRUE);
+ gtk_widget_set_sensitive (dialog->button_import, TRUE);
gtk_widget_set_sensitive (dialog->button_save, TRUE);
if (dialog->timeout_id != 0) {
@@ -702,6 +700,7 @@
static void
vcard_dialog_set_vcard_finish (GossipVCardDialog *dialog)
{
+ gtk_widget_set_sensitive (dialog->button_import, TRUE);
gtk_widget_set_sensitive (dialog->button_save, TRUE);
}
@@ -754,35 +753,6 @@
avatar = gossip_avatar_new (avatar_data, avatar_size, dialog->avatar_format);
}
-#ifdef HAVE_EBOOK
- /* Set EDS data */
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->checkbutton_ebook_sync))) {
- gossip_ebook_set_name (name);
- gossip_ebook_set_nickname (nickname);
-
- /* FIXME: Finish, currently not supported */
-#if 0
- if (birthday_formatted) {
- gossip_ebook_set_birthday (birthday_formatted);
- }
-#endif
-
- gossip_ebook_set_website (website);
- gossip_ebook_set_email (email);
-
- /* FIXME: Finish, currently not supported */
-#if 0
- gossip_ebook_set_description (description);
-#endif
-
- if (avatar) {
- gossip_ebook_set_avatar (avatar);
- }
- } else {
- gossip_debug (DEBUG_DOMAIN, "Not saving to EDS");
- }
-#endif
-
/* Set VCard */
if (gossip_app_is_connected ()) {
vcard = gossip_vcard_new ();
@@ -884,6 +854,7 @@
{
switch (response) {
case GTK_RESPONSE_OK:
+ gtk_widget_set_sensitive (dialog->button_import, FALSE);
gtk_widget_set_sensitive (dialog->button_save, FALSE);
vcard_dialog_set_vcard (dialog);
return;
@@ -897,6 +868,11 @@
vcard_dialog_set_account_to_last (dialog);
return;
}
+ break;
+
+ case RESPONSE_IMPORT:
+ vcard_dialog_import (dialog);
+ return;
default:
break;
@@ -937,9 +913,6 @@
"vcard_dialog", &dialog->dialog,
"hbox_account", &dialog->hbox_account,
"label_account", &dialog->label_account,
- "vbox_ebook", &dialog->vbox_ebook,
- "checkbutton_ebook_sync", &dialog->checkbutton_ebook_sync,
- "button_ebook_retrieve", &dialog->button_ebook_retrieve,
"vbox_details", &dialog->vbox_details,
"label_name", &dialog->label_name,
"label_nickname", &dialog->label_nickname,
@@ -953,6 +926,7 @@
"entry_birthday", &dialog->entry_birthday,
"hbox_birthday_placeholder", &birthday_placeholder,
"textview_description", &dialog->textview_description,
+ "button_import", &dialog->button_import,
"button_cancel", &dialog->button_cancel,
"button_save", &dialog->button_save,
"button_image", &dialog->button_image,
@@ -963,7 +937,6 @@
"vcard_dialog", "destroy", vcard_dialog_destroy_cb,
"vcard_dialog", "response", vcard_dialog_response_cb,
"button_image", "clicked", vcard_dialog_button_image_clicked_cb,
- "button_ebook_retrieve", "clicked", vcard_dialog_button_ebook_retrieve_clicked_cb,
NULL);
g_object_add_weak_pointer (G_OBJECT (dialog->dialog), (gpointer) &dialog);
@@ -978,19 +951,19 @@
"label_birthday",
"label_avatar",
"label_description",
-#ifdef HAVE_EBOOK
- "image_ebook",
-#endif
NULL);
g_object_unref (glade);
#ifdef HAVE_EBOOK
- gtk_widget_show (dialog->vbox_ebook);
+ gtk_widget_show (dialog->button_import);
+
+ gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (dialog->dialog)->action_area),
+ dialog->button_import, TRUE);
#endif
/* Birthday chooser */
- dialog->button_birthday = gossip_popup_button_new (_("Change"));
+ dialog->button_birthday = gossip_popup_button_new (_("C_hange"));
gtk_box_pack_start (GTK_BOX (birthday_placeholder),
dialog->button_birthday, 0, FALSE, FALSE);
gtk_widget_show (dialog->button_birthday);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
