[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeutils/kgpg
From:       Rolf Eike Beer <kde () opensource ! sf-tec ! de>
Date:       2011-07-27 16:10:51
Message-ID: 20110727161051.99E75AC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1243405 by dakon:

fix email template being cluttered with HTML tags

 M  +1 -1      conf_misc.ui  
 M  +9 -0      kgpgoptions.cpp  
 M  +2 -0      kgpgoptions.h  


--- trunk/KDE/kdeutils/kgpg/conf_misc.ui #1243404:1243405
@@ -346,7 +346,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
-           <widget class="KTextEdit" name="kcfg_EmailTemplate">
+           <widget class="KTextEdit" name="EmailTemplateEdit">
             <property name="whatsThis">
              <string>This is the text of the email sent by the &quot;Sign and Mail \
User ID&quot; action.  
--- trunk/KDE/kdeutils/kgpg/kgpgoptions.cpp #1243404:1243405
@@ -59,6 +59,8 @@
 	   m_model(model),
 	   m_combomodel(new KeyListProxyModel(this, \
KeyListProxyModel::SingleColumnIdFirst))  {
+	m_page7->EmailTemplateEdit->setPlainText(KGpgSettings::emailTemplate());
+
 	m_combomodel->setKeyModel(m_model);
 	m_combomodel->setTrustFilter(KgpgCore::TRUST_MARGINAL);
 	m_combomodel->sort(0);
@@ -298,6 +300,8 @@
 {
 	alwaysKeyID = KgpgInterface::getGpgSetting(QLatin1String( "encrypt-to" ), \
KGpgSettings::gpgConfigPath());  
+	m_page7->EmailTemplateEdit->setPlainText(KGpgSettings::emailTemplate());
+
 	m_encrypttoalways = !alwaysKeyID.isEmpty();
 	m_defaultencrypttoalways = false;
 
@@ -359,6 +363,8 @@
 
 void kgpgOptions::updateWidgetsDefault()
 {
+	m_page7->EmailTemplateEdit->setPlainText(m_emailTemplate);
+
 	m_page1->encrypt_to_always->setChecked(m_defaultencrypttoalways);
 	m_page4->use_agent->setChecked(m_defaultuseagent);
 
@@ -482,6 +488,9 @@
 	m_mailUats = m_page7->kcfg_MailUats->currentIndex();
 	KGpgSettings::setMailUats(m_mailUats);
 
+	m_emailTemplate = m_page7->EmailTemplateEdit->toPlainText();
+	KGpgSettings::setEmailTemplate(m_emailTemplate);
+
 	KGpgSettings::self()->writeConfig();
 	m_config->sync();
 
--- trunk/KDE/kdeutils/kgpg/kgpgoptions.h #1243404:1243405
@@ -18,6 +18,7 @@
 #define KGPGOPTIONS_H
 
 #include <QPixmap>
+#include <QString>
 
 #include <KConfigDialog>
 
@@ -157,6 +158,7 @@
     bool m_showsystray;
     int m_trayaction;
     int m_mailUats;
+    QString m_emailTemplate;
 
     KGpgItemModel * const m_model;
     KeyListProxyModel * const m_combomodel;


[prev in list] [next in list] [prev in thread] [next in thread]