wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some string cleanups.

Browse Source 
svn path=/branches/KDE/3.5/kdepim/; revision=614050
wilder-work
Allen Winter 20 years ago
parent a0ea69d827
commit 356a4abf14
3 changed files with 32 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      customtemplates.cpp
  2. 12
      kmmainwidget.cpp
  3. 43
      templatesconfiguration.cpp

20
customtemplates.cpp
Unescape View File

@ -91,20 +91,18 @@ CustomTemplates::CustomTemplates( QWidget *parent, const char *name )
QString help =
i18n( "<qt>"
"<p>There you can add, edit and delete custom message "
"templates used when you "
"compose an answer to message sender or to all recipients "
"of original message, or forward message with using "
"custom template by selecting it from right mouse button "
"menu or toolbar menu. Also you can bind a keyboard combination to "
"template for faster operations.</p>"
"<p>Inside message templates you can use substitution commands "
"<p>Here you can add, edit, and delete custom message "
"templates to use when you compose a reply or forwarding message. "
"Create the custom template by selecting it using the right mouse "
" button menu or toolbar menu. Also, you can bind a keyboard "
"combination to the template for faster operations.</p>"
"<p>Message templates support substitution commands "
"by simple typing them or selecting them from menu "
"<i>Insert command</i>.</p>"
"<p>There are four types of custom templates: used only to "
"<i>Reply</i>, <i>Reply to All</i>, <i>Forward</i> message, and "
"<p>There are four types of custom templates: used to "
"<i>Reply</i>, <i>Reply to All</i>, <i>Forward</i>, and "
"<i>Universal</i> which can be used for all kind of operations. "
"You can`t bind keyboard shortcut to <i>Universal</i> templates.</p>"
"You cannot bind keyboard shortcut to <i>Universal</i> templates.</p>"
"</qt>" );
mHelp->setText( i18n( "<a href=\"whatsthis:%1\">How does this work?</a>" ).arg( help ) );
}

12
kmmainwidget.cpp
Unescape View File

