|
 |
7c6d83 |
diff -up evolution-3.8.5/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.contact-duplicate-auto-expand evolution-3.8.5/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
|
|
|
7c6d83 |
--- evolution-3.8.5/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.contact-duplicate-auto-expand 2013-03-17 13:46:11.000000000 +0100
|
|
|
7c6d83 |
+++ evolution-3.8.5/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui 2014-08-25 18:27:12.978121991 +0200
|
|
|
7c6d83 |
@@ -57,8 +57,18 @@
|
|
|
7c6d83 |
<property name="row_spacing">6</property>
|
|
|
7c6d83 |
<property name="column_spacing">6</property>
|
|
|
7c6d83 |
<child>
|
|
|
7c6d83 |
- <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-old-contact">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
+ <object class="GtkScrolledWindow" id="scrolled-old-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="can_focus">True</property>
|
|
|
7c6d83 |
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
|
|
|
7c6d83 |
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
|
|
7c6d83 |
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
|
|
|
7c6d83 |
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-old-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
</object>
|
|
|
7c6d83 |
<packing>
|
|
|
7c6d83 |
<property name="left_attach">1</property>
|
|
|
7c6d83 |
@@ -135,8 +145,18 @@
|
|
|
7c6d83 |
</packing>
|
|
|
7c6d83 |
</child>
|
|
|
7c6d83 |
<child>
|
|
|
7c6d83 |
- <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-new-contact">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
+ <object class="GtkScrolledWindow" id="scrolled-new-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="can_focus">True</property>
|
|
|
7c6d83 |
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
|
|
|
7c6d83 |
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
|
|
7c6d83 |
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
|
|
|
7c6d83 |
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-new-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
</object>
|
|
|
7c6d83 |
<packing>
|
|
|
7c6d83 |
<property name="left_attach">1</property>
|
|
|
7c6d83 |
diff -up evolution-3.8.5/addressbook/gui/merging/eab-contact-duplicate-detected.ui.contact-duplicate-auto-expand evolution-3.8.5/addressbook/gui/merging/eab-contact-duplicate-detected.ui
|
|
|
7c6d83 |
--- evolution-3.8.5/addressbook/gui/merging/eab-contact-duplicate-detected.ui.contact-duplicate-auto-expand 2013-03-17 13:46:11.000000000 +0100
|
|
|
7c6d83 |
+++ evolution-3.8.5/addressbook/gui/merging/eab-contact-duplicate-detected.ui 2014-08-25 18:27:12.978121991 +0200
|
|
|
7c6d83 |
@@ -67,146 +67,152 @@
|
|
|
7c6d83 |
</packing>
|
|
|
7c6d83 |
</child>
|
|
|
7c6d83 |
<child>
|
|
|
7c6d83 |
- <object class="GtkScrolledWindow" id="scrolledwindow2">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- <property name="can_focus">True</property>
|
|
|
7c6d83 |
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
|
|
|
7c6d83 |
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
|
|
7c6d83 |
- <property name="shadow_type">GTK_SHADOW_IN</property>
|
|
|
7c6d83 |
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="GtkViewport" id="viewport1">
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="GtkTable" id="table1">
|
|
|
7c6d83 |
- <property name="border_width">12</property>
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- <property name="n_rows">5</property>
|
|
|
7c6d83 |
- <property name="n_columns">2</property>
|
|
|
7c6d83 |
- <property name="homogeneous">False</property>
|
|
|
7c6d83 |
- <property name="row_spacing">6</property>
|
|
|
7c6d83 |
- <property name="column_spacing">12</property>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-old-contact">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- <packing>
|
|
|
7c6d83 |
- <property name="left_attach">1</property>
|
|
|
7c6d83 |
- <property name="right_attach">2</property>
|
|
|
7c6d83 |
- <property name="top_attach">4</property>
|
|
|
7c6d83 |
- <property name="bottom_attach">5</property>
|
|
|
7c6d83 |
- </packing>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="GtkLabel" id="label1">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- <property name="label" translatable="yes">The name or email address of this contact already exists
|
|
|
7c6d83 |
+ <object class="GtkTable" id="table1">
|
|
|
7c6d83 |
+ <property name="border_width">12</property>
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="n_rows">5</property>
|
|
|
7c6d83 |
+ <property name="n_columns">2</property>
|
|
|
7c6d83 |
+ <property name="homogeneous">False</property>
|
|
|
7c6d83 |
+ <property name="row_spacing">6</property>
|
|
|
7c6d83 |
+ <property name="column_spacing">12</property>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="GtkScrolledWindow" id="scrolled-old-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="can_focus">True</property>
|
|
|
7c6d83 |
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
|
|
|
7c6d83 |
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
|
|
7c6d83 |
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
|
|
|
7c6d83 |
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-old-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ <packing>
|
|
|
7c6d83 |
+ <property name="left_attach">1</property>
|
|
|
7c6d83 |
+ <property name="right_attach">2</property>
|
|
|
7c6d83 |
+ <property name="top_attach">4</property>
|
|
|
7c6d83 |
+ <property name="bottom_attach">5</property>
|
|
|
7c6d83 |
+ </packing>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="GtkLabel" id="label1">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="label" translatable="yes">The name or email address of this contact already exists
|
|
|
7c6d83 |
in this folder. Would you like to add it anyway?</property>
|
|
|
7c6d83 |
- <property name="use_underline">False</property>
|
|
|
7c6d83 |
- <property name="use_markup">False</property>
|
|
|
7c6d83 |
- <property name="justify">GTK_JUSTIFY_LEFT</property>
|
|
|
7c6d83 |
- <property name="wrap">False</property>
|
|
|
7c6d83 |
- <property name="selectable">False</property>
|
|
|
7c6d83 |
- <property name="xalign">0</property>
|
|
|
7c6d83 |
- <property name="yalign">0.5</property>
|
|
|
7c6d83 |
- <property name="xpad">0</property>
|
|
|
7c6d83 |
- <property name="ypad">0</property>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- <packing>
|
|
|
7c6d83 |
- <property name="left_attach">1</property>
|
|
|
7c6d83 |
- <property name="right_attach">2</property>
|
|
|
7c6d83 |
- <property name="top_attach">0</property>
|
|
|
7c6d83 |
- <property name="bottom_attach">1</property>
|
|
|
7c6d83 |
- <property name="y_options">fill</property>
|
|
|
7c6d83 |
- </packing>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="GtkLabel" id="label3">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- <property name="label" translatable="yes">Original Contact:</property>
|
|
|
7c6d83 |
- <property name="use_underline">False</property>
|
|
|
7c6d83 |
- <property name="use_markup">False</property>
|
|
|
7c6d83 |
- <property name="justify">GTK_JUSTIFY_CENTER</property>
|
|
|
7c6d83 |
- <property name="wrap">False</property>
|
|
|
7c6d83 |
- <property name="selectable">False</property>
|
|
|
7c6d83 |
- <property name="xalign">0</property>
|
|
|
7c6d83 |
- <property name="yalign">0.5</property>
|
|
|
7c6d83 |
- <property name="xpad">0</property>
|
|
|
7c6d83 |
- <property name="ypad">0</property>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- <packing>
|
|
|
7c6d83 |
- <property name="left_attach">1</property>
|
|
|
7c6d83 |
- <property name="right_attach">2</property>
|
|
|
7c6d83 |
- <property name="top_attach">3</property>
|
|
|
7c6d83 |
- <property name="bottom_attach">4</property>
|
|
|
7c6d83 |
- <property name="y_options">fill</property>
|
|
|
7c6d83 |
- </packing>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="GtkLabel" id="label4">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- <property name="label" translatable="yes">New Contact:</property>
|
|
|
7c6d83 |
- <property name="use_underline">False</property>
|
|
|
7c6d83 |
- <property name="use_markup">False</property>
|
|
|
7c6d83 |
- <property name="justify">GTK_JUSTIFY_CENTER</property>
|
|
|
7c6d83 |
- <property name="wrap">False</property>
|
|
|
7c6d83 |
- <property name="selectable">False</property>
|
|
|
7c6d83 |
- <property name="xalign">0</property>
|
|
|
7c6d83 |
- <property name="yalign">0.5</property>
|
|
|
7c6d83 |
- <property name="xpad">0</property>
|
|
|
7c6d83 |
- <property name="ypad">0</property>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- <packing>
|
|
|
7c6d83 |
- <property name="left_attach">1</property>
|
|
|
7c6d83 |
- <property name="right_attach">2</property>
|
|
|
7c6d83 |
- <property name="top_attach">1</property>
|
|
|
7c6d83 |
- <property name="bottom_attach">2</property>
|
|
|
7c6d83 |
- <property name="x_options">fill</property>
|
|
|
7c6d83 |
- <property name="y_options"/>
|
|
|
7c6d83 |
- </packing>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-new-contact">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- <packing>
|
|
|
7c6d83 |
- <property name="left_attach">1</property>
|
|
|
7c6d83 |
- <property name="right_attach">2</property>
|
|
|
7c6d83 |
- <property name="top_attach">2</property>
|
|
|
7c6d83 |
- <property name="bottom_attach">3</property>
|
|
|
7c6d83 |
- </packing>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="GtkAlignment" id="alignment1">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- <property name="xalign">0.5</property>
|
|
|
7c6d83 |
- <property name="yalign">0</property>
|
|
|
7c6d83 |
- <property name="xscale">1</property>
|
|
|
7c6d83 |
- <property name="yscale">0</property>
|
|
|
7c6d83 |
- <property name="top_padding">0</property>
|
|
|
7c6d83 |
- <property name="bottom_padding">0</property>
|
|
|
7c6d83 |
- <property name="left_padding">0</property>
|
|
|
7c6d83 |
- <property name="right_padding">0</property>
|
|
|
7c6d83 |
- <child>
|
|
|
7c6d83 |
- <object class="GtkImage" id="custom2">
|
|
|
7c6d83 |
- <property name="visible">True</property>
|
|
|
7c6d83 |
- <property name="icon-name">avatar-default</property>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- <packing>
|
|
|
7c6d83 |
- <property name="left_attach">0</property>
|
|
|
7c6d83 |
- <property name="right_attach">1</property>
|
|
|
7c6d83 |
- <property name="top_attach">0</property>
|
|
|
7c6d83 |
- <property name="bottom_attach">5</property>
|
|
|
7c6d83 |
- <property name="x_options">fill</property>
|
|
|
7c6d83 |
- <property name="y_options">fill</property>
|
|
|
7c6d83 |
- </packing>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
- </child>
|
|
|
7c6d83 |
- </object>
|
|
|
7c6d83 |
+ <property name="use_underline">False</property>
|
|
|
7c6d83 |
+ <property name="use_markup">False</property>
|
|
|
7c6d83 |
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
|
|
|
7c6d83 |
+ <property name="wrap">False</property>
|
|
|
7c6d83 |
+ <property name="selectable">False</property>
|
|
|
7c6d83 |
+ <property name="xalign">0</property>
|
|
|
7c6d83 |
+ <property name="yalign">0.5</property>
|
|
|
7c6d83 |
+ <property name="xpad">0</property>
|
|
|
7c6d83 |
+ <property name="ypad">0</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ <packing>
|
|
|
7c6d83 |
+ <property name="left_attach">1</property>
|
|
|
7c6d83 |
+ <property name="right_attach">2</property>
|
|
|
7c6d83 |
+ <property name="top_attach">0</property>
|
|
|
7c6d83 |
+ <property name="bottom_attach">1</property>
|
|
|
7c6d83 |
+ <property name="y_options">fill</property>
|
|
|
7c6d83 |
+ </packing>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="GtkLabel" id="label3">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="label" translatable="yes">Original Contact:</property>
|
|
|
7c6d83 |
+ <property name="use_underline">False</property>
|
|
|
7c6d83 |
+ <property name="use_markup">False</property>
|
|
|
7c6d83 |
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
|
|
|
7c6d83 |
+ <property name="wrap">False</property>
|
|
|
7c6d83 |
+ <property name="selectable">False</property>
|
|
|
7c6d83 |
+ <property name="xalign">0</property>
|
|
|
7c6d83 |
+ <property name="yalign">0.5</property>
|
|
|
7c6d83 |
+ <property name="xpad">0</property>
|
|
|
7c6d83 |
+ <property name="ypad">0</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ <packing>
|
|
|
7c6d83 |
+ <property name="left_attach">1</property>
|
|
|
7c6d83 |
+ <property name="right_attach">2</property>
|
|
|
7c6d83 |
+ <property name="top_attach">3</property>
|
|
|
7c6d83 |
+ <property name="bottom_attach">4</property>
|
|
|
7c6d83 |
+ <property name="y_options">fill</property>
|
|
|
7c6d83 |
+ </packing>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="GtkLabel" id="label4">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="label" translatable="yes">New Contact:</property>
|
|
|
7c6d83 |
+ <property name="use_underline">False</property>
|
|
|
7c6d83 |
+ <property name="use_markup">False</property>
|
|
|
7c6d83 |
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
|
|
|
7c6d83 |
+ <property name="wrap">False</property>
|
|
|
7c6d83 |
+ <property name="selectable">False</property>
|
|
|
7c6d83 |
+ <property name="xalign">0</property>
|
|
|
7c6d83 |
+ <property name="yalign">0.5</property>
|
|
|
7c6d83 |
+ <property name="xpad">0</property>
|
|
|
7c6d83 |
+ <property name="ypad">0</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ <packing>
|
|
|
7c6d83 |
+ <property name="left_attach">1</property>
|
|
|
7c6d83 |
+ <property name="right_attach">2</property>
|
|
|
7c6d83 |
+ <property name="top_attach">1</property>
|
|
|
7c6d83 |
+ <property name="bottom_attach">2</property>
|
|
|
7c6d83 |
+ <property name="x_options">fill</property>
|
|
|
7c6d83 |
+ <property name="y_options"/>
|
|
|
7c6d83 |
+ </packing>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="GtkScrolledWindow" id="scrolled-new-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="can_focus">True</property>
|
|
|
7c6d83 |
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
|
|
|
7c6d83 |
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
|
|
7c6d83 |
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
|
|
|
7c6d83 |
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="EABContactDisplay" type-func="eab_contact_display_get_type" id="custom-new-contact">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ <packing>
|
|
|
7c6d83 |
+ <property name="left_attach">1</property>
|
|
|
7c6d83 |
+ <property name="right_attach">2</property>
|
|
|
7c6d83 |
+ <property name="top_attach">2</property>
|
|
|
7c6d83 |
+ <property name="bottom_attach">3</property>
|
|
|
7c6d83 |
+ </packing>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="GtkAlignment" id="alignment1">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="xalign">0.5</property>
|
|
|
7c6d83 |
+ <property name="yalign">0</property>
|
|
|
7c6d83 |
+ <property name="xscale">1</property>
|
|
|
7c6d83 |
+ <property name="yscale">0</property>
|
|
|
7c6d83 |
+ <property name="top_padding">0</property>
|
|
|
7c6d83 |
+ <property name="bottom_padding">0</property>
|
|
|
7c6d83 |
+ <property name="left_padding">0</property>
|
|
|
7c6d83 |
+ <property name="right_padding">0</property>
|
|
|
7c6d83 |
+ <child>
|
|
|
7c6d83 |
+ <object class="GtkImage" id="custom2">
|
|
|
7c6d83 |
+ <property name="visible">True</property>
|
|
|
7c6d83 |
+ <property name="icon-name">avatar-default</property>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
+ <packing>
|
|
|
7c6d83 |
+ <property name="left_attach">0</property>
|
|
|
7c6d83 |
+ <property name="right_attach">1</property>
|
|
|
7c6d83 |
+ <property name="top_attach">0</property>
|
|
|
7c6d83 |
+ <property name="bottom_attach">5</property>
|
|
|
7c6d83 |
+ <property name="x_options">fill</property>
|
|
|
7c6d83 |
+ <property name="y_options">fill</property>
|
|
|
7c6d83 |
+ </packing>
|
|
|
7c6d83 |
+ </child>
|
|
|
7c6d83 |
+ </object>
|
|
|
7c6d83 |
</child>
|
|
|
7c6d83 |
</object>
|
|
|
7c6d83 |
</child>
|