Some message composer improvements.

svn path=/trunk/; revision=1382

1 files changed, 149 insertions, 148 deletions

diff --git a/widgets/e-msg-composer-address-dialog.glade b/widgets/e-msg-composer-address-dialog.glade
index 03452ea25b..2249c27daf 100644
--- a/widgets/e-msg-composer-address-dialog.glade
+++ b/widgets/e-msg-composer-address-dialog.glade
@@ -55,7 +55,7 @@
       <columns>2</columns>
       <homogeneous>False</homogeneous>
       <row_spacing>0</row_spacing>
-      <column_spacing>0</column_spacing>
+      <column_spacing>2</column_spacing>
       <child>
 	<padding>0</padding>
 	<expand>True</expand>
@@ -89,32 +89,78 @@
       </widget>
 
       <widget>
+	<class>GtkLabel</class>
+	<name>label1</name>
+	<label>Recipient list:</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+	<child>
+	  <left_attach>1</left_attach>
+	  <right_attach>2</right_attach>
+	  <top_attach>0</top_attach>
+	  <bottom_attach>1</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>True</xexpand>
+	  <yexpand>True</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+      </widget>
+
+      <widget>
 	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<homogeneous>True</homogeneous>
-	<spacing>0</spacing>
+	<name>hbox1</name>
+	<homogeneous>False</homogeneous>
+	<spacing>5</spacing>
 	<child>
 	  <left_attach>0</left_attach>
 	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
+	  <top_attach>0</top_attach>
+	  <bottom_attach>1</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>
+	  <xfill>False</xfill>
+	  <yfill>False</yfill>
 	</child>
 
 	<widget>
-	  <class>GtkButton</class>
-	  <name>button5</name>
+	  <class>GtkLabel</class>
+	  <name>label2</name>
+	  <label>Name:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0.5</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>name_entry</name>
 	  <can_focus>True</can_focus>
-	  <label>Properties...</label>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
 	  <child>
-	    <padding>10</padding>
+	    <padding>5</padding>
 	    <expand>True</expand>
 	    <fill>True</fill>
 	  </child>
@@ -122,13 +168,14 @@
 
 	<widget>
 	  <class>GtkButton</class>
-	  <name>button6</name>
+	  <name>search_button</name>
+	  <width>65</width>
 	  <can_focus>True</can_focus>
-	  <label>Add...</label>
+	  <label>Search...</label>
 	  <child>
-	    <padding>10</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
 	  </child>
 	</widget>
       </widget>
@@ -136,8 +183,6 @@
       <widget>
 	<class>GtkScrolledWindow</class>
 	<name>scrolledwindow1</name>
-	<width>200</width>
-	<height>200</height>
 	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
 	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
 	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -147,8 +192,8 @@
 	  <right_attach>1</right_attach>
 	  <top_attach>1</top_attach>
 	  <bottom_attach>2</bottom_attach>
-	  <xpad>5</xpad>
-	  <ypad>10</ypad>
+	  <xpad>0</xpad>
+	  <ypad>5</ypad>
 	  <xexpand>True</xexpand>
 	  <yexpand>True</yexpand>
 	  <xshrink>False</xshrink>
@@ -160,9 +205,11 @@
 	<widget>
 	  <class>GtkCList</class>
 	  <name>address_clist</name>
+	  <width>180</width>
+	  <height>200</height>
 	  <can_focus>True</can_focus>
 	  <columns>2</columns>
-	  <column_widths>128,80</column_widths>
+	  <column_widths>128,107</column_widths>
 	  <selection_mode>GTK_SELECTION_BROWSE</selection_mode>
 	  <show_titles>True</show_titles>
 	  <shadow_type>GTK_SHADOW_IN</shadow_type>
@@ -171,7 +218,7 @@
 	    <class>GtkLabel</class>
 	    <child_name>CList:title</child_name>
 	    <name>label5</name>
-	    <width>150</width>
+	    <width>50</width>
 	    <label>Name</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
@@ -185,7 +232,7 @@
 	    <class>GtkLabel</class>
 	    <child_name>CList:title</child_name>
 	    <name>label6</name>
-	    <width>1024</width>
+	    <width>100</width>
 	    <label>Address</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
@@ -198,6 +245,51 @@
       </widget>
 
       <widget>
+	<class>GtkHBox</class>
+	<name>hbox2</name>
+	<homogeneous>True</homogeneous>
+	<spacing>10</spacing>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>2</top_attach>
+	  <bottom_attach>3</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>
+	  <class>GtkButton</class>
+	  <name>button5</name>
+	  <can_focus>True</can_focus>
+	  <label>Properties...</label>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button6</name>
+	  <can_focus>True</can_focus>
+	  <label>Add...</label>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
+      </widget>
+
+      <widget>
 	<class>GtkTable</class>
 	<name>table2</name>
 	<rows>3</rows>
