Update of /cvsroot/mahogany/M/src/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28568/src/modules
Modified Files:
Filters.cpp
Log Message:
cosmetic fixes to the filtering progress dialog
Index: Filters.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Filters.cpp,v
retrieving revision 1.200
retrieving revision 1.201
diff -b -u -2 -r1.200 -r1.201
--- Filters.cpp 1 Jul 2005 17:48:36 -0000 1.200
+++ Filters.cpp 9 Jul 2005 23:48:53 -0000 1.201
@@ -2796,9 +2796,9 @@
wxString::Format
(
- _("Filtering %u messages in folder '%s'..."),
+ _("Filtering %u messages in folder \"%s\":"),
m_msgs.GetCount(),
m_parent->m_MailFolder->GetName().c_str()
),
- _T("\n\n"), // must be tall enough for 3 lines
+ _T("\n\n\n"), // must be tall enough for 4 lines
2*m_msgs.GetCount(),
frame
@@ -2936,7 +2936,5 @@
String FilterRuleApply::CreditsForDialog()
{
- // TODO: make the format of the string inside the parentheses
- // configurable
-
+ // TODO: make the format of the string inside the parentheses configurable
String textPD;
@@ -2945,6 +2943,5 @@
textPD = CreditsCommon();
- // make a multiline label for the progress dialog and a more concise
- // one for the status bar
+ // make multiline label for the progress dialog
if( !TreatAsJunk() )
{
@@ -2953,6 +2950,6 @@
GetSenderSubject(from, subject, true /* full */);
- textPD << _T('\n') << _("From: ") << from
- << _T('\n') << _("Subject: ") << subject;
+ textPD << _T("\n\t") << _("From: ") << from
+ << _T("\n\t") << _("Subject: ") << subject;
}
}
@@ -3003,9 +3000,9 @@
String FilterRuleApply::ResultsMessage()
{
- String textExtra;
+ String textResult;
if ( !m_retval.IsNumber() )
{
- textExtra << _("error!");
+ textResult << _("error!");
}
else // filter executed ok
@@ -3014,5 +3011,5 @@
if ( !gs_spamTest.empty() )
{
- textExtra += String::Format
+ textResult += String::Format
(
_("recognized as spam (%s); "),
@@ -3026,18 +3023,18 @@
if ( !m_parent->m_copiedTo.empty() )
{
- textExtra << (wasDeleted ? _("moved to ") : _("copied to "))
+ textResult << (wasDeleted ? _("moved to ") : _("copied to "))
<< m_parent->m_copiedTo;
}
else if ( wasDeleted )
{
- textExtra << _("deleted");
+ textResult << _("deleted");
}
else // not moved/copied/deleted
{
- textExtra << _("done");
+ textResult << _("done");
}
}
- return textExtra;
+ return textResult;
}
@@ -3052,15 +3049,12 @@
// and show the result in the progress dialog
- String textExtra = ResultsMessage();
+ String textResult = ResultsMessage();
- textLog += _T(" - ") + textExtra;
+ textLog += _T(" - ") + textResult;
if ( m_pd )
{
- if( !TreatAsJunk() )
- textPD += _T(" - ");
- else
- textPD += _T('\n');
- textPD += textExtra;
+ textPD += _("\nResult: ");
+ textPD += textResult;
if ( !m_pd->Update(m_idx, textPD) )
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
