[gnome-contacts] Some tweaks of link dialog layout

[Alexander Larsson <alexl src gnome org>]

commit 838bcbd851e7094da43f3ab6662970712840c23f
Author: Alexander Larsson <alexl redhat com>
Date:   Mon Aug 29 16:29:43 2011 +0200

    Some tweaks of link dialog layout

 data/gnome-contacts.css       |    8 ++++++++
 src/contacts-link-dialog.vala |   32 +++++++++++++++++---------------
 2 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/data/gnome-contacts.css b/data/gnome-contacts.css
index 65857be..a40c5e3 100644
--- a/data/gnome-contacts.css
+++ b/data/gnome-contacts.css
@@ -6,6 +6,14 @@ ContactsListPane {
     padding: 0 1 1 1;
 }
 
+.contact-list-frame {
+    border-style: solid;
+    border-width: 0 1 1 1;
+    border-color: #878787;
+    border-image: none;
+    padding: 0 1 1 1;
+}
+
 ContactsListPane GtkEntry.image {
     color: #888a85;
 }
diff --git a/src/contacts-link-dialog.vala b/src/contacts-link-dialog.vala
index 9b4e3c4..5c5957e 100644
--- a/src/contacts-link-dialog.vala
+++ b/src/contacts-link-dialog.vala
@@ -79,19 +79,22 @@ public class Contacts.LinkDialog : Dialog {
     grid.set_row_spacing (12);
     container.add (grid);
 
-    var list_grid = new Grid ();
-    list_grid.set_size_request (315, -1);
-    list_grid.set_hexpand (false);
-    grid.attach (list_grid, 0, 0, 1, 1);
-    list_grid.set_orientation (Orientation.VERTICAL);
-
     var label = new Label (_("Select contacts to link to %s").printf (contact.display_name));
     label.set_valign (Align.CENTER);
     label.set_halign (Align.START);
-    //label.set_hexpand (false);
     label.xalign = 0.0f;
     label.set_ellipsize (Pango.EllipsizeMode.END);
-    list_grid.add (label);
+    grid.attach (label, 0, 0, 1, 1);
+
+    var list_frame = new Frame (null);
+    list_frame.get_style_context ().add_class ("contact-list-frame");
+    grid.attach (list_frame, 0, 1, 1, 1);
+
+    var list_grid = new Grid ();
+    list_grid.set_size_request (315, -1);
+    list_grid.set_hexpand (false);
+    list_frame.add (list_grid);
+    list_grid.set_orientation (Orientation.VERTICAL);
 
     var toolbar = new Toolbar ();
     toolbar.get_style_context ().add_class (STYLE_CLASS_PRIMARY_TOOLBAR);
@@ -141,19 +144,18 @@ public class Contacts.LinkDialog : Dialog {
 	link_button.sensitive = contact != null;
       });
 
-    var right_grid = new Grid ();
-    right_grid.set_orientation (Orientation.VERTICAL);
-    right_grid.set_border_width (10);
-    right_grid.set_column_spacing (8);
-    grid.attach (right_grid, 1, 0, 1, 1);
-
     label = new Label (_("Currently linked:"));
     label.set_valign (Align.CENTER);
     label.set_halign (Align.START);
     label.xalign = 0.0f;
     label.set_ellipsize (Pango.EllipsizeMode.END);
-    right_grid.add (label);
+    grid.attach (label, 1, 0, 1, 1);
 
+    var right_grid = new Grid ();
+    right_grid.set_orientation (Orientation.VERTICAL);
+    right_grid.set_border_width (10);
+    right_grid.set_column_spacing (8);
+    grid.attach (right_grid, 1, 1, 1, 1);
 
     persona_grid = new Grid ();
     persona_grid.set_orientation (Orientation.VERTICAL);