change layout slightly, the icon no longer pushes everything to the left,

2001-06-25  Chris Toshok  <toshok@ximian.com>

	* gui/contact-list-editor/contact-list-editor.glade: change layout
	slightly, the icon no longer pushes everything to the left, and
	make the buttons on the right smaller and more in line with the
	other widgets.

	* gui/contact-list-editor/e-contact-list-model.c
	(contact_list_value_at): return the SimpleAndString->string
	instead of querying the ecardsimple.
	(e_contact_list_model_init): initially allocate 10 of each type
	(email and simple).
	(e_contact_list_model_add_email): realloc if need be.
	(e_contact_list_model_add_card): same, and initialize the string
	displayed to be "[Name] [<email>]".
	(e_contact_list_model_remove_row): change for SimpleAndString.
	(contact_list_model_destroy): free our 2 arrays.

	* gui/contact-list-editor/e-contact-list-model.h: add alloc counts
	and the SimpleAndString struct.

	* gui/contact-list-editor/e-contact-list-editor.c: Helix Code =>
	Ximian.
	(e_contact_list_editor_init): hook up d&d destination signals, and
	un-#if 0 the delete_event signal.
	(table_drag_motion_cb): new function.
	(table_drag_drop_cb): new function.
	(table_drag_data_received_cb): new function.
	(file_close_cb): new function.
	(verbs) uncomment the close verb.
	(close_dialog): new function.
	(app_delete_event_cb): new function.

	* gui/contact-list-editor/e-contact-list-editor.h: Helix Code =>
	Ximian.

svn path=/trunk/; revision=10494

1 files changed, 88 insertions, 94 deletions

diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
index 56317384f3..51b7c1a877 100644
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ b/addressbook/gui/contact-list-editor/contact-list-editor.glade
@@ -41,7 +41,7 @@
       <name>table1</name>
       <border_width>13</border_width>
       <rows>6</rows>
-      <columns>4</columns>
+      <columns>3</columns>
       <homogeneous>False</homogeneous>
       <row_spacing>5</row_spacing>
       <column_spacing>5</column_spacing>
@@ -55,8 +55,8 @@
 	<int2>0</int2>
 	<last_modification_time>Sat, 23 Jun 2001 06:00:16 GMT</last_modification_time>
 	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
+	  <left_attach>0</left_attach>
+	  <right_attach>2</right_attach>
 	  <top_attach>4</top_attach>
 	  <bottom_attach>6</bottom_attach>
 	  <xpad>0</xpad>
@@ -79,8 +79,8 @@
 	<text_max_length>0</text_max_length>
 	<text></text>
 	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
+	  <left_attach>0</left_attach>
+	  <right_attach>2</right_attach>
 	  <top_attach>3</top_attach>
 	  <bottom_attach>4</bottom_attach>
 	  <xpad>0</xpad>
@@ -105,8 +105,8 @@
 	<xpad>0</xpad>
 	<ypad>0</ypad>
 	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
+	  <left_attach>0</left_attach>
+	  <right_attach>2</right_attach>
 	  <top_attach>2</top_attach>
 	  <bottom_attach>3</bottom_attach>
 	  <xpad>0</xpad>
@@ -121,20 +121,13 @@
       </widget>
 
       <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>List Name:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
+	<class>GtkHSeparator</class>
+	<name>hseparator1</name>
 	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
+	  <left_attach>0</left_attach>
+	  <right_attach>3</right_attach>
+	  <top_attach>1</top_attach>
+	  <bottom_attach>2</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
 	  <xexpand>False</xexpand>
@@ -142,48 +135,20 @@
 	  <xshrink>False</xshrink>
 	  <yshrink>False</yshrink>
 	  <xfill>True</xfill>
-	  <yfill>False</yfill>
+	  <yfill>True</yfill>
 	</child>
       </widget>
 
       <widget>
-	<class>GtkEntry</class>
-	<name>list-name-entry</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
+	<class>GtkVBox</class>
+	<name>vbox1</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
 	<child>
 	  <left_attach>2</left_attach>
 	  <right_attach>3</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVButtonBox</class>
-	<name>vbuttonbox2</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
-	<spacing>10</spacing>
-	<child_min_width>85</child_min_width>
-	<child_min_height>27</child_min_height>
-	<child_ipad_x>7</child_ipad_x>
-	<child_ipad_y>0</child_ipad_y>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
 	  <top_attach>4</top_attach>
-	  <bottom_attach>6</bottom_attach>
+	  <bottom_attach>5</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
 	  <xexpand>False</xexpand>
@@ -197,44 +162,25 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>remove-button</name>
-	  <can_default>True</can_default>
 	  <can_focus>True</can_focus>
 	  <label>Remove</label>
 	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
 	</widget>
       </widget>
 
       <widget>
-	<class>GtkHSeparator</class>
-	<name>hseparator1</name>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVButtonBox</class>
-	<name>vbuttonbox3</name>
-	<layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	<spacing>10</spacing>
-	<child_min_width>85</child_min_width>
-	<child_min_height>27</child_min_height>
-	<child_ipad_x>0</child_ipad_x>
-	<child_ipad_y>0</child_ipad_y>
+	<class>GtkVBox</class>
+	<name>vbox2</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
 	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
+	  <left_attach>2</left_attach>
+	  <right_attach>3</right_attach>
 	  <top_attach>3</top_attach>
 	  <bottom_attach>4</bottom_attach>
 	  <xpad>0</xpad>
@@ -250,26 +196,27 @@
 	<widget>
 	  <class>GtkButton</class>
 	  <name>add-email-button</name>
-	  <can_default>True</can_default>
 	  <can_focus>True</can_focus>
 	  <label>Add</label>
 	  <relief>GTK_RELIEF_NORMAL</relief>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
 	</widget>
       </widget>
 
       <widget>
-	<class>Custom</class>
-	<name>custom2</name>
-	<creation_function>e_create_image_widget</creation_function>
-	<string1>evolution-contacts-plain.png</string1>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Sat, 23 Jun 2001 05:59:21 GMT</last_modification_time>
+	<class>GtkHBox</class>
+	<name>hbox1</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
 	<child>
 	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
+	  <right_attach>2</right_attach>
 	  <top_attach>0</top_attach>
-	  <bottom_attach>6</bottom_attach>
+	  <bottom_attach>1</bottom_attach>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
 	  <xexpand>False</xexpand>
@@ -279,6 +226,53 @@
 	  <xfill>True</xfill>
 	  <yfill>True</yfill>
 	</child>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>custom3</name>
+	  <creation_function>e_create_image_widget</creation_function>
+	  <string1>evolution-contacts-plain.png</string1>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Sat, 23 Jun 2001 05:59:21 GMT</last_modification_time>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label3</name>
+	  <label>List Name:</label>
+	  <justify>GTK_JUSTIFY_LEFT</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>list-name-entry</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
       </widget>
     </widget>
   </widget>