From ab382e96118f91b2722146dd7c0163042bd46c73 Mon Sep 17 00:00:00 2001
From: Boby Wang <boby.wang@sun.com>
Date: Mon, 20 Mar 2006 06:18:45 +0000
Subject: ** Fix for bug #268584

2006-03-20  Boby Wang <boby.wang@sun.com>

        ** Fix for bug #268584

        * e-msg-composer-attachment.glade:
        * e-msg-composer-select-file.c: (get_selector):
        set the accelerate key for "Suggest Suggest automatic display of
        attachment"

svn path=/trunk/; revision=31721
---
 composer/ChangeLog                       |  9 +++++++++
 composer/e-msg-composer-attachment.glade | 29 +++++++++++++++++++++++++----
 composer/e-msg-composer-select-file.c    |  4 ++--
 3 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'composer')

diff --git a/composer/ChangeLog b/composer/ChangeLog
index e786c66347..335f434904 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-20  Boby Wang <boby.wang@sun.com>
+
+	** Fix for bug #268584
+	
+	* e-msg-composer-attachment.glade:
+	* e-msg-composer-select-file.c: (get_selector):
+	set the accelerate key for "Suggest Suggest automatic display of
+	attachment"
+
 2006-02-16  Rohini S  <srohini@novell.com>
 
 	** Fixes bug #324742
diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade
index dc228eef70..fc7a1a9324 100644
--- a/composer/e-msg-composer-attachment.glade
+++ b/composer/e-msg-composer-attachment.glade
@@ -12,6 +12,12 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
@@ -34,6 +40,7 @@
 	      <property name="label">gtk-cancel</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">-6</property>
 	    </widget>
 	  </child>
@@ -46,6 +53,7 @@
 	      <property name="label">gtk-ok</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>
 	    </widget>
 	  </child>
@@ -76,7 +84,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
+	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -98,7 +106,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
+	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -123,6 +131,10 @@
 	      <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>
@@ -147,6 +159,10 @@
 	      <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>
@@ -171,6 +187,10 @@
 	      <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>
@@ -191,7 +211,7 @@
 	      <property name="max_length">0</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
-	      <property name="invisible_char" translatable="yes">*</property>
+	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
 	    </widget>
 	    <packing>
@@ -207,9 +227,10 @@
 	    <widget class="GtkCheckButton" id="disposition_checkbox">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Suggest automatic display of attachment</property>
+	      <property name="label" translatable="yes">_Suggest automatic display of attachment</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
index 3774c8949e..97b686ef7e 100644
--- a/composer/e-msg-composer-select-file.c
+++ b/composer/e-msg-composer-select-file.c
@@ -94,7 +94,7 @@ get_selector(struct _EMsgComposer *composer, const char *title, guint32 flags)
 		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), path);
 	
         if (flags & SELECTOR_SHOW_INLINE) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
+		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
 		gtk_widget_show (showinline);
 		gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline);
 		g_object_set_data((GObject *)selection, "show-inline", showinline);
@@ -114,7 +114,7 @@ get_selector(struct _EMsgComposer *composer, const char *title, guint32 flags)
 	}
 	
         if (flags & SELECTOR_SHOW_INLINE) {
-		showinline = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));
+		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
 		gtk_widget_show (showinline);
 		gtk_box_pack_end (GTK_BOX (GTK_FILE_SELECTION (selection)->main_vbox), showinline, FALSE, FALSE, 4);
 		g_object_set_data((GObject *)selection, "show-inline", showinline);
-- 
cgit