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

List:       kde-commits
Subject:    KDE/kdepim
From:       Laurent Montel <montel () kde ! org>
Date:       2008-01-18 9:18:04
Message-ID: 1200647884.304568.28959.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 762923 by mlaurent:

Reactivate specific color for highlighter


 M  +11 -9     kmail/kmcomposereditor.cpp  
 M  +2 -0      kmail/kmcomposereditor.h  
 M  +7 -0      libkdepim/kmeditor.cpp  
 M  +3 -1      libkdepim/kmeditor.h  


--- trunk/KDE/kdepim/kmail/kmcomposereditor.cpp #762922:762923
@@ -35,6 +35,16 @@
 KMComposerEditor::KMComposerEditor( KMComposeWin *win,QWidget *parent)
  :KMeditor(parent),m_composerWin(win)
 {
+  switchTextMode( false );
+  mHtmlMode = false;
+}
+
+KMComposerEditor::~KMComposerEditor()
+{
+}
+
+void KMComposerEditor::changeHighlighterColors(KPIM::KEMailQuotingHighlighter * highlighter)
+{
   QColor defaultColor1( 0x00, 0x80, 0x00 ); // defaults from kmreaderwin.cpp
   QColor defaultColor2( 0x00, 0x70, 0x00 );
   QColor defaultColor3( 0x00, 0x60, 0x00 );
@@ -52,17 +62,9 @@
   QColor col3 = readerConfig.readEntry( "QuotedText2", defaultColor2  );
   QColor col4 = readerConfig.readEntry( "QuotedText1", defaultColor1  );
   QColor misspelled = readerConfig.readEntry( "MisspelledColor", c  );
-  //TODO add it
-  //static_cast<KPIM::KEMailQuotingHighlighter*>(highlighter())->setQuoteColor(col1, col2, col3, col4);
-
-  switchTextMode( false );
-  mHtmlMode = false;
+  highlighter->setQuoteColor(col1, col2, col3, col4);
 }
 
-KMComposerEditor::~KMComposerEditor()
-{
-}
-
 QString KMComposerEditor::smartQuote( const QString & msg )
 {
   return m_composerWin->smartQuote(msg);
--- trunk/KDE/kdepim/kmail/kmcomposereditor.h #762922:762923
@@ -54,6 +54,8 @@
      */
     QString text();
 
+    virtual void changeHighlighterColors(KPIM::KEMailQuotingHighlighter * highlighter);
+
   private:
      KMComposeWin *m_composerWin;
      bool mHtmlMode;
--- trunk/KDE/kdepim/libkdepim/kmeditor.cpp #762922:762923
@@ -316,6 +316,9 @@
 {
   KPIM::KEMailQuotingHighlighter *emailHighLighter =
       new KPIM::KEMailQuotingHighlighter( this );
+
+  changeHighlighterColors(emailHighLighter);
+
   connect( emailHighLighter, SIGNAL( newSuggestions(const QString&,const QStringList&) ),
            this, SLOT( addSuggestion(const QString&,const QStringList&) ) );
 
@@ -323,6 +326,10 @@
   setHighlighter( emailHighLighter );
 }
 
+void KMeditor::changeHighlighterColors(KPIM::KEMailQuotingHighlighter *)
+{
+}
+
 void KMeditor::setUseExternalEditor( bool use )
 {
   d->useExtEditor = use;
--- trunk/KDE/kdepim/libkdepim/kmeditor.h #762922:762923
@@ -36,7 +36,7 @@
 namespace KPIM {
 
 class KMeditorPrivate;
-
+class KEMailQuotingHighlighter;
 class KDEPIM_EXPORT KMeditor : public KTextEdit
 {
   Q_OBJECT
@@ -66,6 +66,8 @@
 
     virtual void createHighlighter();
 
+    virtual void changeHighlighterColors(KEMailQuotingHighlighter*);
+
     //Redefine it for each apps
     virtual QString quotePrefixName() const; //define by kmail
     virtual QString smartQuote( const QString & msg ); //need by kmail
[prev in list] [next in list] [prev in thread] [next in thread]