From kde-commits Mon Mar 24 15:59:34 2003 From: Jason Keirstead Date: Mon, 24 Mar 2003 15:59:34 +0000 To: kde-commits Subject: kdenonbeta/kopete/libkopete/ui X-MARC-Message: https://marc.info/?l=kde-commits&m=104852160705540 CVS commit by brunes: Make the email window follow your appearance settings M +25 -8 kopeteemailwindow.cpp 1.41 M +2 -0 kopeteemailwindow.h 1.29 --- kdenonbeta/kopete/libkopete/ui/kopeteemailwindow.cpp #1.40:1.41 @@ -163,4 +163,5 @@ KopeteEmailWindow::KopeteEmailWindow( Ko connect( manager, SIGNAL(messageSuccess()), this, SLOT(slotMessageSentSuccessfully()) ); + connect( KopetePrefs::prefs(), SIGNAL(messageAppearanceChanged()), this, SLOT( slotRefreshAppearance() ) ); d->sendInProgress = false; @@ -469,7 +470,5 @@ void KopeteEmailWindow::slotReadNext() d->queuePosition++; - d->htmlPart->begin(); - d->htmlPart->write( (*d->messageQueue.at( d->queuePosition - 1 )).transformMessage( model ) ); - d->htmlPart->end(); + writeMessage( (*d->messageQueue.at( d->queuePosition - 1 )) ); updateNextButton(); @@ -482,13 +481,31 @@ void KopeteEmailWindow::slotReadPrev() d->blnShowingMessage = true; - const QString model = KopetePrefs::prefs()->kindMessagesHtml(); - d->queuePosition--; - d->htmlPart->begin(); - d->htmlPart->write( (*d->messageQueue.at( d->queuePosition - 1 )).transformMessage( model ) ); - d->htmlPart->end(); + writeMessage( (*d->messageQueue.at( d->queuePosition - 1 )) ); updateNextButton(); +} + +void KopeteEmailWindow::slotRefreshAppearance() +{ + writeMessage( currentMessage() ); +} + +void KopeteEmailWindow::writeMessage( const KopeteMessage &msg ) +{ + const QString model = KopetePrefs::prefs()->kindMessagesHtml(); + + d->htmlPart->begin(); + d->htmlPart->write( QString::fromLatin1( "%8" ) + .arg( KopetePrefs::prefs()->fontFace().family() ) + .arg( KopetePrefs::prefs()->fontFace().pointSize() ) + .arg( KopetePrefs::prefs()->textColor().name() ) + .arg( KopetePrefs::prefs()->fontFace().family() ) + .arg( KopetePrefs::prefs()->fontFace().pointSize() ) + .arg( KopetePrefs::prefs()->textColor().name() ) + .arg( KopetePrefs::prefs()->bgColor().name() ) + .arg( msg.transformMessage( model ) ) ); + d->htmlPart->end(); } --- kdenonbeta/kopete/libkopete/ui/kopeteemailwindow.h #1.28:1.29 @@ -101,4 +101,5 @@ private slots: void slotMarkMessageRead(); + void slotRefreshAppearance(); private: @@ -108,4 +109,5 @@ private: void updateNextButton(); void initActions(); + void writeMessage( const KopeteMessage & ); };