@ -2436,7 +2436,7 @@ void KMMainWidget::updateCustomTemplateMenus()
delete mCustomForwardMapper;
mCustomForwardActionMenu =
new KActionMenu( i18n("Forward with template"),
new KActionMenu( i18n("Forward with custom template"),
"mail_custom_forward",
actionCollection(), "custom_forward" );
QSignalMapper *mCustomForwardMapper = new QSignalMapper( this );
@ -2445,7 +2445,7 @@ void KMMainWidget::updateCustomTemplateMenus()
mForwardActionMenu->insert( mCustomForwardActionMenu );
mCustomReplyActionMenu =
new KActionMenu( i18n("Reply with template"), "mail_custom_reply",
new KActionMenu( i18n("Reply with custom template"), "mail_custom_reply",
actionCollection(), "custom_reply" );
QSignalMapper *mCustomReplyMapper = new QSignalMapper( this );
connect( mCustomReplyMapper, SIGNAL( mapped( int ) ),
@ -2453,7 +2453,7 @@ void KMMainWidget::updateCustomTemplateMenus()
mReplyActionMenu->insert( mCustomReplyActionMenu );
mCustomReplyAllActionMenu =
new KActionMenu( i18n("Reply to All with template"),
new KActionMenu( i18n("Reply to All with custom template"),
"mail_custom_reply_all",
actionCollection(), "custom_reply_all" );
QSignalMapper *mCustomReplyAllMapper = new QSignalMapper( this );
@ -2548,15 +2548,15 @@ void KMMainWidget::updateCustomTemplateMenus()
++idx;
}
if ( !replyc ) {
mCustomReplyActionMenu->popupMenu()->insertItem( i18n( "(no templates)" ), 0 );
mCustomReplyActionMenu->popupMenu()->insertItem( i18n( "(no custom templates)" ), 0 );
mCustomReplyActionMenu->popupMenu()->setItemEnabled( 0, false );
}
if ( !replyallc ) {
mCustomReplyAllActionMenu->popupMenu()->insertItem( i18n( "(no templates)" ), 0 );
mCustomReplyAllActionMenu->popupMenu()->insertItem( i18n( "(no custom templates)" ), 0 );
mCustomReplyAllActionMenu->popupMenu()->setItemEnabled( 0, false );
}
if ( !forwardc ) {
mCustomForwardActionMenu->popupMenu()->insertItem( i18n( "(no templates)" ), 0 );
mCustomForwardActionMenu->popupMenu()->insertItem( i18n( "(no custom templates)" ), 0 );
mCustomForwardActionMenu->popupMenu()->setItemEnabled( 0, false );
}

43
templatesconfiguration.cpp
Unescape View File

@ -68,46 +68,37 @@ TemplatesConfiguration::TemplatesConfiguration( QWidget *parent, const char *nam
if ( QString( name ) == "folder-templates" ) {
help =
i18n( "<qt>"
"<p>There you can input message templates used when you "
"compose new message, compose answer to message sender or to "
"all recipients mentioned in original message, or when you "
"forward message.</p>"
"<p>Inside message templates you can use substitution commands "
"<p>Here you can create message templates to use when you "
"compose new messages or replies, or when you forward messages.</p>"
"<p>The message templates support substitution commands "
"by simple typing them or selecting them from menu "
"<i>Insert command</i>.</p>"
"<p>Templates specified there are folder-specific. "
"<p>Templates specified here are folder-specific. "
"They override both global templates and per-identity "
"templates.</p>"
"<p>Templates specified there are folder-specific. "
"They override both global templates and per-identity "
"templates.</p>"
"templates if they are specified.</p>"
"</qt>" );
} else if ( QString( name ) == "identity-templates" ) {
help =
i18n( "<qt>"
"<p>There you can input message templates used when you "
"compose new message, compose answer to message sender or to "
"all recipients mentioned in original message, or when you "
"forward message.</p>"
"<p>Inside message templates you can use substitution commands "
"<p>Here you can create message templates to use when you "
"compose new messages or replies, or when you forward messages.</p>"
"<p>The message templates support substitution commands "
"by simple typing them or selecting them from menu "
"<i>Insert command</i>.</p>"
"<p>Templates specified there are mail identity-wide. "
"They override global templates and being overriden by per-folder "
"They override global templates and per-folder "
"templates if they are specified.</p>"
"</qt>" );
} else {
help =
i18n( "<qt>"
"<p>There you can input message templates used when you "
"compose new message, compose answer to message sender or to "
"all recipients mentioned in original message, or when you "
"forward message.</p>"
"<p>Inside message templates you can use substitution commands "
"<p>Here you can create message templates to use when you "
"compose new messages or replies, or when you forward messages.</p>"
"<p>The message templates support substitution commands "
"by simple typing them or selecting them from menu "
"<i>Insert command</i>.</p>"
"<p>This is global (default) templates. They can be overriden "
"by per-identity templates and by per-folder templates "
"<p>This is a global (default) template. They override "
"both per-identity templates and by per-folder templates "
"if they are specified.</p>"
"</qt>" );
}
@ -311,7 +302,7 @@ void TemplatesConfiguration::loadFromFolder( QString id, uint identity )
void TemplatesConfiguration::saveToFolder( QString id )
{
Templates t( id );
t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) );
t.setTemplateReply( strOrBlank( textEdit_reply->text() ) );
t.setTemplateReplyAll( strOrBlank( textEdit_reply_all->text() ) );
@ -369,7 +360,7 @@ void TemplatesConfiguration::loadFromPhrases()
}
}
void TemplatesConfiguration::importFromPhrases()
void TemplatesConfiguration::importFromPhrases()
{
kdDebug() << "TemplatesConfiguration::importFromPhrases()" << endl;
@ -428,7 +419,7 @@ void TemplatesConfiguration::importFromPhrases()
GlobalSettings::self()->writeConfig();
}
QString TemplatesConfiguration::convertPhrases( QString &str )
QString TemplatesConfiguration::convertPhrases( QString &str )
{
QString result;
QChar ch;

Write Preview
Loading…
Cancel
Save