@@ -211,7 +303,7 @@
 	  <top_attach>1</top_attach>
 	  <bottom_attach>2</bottom_attach>
 	  <xpad>0</xpad>
-	  <ypad>10</ypad>
+	  <ypad>5</ypad>
 	  <xexpand>False</xexpand>
 	  <yexpand>False</yexpand>
 	  <xshrink>False</xshrink>
@@ -222,16 +314,16 @@
 
 	<widget>
 	  <class>GtkButton</class>
-	  <name>cc_add_button</name>
+	  <name>to_add_button</name>
 	  <width>60</width>
 	  <can_focus>True</can_focus>
-	  <label>Cc: -&gt;</label>
+	  <label>To: &gt;&gt;</label>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>10</xpad>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>True</yexpand>
@@ -244,16 +336,16 @@
 
 	<widget>
 	  <class>GtkButton</class>
-	  <name>to_add_button</name>
+	  <name>cc_add_button</name>
 	  <width>60</width>
 	  <can_focus>True</can_focus>
-	  <label>To: -&gt;</label>
+	  <label>Cc: &gt;&gt;</label>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>10</xpad>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>True</yexpand>
@@ -269,13 +361,13 @@
 	  <name>bcc_add_button</name>
 	  <width>60</width>
 	  <can_focus>True</can_focus>
-	  <label>Bcc: -&gt;</label>
+	  <label>Bcc: &gt;&gt;</label>
 	  <child>
 	    <left_attach>0</left_attach>
 	    <right_attach>1</right_attach>
 	    <top_attach>2</top_attach>
 	    <bottom_attach>3</bottom_attach>
-	    <xpad>10</xpad>
+	    <xpad>5</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>True</yexpand>
@@ -288,7 +380,7 @@
 
 	<widget>
 	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
+	  <name>scrolledwindow4</name>
 	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
 	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
 	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -296,9 +388,9 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>5</xpad>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>2</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>True</yexpand>
@@ -310,8 +402,8 @@
 
 	  <widget>
 	    <class>GtkCList</class>
-	    <name>to_clist</name>
-	    <width>200</width>
+	    <name>bcc_clist</name>
+	    <width>180</width>
 	    <height>100</height>
 	    <can_focus>True</can_focus>
 	    <columns>1</columns>
@@ -323,8 +415,8 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <child_name>CList:title</child_name>
-	      <name>label7</name>
-	      <label>label7</label>
+	      <name>label9</name>
+	      <label>label9</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
@@ -337,7 +429,7 @@
 
 	<widget>
 	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow4</name>
+	  <name>scrolledwindow2</name>
 	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
 	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
 	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
@@ -345,9 +437,9 @@
 	  <child>
 	    <left_attach>1</left_attach>
 	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>5</xpad>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>2</xpad>
 	    <ypad>0</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>True</yexpand>
@@ -359,8 +451,8 @@
 
 	  <widget>
 	    <class>GtkCList</class>
-	    <name>bcc_clist</name>
-	    <width>200</width>
+	    <name>to_clist</name>
+	    <width>180</width>
 	    <height>100</height>
 	    <can_focus>True</can_focus>
 	    <columns>1</columns>
@@ -372,8 +464,8 @@
 	    <widget>
 	      <class>GtkLabel</class>
 	      <child_name>CList:title</child_name>
-	      <name>label9</name>
-	      <label>label9</label>
+	      <name>label7</name>
+	      <label>label7</label>
 	      <justify>GTK_JUSTIFY_CENTER</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
@@ -396,8 +488,8 @@
 	    <right_attach>2</right_attach>
 	    <top_attach>1</top_attach>
 	    <bottom_attach>2</bottom_attach>
-	    <xpad>5</xpad>
-	    <ypad>10</ypad>
+	    <xpad>2</xpad>
+	    <ypad>4</ypad>
 	    <xexpand>True</xexpand>
 	    <yexpand>True</yexpand>
 	    <xshrink>False</xshrink>
@@ -409,7 +501,7 @@
 	  <widget>
 	    <class>GtkCList</class>
 	    <name>cc_clist</name>
-	    <width>200</width>
+	    <width>180</width>
 	    <height>100</height>
 	    <can_focus>True</can_focus>
 	    <columns>1</columns>
@@ -433,98 +525,6 @@
 	  </widget>
 	</widget>
       </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Recipient list:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>5</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>False</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label2</name>
-	  <label>Name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>5</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>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>5</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>search_button</name>
-	  <width>65</width>
-	  <can_focus>True</can_focus>
-	  <label>Search...</label>
-	  <child>
-	    <padding>5</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
     </widget>
 
     <widget>
@@ -548,6 +548,7 @@
 	<class>GtkButton</class>
 	<name>button1</name>
 	<can_default>True</can_default>
+	<has_default>True</has_default>
 	<can_focus>True</can_focus>
 	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
       </widget>