diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-mailer-prefs.c | 5 | ||||
| -rw-r--r-- | mail/mail-config.glade | 264 |
3 files changed, 228 insertions, 48 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d2b7461fb8..d0cfe3a972 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-05-20 Radek Doulik <rodo@ximian.com> + + * em-mailer-prefs.c (em_mailer_prefs_construct): remove "use + daemon" handling code + + Fixes #56909 + 2004-05-20 Not Zed <NotZed@Ximian.com> ** See #58388. diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index ff85c36c3a..ebb1742d05 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -955,11 +955,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs) toggle_button_init (prefs, prefs->sa_local_tests_only, FALSE, "/apps/evolution/mail/junk/sa/local_only", G_CALLBACK (toggle_button_toggled)); - - prefs->sa_use_daemon = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkSAUseDaemon")); - toggle_button_init (prefs, prefs->sa_use_daemon, FALSE, - "/apps/evolution/mail/junk/sa/use_daemon", - G_CALLBACK (toggle_button_toggled)); } GtkWidget * diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 3e9fa8922b..6af147cd34 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -11,6 +11,11 @@ <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_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GnomeDruid" id="druid"> @@ -153,6 +158,11 @@ Click "Apply" to save your settings.</property> <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_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkNotebook" id="account_editor_notebook"> @@ -668,6 +678,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Add Ne_w Signature...</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <signal name="clicked" handler="sigAddNewClicked"/> </widget> <packing> @@ -787,6 +798,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Make this my default account</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> @@ -1218,6 +1230,7 @@ For example: "Work" or "Personal"</property> <property name="browse_dialog_title" translatable="yes">Mailbox location</property> <property name="directory_entry">False</property> <property name="modal">False</property> + <property name="use_filechooser">False</property> <child internal-child="entry"> <widget class="GtkEntry" id="source_path"> @@ -1589,6 +1602,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes"> Ch_eck for Supported Types </property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -1612,6 +1626,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Re_member password</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> @@ -1766,6 +1781,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Automatically check for _new mail every</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> @@ -2183,6 +2199,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Ser_ver requires authentication</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> @@ -2630,6 +2647,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Ch_eck for Supported Types </property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -2672,6 +2690,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Remember _password</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> @@ -2954,6 +2973,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-revert-to-saved</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -3102,6 +3122,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Alway_s carbon-copy (cc) to:</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> @@ -3217,6 +3238,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Always _blind carbon-copy (bcc) to:</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> @@ -3510,6 +3532,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Always _sign outgoing messages when using this account</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> @@ -3528,6 +3551,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Don't sign _meeting requests (for Outlook compatibility)</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> @@ -3546,6 +3570,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Al_ways encrypt to myself when sending encrypted mail</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -3564,6 +3589,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Always _trust keys in my keyring when encrypting</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> @@ -3716,6 +3742,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">A_lso encrypt to self when sending encrypted mail</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> @@ -3737,6 +3764,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Encrypt outgoing messages (by default)</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> @@ -3758,6 +3786,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Digitally sign outgoing messages (by default)</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> @@ -3848,6 +3877,7 @@ For example: "Work" or "Personal"</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment28"> @@ -3856,6 +3886,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox175"> @@ -3919,6 +3953,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-clear</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -3948,6 +3983,7 @@ For example: "Work" or "Personal"</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment29"> @@ -3956,6 +3992,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox176"> @@ -4019,6 +4059,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-clear</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -4093,6 +4134,11 @@ For example: "Work" or "Personal"</property> <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_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkHBox" id="toplevel"> @@ -4135,6 +4181,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-add</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -4145,6 +4192,7 @@ For example: "Work" or "Personal"</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment33"> @@ -4153,6 +4201,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox224"> @@ -4213,6 +4265,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-remove</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -4238,6 +4291,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">De_fault</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -4250,6 +4304,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">E_nable</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -4277,6 +4332,11 @@ For example: "Work" or "Personal"</property> <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_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkNotebook" id="toplevel"> @@ -4371,6 +4431,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Use the same fonts as other applications</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> @@ -4425,6 +4486,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -4446,6 +4508,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -4601,6 +4664,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Mark messages as read after</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> @@ -4672,6 +4736,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Highlight _quotations with</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -4690,6 +4755,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -4907,6 +4973,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Empty trash folders on e_xit</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> @@ -4945,6 +5012,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Confirm _when expunging a folder</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> @@ -5061,6 +5129,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Do not notify me when new mail arrives</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="active">True</property> <property name="inconsistent">False</property> <property name="draw_indicator">True</property> @@ -5079,6 +5148,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Beep w_hen new mail arrives</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> @@ -5098,6 +5168,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Play sound file when new mail arri_ves</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> @@ -5145,6 +5216,7 @@ For example: "Work" or "Personal"</property> <property name="browse_dialog_title" translatable="yes">Execute Command...</property> <property name="directory_entry">False</property> <property name="modal">False</property> + <property name="use_filechooser">False</property> <child internal-child="entry"> <widget class="GtkEntry" id="txtNotifyPlaySound"> @@ -5296,6 +5368,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Show animated images</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> @@ -5314,6 +5387,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Prompt when sending HTML messages to contacts that don't want them</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> @@ -5406,6 +5480,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Never load images from the Internet</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> @@ -5424,6 +5499,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Load images if sender is in address book</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> @@ -5443,6 +5519,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Always load images from the Internet</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> @@ -5572,6 +5649,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -5590,6 +5668,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -5608,6 +5687,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -5626,6 +5706,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -5644,6 +5725,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="left_attach">1</property> @@ -5778,6 +5860,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-revert-to-saved</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -5964,6 +6047,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-add</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -5979,6 +6063,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-remove</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -6031,13 +6116,13 @@ For example: "Work" or "Personal"</property> <property name="border_width">12</property> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="spacing">18</property> <child> <widget class="GtkVBox" id="vbox192"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <widget class="GtkLabel" id="label526"> @@ -6064,7 +6149,7 @@ For example: "Work" or "Personal"</property> <widget class="GtkHBox" id="hbox213"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="spacing">0</property> <child> <widget class="GtkLabel" id="label545"> @@ -6088,32 +6173,49 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GtkTable" id="table36"> + <widget class="GtkHBox" id="hbox225"> <property name="visible">True</property> - <property name="n_rows">1</property> - <property name="n_columns">1</property> <property name="homogeneous">False</property> - <property name="row_spacing">2</property> - <property name="column_spacing">6</property> + <property name="spacing">0</property> + + <child> + <widget class="GtkLabel" id="label571"> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> <child> <widget class="GtkCheckButton" id="chkCheckIncomingMail"> <property name="visible">True</property> <property name="tooltip" translatable="yes">Checks incoming mail messages to be Junk</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Check _Incoming Mail</property> + <property name="label" translatable="yes">Check _incoming mail for junk</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> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> @@ -6142,7 +6244,7 @@ For example: "Work" or "Personal"</property> <widget class="GtkVBox" id="vbox195"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <widget class="GtkLabel" id="label532"> @@ -6166,15 +6268,15 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GtkHBox" id="hbox217"> + <widget class="GtkHBox" id="hbox226"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="spacing">0</property> <child> - <widget class="GtkLabel" id="label544"> + <widget class="GtkLabel" id="label572"> <property name="visible">True</property> - <property name="label" translatable="yes"></property> + <property name="label" translatable="yes"> </property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -6193,28 +6295,49 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GtkFrame" id="frameFilterOptions"> + <widget class="GtkVBox" id="vbox204"> <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkCheckButton" id="chkSALocalTestsOnly"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">I_nclude remote tests</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> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> <child> - <widget class="GtkVBox" id="vbox198"> + <widget class="GtkHBox" id="hbox228"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="spacing">0</property> <child> - <widget class="GtkCheckButton" id="chkSALocalTestsOnly"> + <widget class="GtkLabel" id="label575"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Local Tests Only</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> @@ -6224,15 +6347,18 @@ For example: "Work" or "Personal"</property> </child> <child> - <widget class="GtkCheckButton" id="chkSAUseDaemon"> + <widget class="GtkLabel" id="label574"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Use _Daemon</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> + <property name="label" translatable="yes"><small>This will make the the filter more reliable, but slower</small></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> </widget> <packing> <property name="padding">0</property> @@ -6241,12 +6367,17 @@ For example: "Work" or "Personal"</property> </packing> </child> </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> </widget> @@ -6299,6 +6430,11 @@ For example: "Work" or "Personal"</property> <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_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkNotebook" id="toplevel"> @@ -6393,6 +6529,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Format messages in _HTML</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> @@ -6411,6 +6548,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Automatically _insert smiley images</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> @@ -6462,6 +6600,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">1</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hboxReplyStyle"> @@ -6770,6 +6912,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Prompt when sending messages with an empty subject line</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> @@ -6788,6 +6931,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Pr_ompt when sending messages with only Bcc recipients defined</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> @@ -6982,6 +7126,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-add</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> @@ -6991,6 +7136,7 @@ For example: "Work" or "Personal"</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <signal name="clicked" handler="cmdSignatureAddScriptClicked"/> <child> @@ -7000,6 +7146,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox223"> @@ -7057,6 +7207,7 @@ For example: "Work" or "Personal"</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <child> <widget class="GtkAlignment" id="alignment31"> @@ -7065,6 +7216,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox222"> @@ -7124,6 +7279,7 @@ For example: "Work" or "Personal"</property> <property name="label">gtk-remove</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> </child> </widget> @@ -7459,6 +7615,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">_Enable</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -7569,6 +7726,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Check spelling while I _type</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> @@ -7615,6 +7773,7 @@ For example: "Work" or "Personal"</property> <property name="dither">True</property> <property name="use_alpha">False</property> <property name="title" translatable="yes">Pick a color</property> + <property name="focus_on_click">True</property> </widget> <packing> <property name="padding">0</property> @@ -7686,6 +7845,11 @@ For example: "Work" or "Personal"</property> <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_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <child> <widget class="GtkVBox" id="toplevel"> @@ -7819,6 +7983,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -7840,6 +8005,7 @@ For example: "Work" or "Personal"</property> <property name="show_size">True</property> <property name="use_font_in_label">False</property> <property name="label_font_size">14</property> + <property name="focus_on_click">True</property> <signal name="font_set" handler="changed"/> </widget> <packing> @@ -7883,6 +8049,11 @@ For example: "Work" or "Personal"</property> <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_NORMAL</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> <property name="has_separator">False</property> <child internal-child="vbox"> @@ -7902,6 +8073,7 @@ For example: "Work" or "Personal"</property> <property name="can_default">True</property> <property name="can_focus">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> <property name="response_id">0</property> <child> @@ -7911,6 +8083,10 @@ For example: "Work" or "Personal"</property> <property name="yalign">0.5</property> <property name="xscale">0</property> <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> <child> <widget class="GtkHBox" id="hbox221"> @@ -7970,6 +8146,7 @@ For example: "Work" or "Personal"</property> <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">0</property> </widget> </child> @@ -8135,6 +8312,7 @@ for display purposes only. </property> <property name="max_saved">10</property> <property name="directory_entry">False</property> <property name="modal">False</property> + <property name="use_filechooser">False</property> <child internal-child="entry"> <widget class="GtkEntry" id="combo-entry2"> |