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

List:       kde-commits
Subject:    aegypten_branch: kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-05-29 17:06:06
Message-ID: 20040529170606.5E451126DF () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Merge from HEAD: CVS commit by mlaurent: 

Display No


  M +12 -4     kmcomposewin.cpp   1.765.2.57
  M +10 -0     kmcomposewin.h   1.224.2.25


--- kdepim/kmail/kmcomposewin.cpp  #1.765.2.56:1.765.2.57
@@ -156,4 +156,5 @@ KMComposeWin::KMComposeWin( KMMessage *a
     mComposer( 0 )
 {
+  mSubjectTextWasSpellChecked = false;
   if (kmkernel->xmlGuiInstance())
     setInstance( kmkernel->xmlGuiInstance() );
@@ -271,5 +272,6 @@ KMComposeWin::KMComposeWin( KMMessage *a
   toolBar("htmlToolBar")->hide();
 
-
+  connect( mEdtSubject, SIGNAL( subjectTextSpellChecked() ),
+           SLOT( slotSubjectTextSpellChecked() ) );
   connect(mEdtSubject,SIGNAL(textChanged(const QString&)),
           SLOT(slotUpdWinTitle(const QString&)));
@@ -3181,4 +3183,9 @@ void KMComposeWin::toggleMarkup(bool mar
 }
 
+void KMComposeWin::slotSubjectTextSpellChecked()
+{
+  mSubjectTextWasSpellChecked = true;
+}
+
 //-----------------------------------------------------------------------------
 void KMComposeWin::slotAutoSpellCheckingToggled( bool on )
@@ -3191,5 +3198,5 @@ void KMComposeWin::slotSpellcheck()
 {
   if (mSpellCheckInProgress) return;
-
+  mSubjectTextWasSpellChecked = false;
   mSpellCheckInProgress=TRUE;
   /*
@@ -3971,4 +3978,5 @@ void KMLineEditSpell::spellCheckerCorrec
         insert( corr );
         setSelection ( pos, corr.length() );
+        emit subjectTextSpellChecked();
     }
 }
@@ -4447,5 +4455,5 @@ void KMEdit::slotSpellResult(const QStri
 void KMEdit::slotSpellDone()
 {
-    kdDebug()<<" void \
KMEdit::slotSpellDone()**********************************************\n"; +  \
kdDebug()<<" void KMEdit::slotSpellDone()\n";  KSpell::spellStatus status = \
mKSpell->status();  delete mKSpell;
@@ -4475,5 +4483,5 @@ void KMEdit::slotSpellDone()
       if( mSpellLineEdit )
           spellcheck();
-      else if( status == KSpell::FinishedNoMisspellingsEncountered )
+      else if( !mComposer->subjectTextWasSpellChecked() && status == \
KSpell::FinishedNoMisspellingsEncountered )  KMessageBox::information( \
                topLevelWidget(),
                                     i18n("No misspellings encountered.") );

--- kdepim/kmail/kmcomposewin.h  #1.224.2.24:1.224.2.25
@@ -217,4 +217,7 @@ public:
     void spellCheckerMisspelling( const QString &text, const QStringList &, unsigned \
                int pos);
     void spellCheckerCorrected( const QString &old, const QString &corr, unsigned \
int pos); +
+ signals:
+  void subjectTextSpellChecked();
 };
 
@@ -354,4 +357,8 @@ public:
 
     KMLineEditSpell *sujectLineWidget() const { return mEdtSubject;}
+  void setSubjectTextWasSpellChecked( bool _spell ) {
+    mSubjectTextWasSpellChecked = _spell;
+  }
+  bool subjectTextWasSpellChecked() const { return mSubjectTextWasSpellChecked; }
 public slots:
   /**
@@ -415,4 +422,5 @@ public slots:
   void slotSpellcheck();
   void slotSpellcheckConfig();
+  void slotSubjectTextSpellChecked();
 
   /**
@@ -798,4 +806,6 @@ private:
   }
 
+  bool mSubjectTextWasSpellChecked;
+
 private slots:
   void slotCompletionModeChanged( KGlobalSettings::Completion );


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