From 1cb6d79063c889975ee90a36a0fa203e1d17af63 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 18 Jun 2014 11:09:33 +0200 Subject: Bug 731721 - Reorder junk filtering configuration UI --- mail/e-mail-junk-options.c | 2 - mail/mail-config.ui | 389 +++++++++++++++++++++------------------------ 2 files changed, 182 insertions(+), 209 deletions(-) diff --git a/mail/e-mail-junk-options.c b/mail/e-mail-junk-options.c index 02f4acdf7e..d4ec7b87e8 100644 --- a/mail/e-mail-junk-options.c +++ b/mail/e-mail-junk-options.c @@ -292,8 +292,6 @@ mail_junk_options_constructed (GObject *object) list_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); - /* Label + combo box has a 12px left margin so it's - * aligned with the junk mail options above it. */ widget = gtk_label_new (_("Junk filtering software:")); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); gtk_widget_set_margin_left (widget, 12); diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 38364fb3c9..a788ea5606 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2660,19 +2660,37 @@ - + True False - 12 + 7 + 4 + + + Check incoming _messages for junk + True + True + False + True + 0 + True + + + 0 + 1 + GTK_FILL + + 12 + + - + True False - 7 - 3 + 4 - - Check incoming _messages for junk + + _Delete junk messages True True False @@ -2681,212 +2699,167 @@ True - GTK_FILL - - 4 + False + False + 0 - + True False - 4 + model2 - - _Delete junk messages - True - True - False - True - 0 - True - - - False - False - 0 - - - - - True - False - model2 - - - - 0 - - - - - False - False - 1 - + + + 0 + - 1 - 2 - GTK_FILL - 4 + False + False + 1 + + + 1 + 2 + GTK_FILL + 12 + + + + + True + False + 0 + 12 + Just Test Options + + + + + + 2 + 3 + GTK_FILL + + 0 + + + + + Do not mar_k messages as junk if sender is in my address book + True + True + False + True + 0 + True + + + 3 + 4 + GTK_FILL + + 12 + + + + + _Lookup in local address book only + True + True + False + True + 0 + True + + + 4 + 5 + GTK_FILL + + 24 + + + + + Check cu_stom headers for junk + True + True + False + True + 0 + True + + + 5 + 6 + GTK_FILL + + 12 + + + + + True + False + 6 - - Check cu_stom headers for junk + True True - False - True - 0 - True - - - 2 - 3 - GTK_FILL - - 4 - - - - - True - False - 6 + in - + True True - in - - - True - True - - - - - - - - True - True - 0 - - - - - True - False - 6 - start - - - _Add - True - True - True - True - False - True - - - False - False - 0 - - - - - _Remove - True - True - True - True - False - True - - - False - False - 1 - + + - - False - True - 1 - - 3 - 4 - 22 - - - - - Do not mar_k messages as junk if sender is in my address book - True - True - False - True - 0 - True - - - 4 - 5 - GTK_FILL - - 4 - - - - - _Lookup in local address book only - True - True - False - True - 0 - True - - - 5 - 6 - GTK_FILL - - 25 + True + True + 0 - + True False 6 + start - + + _Add True - False - dialog-information + True + True + True + False + True False - True + False 0 - + + _Remove True - False - Option is ignored if a match for custom junk headers is found. + True + True + True + False + True False @@ -2895,48 +2868,50 @@ + + False + True + 1 + + + 6 7 - GTK_FILL + 12 + + + True + False + 6 + 6 - - True - False - 12 - 6 - - - - - - - - - - - - - - - - - - 7 - 8 - GTK_FILL - + + + + + + + + + + + + + + + 7 + 8 + GTK_FILL + 0 + 12 + - - True - True - 1 - -- cgit v1.2.3