File kmail_revert_krichtext-r809981.diff of Package kdepim4

Overview Repositories Revisions Requests Users Attributes Meta

File kmail_revert_krichtext-r809981.diff of Package kdepim4 (Revision ec8529b5d5ddd95e7cc1264cd4188fef)

Currently displaying revision ec8529b5d5ddd95e7cc1264cd4188fef , Show latest

Index: kmail/kmcomposerui.rc
===================================================================
--- kmail/kmcomposerui.rc	(revision 809981)
+++ kmail/kmcomposerui.rc	(revision 809980)
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui ><kpartgui version="395" name="kmcomposer" >
+<!DOCTYPE kpartgui ><kpartgui version="393" name="kmcomposer" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;Message</text>
@@ -99,21 +99,18 @@
   <Action name="sign_message" />
   <Action name="encrypt_message" />
  </ToolBar>
- <ToolBar noMerge="1" newline="true" hidden="true" enable="0" name="htmlToolBar" iconText="icononly" ><text>HTML Toolbar</text>
-  <Action name="format_list_style" />
-  <Action name="format_font_family" />
-  <Action name="format_font_size" />
+ <ToolBar noMerge="1" newline="true" hidden="true" enable="0" name="htmlToolBar" ><text>HTML Toolbar</text>
+  <Action name="text_list" />
+  <Action name="text_font" />
+  <Action name="text_size" />
   <Action name="format_reset" />
-  <Action name="format_text_bold" />
-  <Action name="format_text_italic" />
-  <Action name="format_text_underline" />
-  <Action name="format_text_strikeout" />
-  <Action name="format_text_foreground_color" />
-  <Action name="format_align_left" />
-  <Action name="format_align_center" />
-  <Action name="format_align_right" />
-  <Action name="format_list_indent_more"/>
-  <Action name="format_list_indent_less"/>
+  <Action name="text_bold" />
+  <Action name="text_italic" />
+  <Action name="text_under" />
+  <Action name="format_color" />
   <Action name="manage_link" />
+  <Action name="align_left" />
+  <Action name="align_center" />
+  <Action name="align_right" />
  </ToolBar>
 </kpartgui>
Index: kmail/messagecomposer.cpp
===================================================================
--- kmail/messagecomposer.cpp	(revision 809981)
+++ kmail/messagecomposer.cpp	(revision 809980)
@@ -470,7 +470,7 @@ void MessageComposer::readFromComposeWin
   if ( mAutoCharset ) {
     QByteArray charset =
       KMMsgBase::autoDetectCharset( mCharset, KMMessage::preferredCharsets(),
-                                    mComposeWin->mEditor->textOrHtml() );
+                                    mComposeWin->mEditor->textOrHTML() );
     if ( charset.isEmpty() ) {
       KMessageBox::sorry( mComposeWin,
                           i18n( "No suitable encoding could be found for "
@@ -2167,7 +2167,7 @@ QByteArray MessageComposer::breakLinesAn
   QString text;
 
   if( mDisableBreaking || mIsRichText || !GlobalSettings::self()->wordWrap() ) {
-    text = mComposeWin->mEditor->textOrHtml();
+    text = mComposeWin->mEditor->textOrHTML();
   } else {
     text = mComposeWin->mEditor->toWrappedPlainText();
   }
Index: kmail/kmcomposewin.h
===================================================================
--- kmail/kmcomposewin.h	(revision 809981)
+++ kmail/kmcomposewin.h	(revision 809980)
@@ -29,6 +29,7 @@
 #include <QList>
 #include <QPalette>
 #include <QPointer>
+#include <QTextListFormat>
 
 // KDE includes
 #include <kglobalsettings.h>
@@ -444,7 +445,7 @@ class KMComposeWin : public KMail::Compo
 
     void slotCleanSpace();
     void slotToggleMarkup();
-    void slotTextModeChanged( KRichTextEdit::Mode );
+    void slotTextModeChanged( KPIM::KMeditor::Mode );
     void htmlToolBarVisibilityChanged( bool visible );
     void slotSpellcheckDoneClearStatus();
 
@@ -466,6 +467,10 @@ class KMComposeWin : public KMail::Compo
     void slotAttachFileData( KIO::Job *, const QByteArray & );
     void slotAttachFileResult( KJob * );
 
+    void slotAlignLeft();
+    void slotAlignCenter();
+    void slotAlignRight();
+    void fontChanged( const QFont & );
     void slotCursorPositionChanged();
 
     void slotSpellCheckingStatus( const QString & status );
@@ -737,8 +742,15 @@ class KMComposeWin : public KMail::Compo
     KToggleAction *mWordWrapAction, *mFixedFontAction, *mAutoSpellCheckingAction;
     KToggleAction *mDictionaryAction, *mSnippetAction;
 
-    KToggleAction *markupAction;
-    KAction *actionFormatReset;
+    KPIM::KMStyleListSelectAction *listAction;
+    KFontAction *fontAction;
+    KFontSizeAction *fontSizeAction;
+    KToggleAction *alignLeftAction, *alignCenterAction, *alignRightAction;
+    KToggleAction *textBoldAction, *textItalicAction, *textUnderAction;
+    KToggleAction *plainTextAction, *markupAction;
+    KAction *actionFormatColor, *actionFormatReset;
+    KAction *actionConfigureLink;
+    KAction *mHtmlToolbar;
 
     KSelectAction *mEncodingAction;
     KSelectAction *mCryptoModuleAction;
Index: kmail/kmcomposewin.cpp
===================================================================
--- kmail/kmcomposewin.cpp	(revision 809981)
+++ kmail/kmcomposewin.cpp	(revision 809980)
@@ -31,6 +31,7 @@
 
 // LIBKDEPIM includes
 #include <libkdepim/kaddrbookexternal.h>
+#include <libkdepim/kmstylelistselectaction.h>
 #include <libkdepim/recentaddresses.h>
 
 using KPIM::RecentAddresses;
@@ -84,6 +85,8 @@ using KPIM::DictionaryComboBox;
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kfiledialog.h>
+#include <kfontaction.h>
+#include <kfontsizeaction.h>
 #include <kinputdialog.h>
 #include <kmenu.h>
 #include <kmimetypetrader.h>
@@ -369,7 +372,7 @@ KMComposeWin::KMComposeWin( KMMessage *a
     setMsg( aMsg );
   }
   mRecipientsEditor->setFocus();
-  mEditor->updateActionStates(); // set toolbar buttons to correct values
+  fontChanged( mEditor->currentFont() ); // set toolbar buttons to correct values
 
   mDone = true;
 }
@@ -1105,7 +1108,7 @@ void KMComposeWin::setupActions( void )
   connect( mActLaterMenu, SIGNAL(aboutToShow()), this,
            SLOT(getTransportMenu()) );
 
-  KAction *action = new KAction( KIcon( "document-save" ), i18n("Save as &Draft"), this );
+  QAction *action = new KAction( KIcon( "document-save" ), i18n("Save as &Draft"), this );
   actionCollection()->addAction("save_in_drafts", action );
   connect( action, SIGNAL(triggered(bool) ), SLOT(slotSaveDraft()) );
 
@@ -1225,8 +1228,8 @@ void KMComposeWin::setupActions( void )
   mEncodingAction->setItems( encodings );
   mEncodingAction->setCurrentItem( -1 );
 
-  connect( mEditor, SIGNAL( textModeChanged( KRichTextEdit::Mode ) ),
-           this, SLOT( slotTextModeChanged( KRichTextEdit::Mode ) ) );
+  connect( mEditor, SIGNAL( textModeChanged( KPIM::KMeditor::Mode ) ),
+           this, SLOT( slotTextModeChanged( KPIM::KMeditor::Mode ) ) );
 
   //these are checkable!!!
   markupAction = new KToggleAction( i18n("Formatting (HTML)"), this );
@@ -1370,18 +1373,61 @@ void KMComposeWin::setupActions( void )
       Kleo::stringToCryptoMessageFormat( ident.preferredCryptoMessageFormat() ) ) );
   slotSelectCryptoModule( true );
 
+
+  listAction = new KMStyleListSelectAction( i18n("Select Style"), this );
+  actionCollection()->addAction( "text_list", listAction );
+
+  connect( listAction, SIGNAL( applyStyle(QTextListFormat::Style) ),
+           mEditor, SLOT( slotChangeParagStyle(QTextListFormat::Style) ) );
+  fontAction = new KFontAction(i18n("Select Font"), this);
+  actionCollection()->addAction("text_font", fontAction );
+  connect( fontAction, SIGNAL( triggered( const QString& ) ),
+           mEditor, SLOT( slotFontFamilyChanged( const QString& ) ) );
+  fontSizeAction = new KFontSizeAction(i18n("Select Size"), this);
+  actionCollection()->addAction("text_size", fontSizeAction );
+  connect( fontSizeAction, SIGNAL( fontSizeChanged( int ) ),
+           mEditor, SLOT( slotFontSizeChanged( int ) ) );
+  alignLeftAction = new KToggleAction( KIcon( "format-justify-left" ), i18n("Align Left"), this );
+  alignLeftAction->setIconText( i18n("Left") );
+  actionCollection()->addAction( "align_left", alignLeftAction );
+  connect( alignLeftAction, SIGNAL( triggered(bool) ), SLOT( slotAlignLeft() ) );
+  alignLeftAction->setChecked( true );
+  alignRightAction = new KToggleAction( KIcon( "format-justify-right" ), i18n("Align Right"), this );
+  alignRightAction->setIconText( i18n("Right") );
+  actionCollection()->addAction( "align_right", alignRightAction );
+  connect( alignRightAction, SIGNAL( triggered(bool) ), SLOT( slotAlignRight() ) );
+  alignCenterAction = new KToggleAction( KIcon( "format-justify-center" ), i18n("Align Center"), this );
+  alignCenterAction->setIconText( i18n("Center") );
+  actionCollection()->addAction( "align_center", alignCenterAction );
+  connect( alignCenterAction, SIGNAL( triggered(bool) ), SLOT( slotAlignCenter() ) );
+  textBoldAction = new KToggleAction( KIcon( "format-text-bold" ), i18n("&Bold"), this );
+  actionCollection()->addAction( "text_bold", textBoldAction );
+  connect( textBoldAction, SIGNAL( triggered(bool) ),
+           mEditor, SLOT( slotTextBold(bool) ) );
+  textBoldAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_B ) );
+  textItalicAction = new KToggleAction( KIcon( "format-text-italic" ), i18n("&Italic"), this );
+  actionCollection()->addAction( "text_italic", textItalicAction );
+  connect( textItalicAction, SIGNAL( triggered(bool) ),
+           mEditor, SLOT( slotTextItalic(bool) ) );
+  textItalicAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_I ) );
+  textUnderAction = new KToggleAction( KIcon( "format-text-underline" ), i18n("&Underline"), this );
+  actionCollection()->addAction( "text_under", textUnderAction );
+  connect( textUnderAction, SIGNAL( triggered(bool) ),
+           mEditor, SLOT( slotTextUnder(bool) ) );
+  textUnderAction->setShortcut( QKeySequence( Qt::CTRL + Qt::Key_U ) );
   actionFormatReset = new KAction( KIcon( "draw-eraser" ), i18n("Reset Font Settings"), this );
   actionFormatReset->setIconText( i18n("Reset Font") );
   actionCollection()->addAction( "format_reset", actionFormatReset );
   connect( actionFormatReset, SIGNAL(triggered(bool) ), SLOT( slotFormatReset() ) );
-
-  mEditor->setRichTextSupport( KRichTextWidget::FullTextFormattingSupport |
-                               KRichTextWidget::FullListSupport |
-                               KRichTextWidget::SupportAlignment |
-                               KRichTextWidget::SupportRuleLine |
-                               KRichTextWidget::SupportHyperlinks |
-                               KRichTextWidget::SupportAlignment );
-  mEditor->createActions( actionCollection() );
+  actionFormatColor = new KAction( KIcon( "format-stroke-color" ), i18n("Text Color..."), this );
+  actionFormatColor->setIconText( i18n("Text Color") );
+  actionCollection()->addAction("format_color", actionFormatColor );
+  connect( actionFormatColor, SIGNAL(triggered(bool) ),mEditor, SLOT( slotTextColor() ));
+  actionConfigureLink = new KAction( KIcon( "insert-link" ), i18n("Manage Link..."), this );
+  actionConfigureLink->setIconText( i18nc("Short toolbar text for the \"Manage Link...\" action", "Link") );
+  actionCollection()->addAction( "manage_link", actionConfigureLink );
+  connect( actionConfigureLink, SIGNAL( triggered(bool) ),
+           mEditor, SLOT( slotConfigureLink() ) );
 
   createGUI( "kmcomposerui.rc" );
   connect( toolBar( "htmlToolBar" )->toggleViewAction(),
@@ -1419,6 +1465,8 @@ void KMComposeWin::setupEditor( void )
   // Font setup
   slotUpdateFont();
 
+  connect( mEditor, SIGNAL( currentFontChanged( const QFont & ) ),
+           this, SLOT( fontChanged( const QFont & ) ) );
   connect( mEditor, SIGNAL( cursorPositionChanged() ),
            this, SLOT( slotCursorPositionChanged() ) );
   slotCursorPositionChanged();
@@ -3799,15 +3847,19 @@ void KMComposeWin::enableHtml()
     toolBar( "htmlToolBar" )->show();
   if ( !markupAction->isChecked() )
     markupAction->setChecked( true );
-
+  // set buttons in correct position
+  fontChanged( mEditor->currentFont() ); 
   mSaveFont = mEditor->currentFont();
-  mEditor->updateActionStates();
+  bool _bold = textBoldAction->isChecked();
+  bool _italic = textItalicAction->isChecked();
+  textBoldAction->setChecked( _bold );
+  textItalicAction->setChecked( _italic );
 }
 
 //-----------------------------------------------------------------------------
 void KMComposeWin::disableHtml()
 {
-  mEditor->toPlainText();
+  mEditor->switchToPlainText();
   slotUpdateFont();
   if ( toolBar( "htmlToolBar" )->isVisible() )
     toolBar( "htmlToolBar" )->hide();
@@ -4130,14 +4182,89 @@ void KMComposeWin::slotSetAlwaysSend( bo
   mAlwaysSend = bAlways;
 }
 
+void KMComposeWin::slotAlignLeft()
+{
+  mEditor->slotAlignLeft();
+  alignCenterAction->setChecked( false );
+  alignRightAction->setChecked( false );
+}
+
+void KMComposeWin::slotAlignCenter()
+{
+  mEditor->slotAlignCenter();
+  alignLeftAction->setChecked( false );
+  alignRightAction->setChecked( false );
+}
+
+void KMComposeWin::slotAlignRight()
+{
+  mEditor->setAlignment( Qt::AlignRight );
+  alignLeftAction->setChecked( false );
+  alignCenterAction->setChecked( false );
+}
+
 void KMComposeWin::slotFormatReset()
 {
-  mEditor->setTextForegroundColor( mForeColor );
-  mEditor->setFont( mSaveFont );
+  mEditor->setColor( mForeColor );
+  mEditor->setFont( mSaveFont ); // fontChanged is called now
+}
+
+void KMComposeWin::fontChanged( const QFont &f )
+{
+  QFont fontTemp = f;
+  fontTemp.setBold( true );
+  fontTemp.setItalic( true );
+  QFontInfo fontInfo( fontTemp );
+
+  if ( fontInfo.bold() ) {
+    textBoldAction->setChecked( f.bold() );
+    textBoldAction->setEnabled( true ) ;
+  } else {
+    textBoldAction->setEnabled( false );
+  }
+
+  if ( fontInfo.italic() ) {
+    textItalicAction->setChecked( f.italic() );
+    textItalicAction->setEnabled( true );
+  } else {
+    textItalicAction->setEnabled( false );
+  }
+
+  textUnderAction->setChecked( f.underline() );
+
+  fontAction->setFont( f.family() );
+  fontSizeAction->setFontSize( f.pointSize() );
 }
 
 void KMComposeWin::slotCursorPositionChanged()
 {
+  // Update alignment action states
+  switch ( mEditor->alignment() )
+  {
+    case Qt::AlignLeft :
+      alignLeftAction->setChecked( true );
+      alignCenterAction->setChecked( false );
+      alignRightAction->setChecked( false );
+      break;
+    case Qt::AlignHCenter :
+      alignLeftAction->setChecked( false );
+      alignCenterAction->setChecked( true );
+      alignRightAction->setChecked( false );
+      break;
+    case Qt::AlignRight :
+      alignLeftAction->setChecked( false );
+      alignCenterAction->setChecked( false );
+      alignRightAction->setChecked( true );
+      break;
+  }
+
+  // Update list style action state
+  QTextList *list = mEditor->textCursor().currentList();
+  if ( list )
+    listAction->setCurrentStyle( list->format().style() );
+  else
+    listAction->setCurrentStyle( QTextListFormat::ListStyleUndefined );
+
   // Change Line/Column info in status bar
   int col, line;
   QString temp;
Index: knode/kncomposerview.cpp
===================================================================
--- knode/kncomposerview.cpp	(revision 809981)
+++ knode/kncomposerview.cpp	(revision 809980)
@@ -91,7 +91,7 @@ KNComposer::ComposerView::ComposerView(
 
   //Editor
   e_dit=new KNComposerEditor(this);
-  e_dit->toPlainText();
+  e_dit->switchToPlainText();
   e_dit->setMinimumHeight(50);
 
   QVBoxLayout *notL=new QVBoxLayout(e_dit);
Index: libkdepim/kmeditor.cpp
===================================================================
--- libkdepim/kmeditor.cpp	(revision 809981)
+++ libkdepim/kmeditor.cpp	(revision 809980)
@@ -3,6 +3,7 @@
  *
  * Copyright 2007 Laurent Montel <montel@kde.org>
  * Copyright 2008 Thomas McGuire <thomas.mcguire@gmx.net>
+ * Copyright 2008 Stephen Kelly  <steveire@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,14 +25,22 @@
 #include "kemailquotinghighter.h"
 
 #include "kmutils.h"
+#include "klinkdialog.h"
 #include <maillistdrag.h>
 
 //kdepimlibs includes
 #include <kpimidentities/signature.h>
 
 //kdelibs includes
+#include <kdebug.h>
 #include <kdeversion.h>
+#include <kfind.h>
+#include <kreplace.h>
+#include <kreplacedialog.h>
+#include <kfinddialog.h>
 #include <KWindowSystem>
+#include <KFindDialog>
+#include <KColorDialog>
 #include <KFileDialog>
 #include <KComboBox>
 #include <KToolBar>
@@ -49,9 +58,13 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QShortcut>
+#include <QPointer>
 #include <QTextCodec>
+#include <QTextList>
+#include <QTextDocumentFragment>
 #include <QAction>
 #include <QProcess>
+#include <QTextLayout>
 #include <QTimer>
 
 //system includes
@@ -67,7 +80,9 @@ class KMeditorPrivate
        useExtEditor( false ),
        mExtEditorProcess( 0 ),
        mExtEditorTempFileWatcher( 0 ),
-       mExtEditorTempFile( 0 )    {
+       mExtEditorTempFile( 0 ),
+       mMode( KMeditor::Plain )
+    {
     }
 
     ~KMeditorPrivate()
@@ -85,10 +100,21 @@ class KMeditorPrivate
     // Normal functions
     //
 
+    // If the text under the cursor is a link, the cursor's selection is set to
+    // the complete link text.
+    void selectLinkText( QTextCursor *cursor ) const;
+
     QString addQuotesToText( const QString &inputText );
     QString removeQuotesFromText( const QString &inputText ) const;
     void init();
 
+    // Switches to rich text mode and emits the mode changed signal if the
+    // mode really changed.
+    void activateRichText();
+
+    // Applies formatting to the current word if there is no selection.
+    void mergeFormatOnWordOrSelection( const QTextCharFormat &format );
+
     // Returns the text of the signature. If the signature is HTML, the HTML
     // tags will be stripped.
     QString plainSignatureText( const KPIMIdentities::Signature &signature ) const;
@@ -111,12 +137,22 @@ class KMeditorPrivate
     QProcess *mExtEditorProcess;
     KDirWatch *mExtEditorTempFileWatcher;
     KTemporaryFile *mExtEditorTempFile;
+    KMeditor::Mode mMode;
 };
 
 }
 
 using namespace KPIM;
 
+void KMeditorPrivate::activateRichText()
+{
+  if ( mMode == KMeditor::Plain ) {
+    q->setAcceptRichText( true );
+    mMode = KMeditor::Rich;
+    emit q->textModeChanged( mMode );
+  }
+}
+
 QList< QPair<int,int> > KMeditorPrivate::signaturePositions( const KPIMIdentities::Signature &sig ) const
 {
   QList< QPair<int,int> > signaturePositions;
@@ -210,6 +246,15 @@ void KMeditorPrivate::ensureCursorVisibl
   static_cast<KTextEdit*>( q )->ensureCursorVisible();
 }
 
+void KMeditorPrivate::mergeFormatOnWordOrSelection( const QTextCharFormat &format )
+{
+  QTextCursor cursor = q->textCursor();
+  if ( !cursor.hasSelection() )
+    cursor.select( QTextCursor::WordUnderCursor );
+  cursor.mergeCharFormat( format );
+  q->mergeCurrentCharFormat( format );
+}
+
 void KMeditor::dragEnterEvent( QDragEnterEvent *e )
 {
   if ( KPIM::MailList::canDecode( e->mimeData() ) ) {
@@ -319,13 +364,13 @@ void KMeditor::keyPressEvent ( QKeyEvent
 }
 
 KMeditor::KMeditor( const QString& text, QWidget *parent )
- : KRichTextWidget( text, parent ), d( new KMeditorPrivate( this ) )
+ : KTextEdit( text, parent ), d( new KMeditorPrivate( this ) )
 {
   d->init();
 }
 
 KMeditor::KMeditor( QWidget *parent )
- : KRichTextWidget( parent ), d( new KMeditorPrivate( this ) )
+ : KTextEdit( parent ), d( new KMeditorPrivate( this ) )
 {
   d->init();
 }
@@ -400,6 +445,68 @@ void KMeditor::setExternalEditorPath( co
   d->extEditorPath = path;
 }
 
+
+void KMeditor::slotChangeParagStyle( QTextListFormat::Style _style )
+{
+  QTextCursor cursor = textCursor();
+  cursor.beginEditBlock();
+
+  // Create a list with the specified format
+  if ( _style != QTextListFormat::ListStyleUndefined ) {
+
+    QTextBlockFormat blockFmt = cursor.blockFormat();
+    QTextListFormat listFmt;
+
+    if ( cursor.currentList() ) {
+      listFmt = cursor.currentList()->format();
+    } else {
+      listFmt.setIndent( blockFmt.indent() + 1 );
+      blockFmt.setIndent( 0 );
+      cursor.setBlockFormat( blockFmt );
+    }
+
+    listFmt.setStyle( _style );
+
+    cursor.createList( listFmt );
+    d->activateRichText();
+  }
+
+  // Remove the list formatting again
+  else {
+    QTextList *list = cursor.currentList();
+    if ( list ) {
+
+      QTextListFormat listFormat = list->format();
+      listFormat.setIndent( 0 );
+      list->setFormat( listFormat );
+
+      int count = list->count();
+      while ( count > 0 ) {
+        list->removeItem( 0 );
+        count--;
+      }
+    }
+  }
+
+  cursor.endEditBlock();
+  setFocus();
+}
+
+void KMeditor::setColor( const QColor& col )
+{
+  QTextCharFormat fmt;
+  fmt.setForeground( col );
+  d->mergeFormatOnWordOrSelection( fmt );
+  d->activateRichText();
+}
+
+void KMeditor::setFont( const QFont &font )
+{
+  QTextCharFormat fmt;
+  fmt.setFont( font );
+  d->mergeFormatOnWordOrSelection( fmt );
+}
+
 void KMeditor::setFontForWholeText( const QFont &font )
 {
   QTextCharFormat fmt;
@@ -410,6 +517,78 @@ void KMeditor::setFontForWholeText( cons
   document()->setDefaultFont( font );
 }
 
+void KMeditor::slotAlignLeft()
+{
+  setAlignment( Qt::AlignLeft );
+  d->activateRichText();
+}
+
+void KMeditor::slotAlignCenter()
+{
+  setAlignment( Qt::AlignHCenter );
+  d->activateRichText();
+}
+
+void KMeditor::slotAlignRight()
+{
+  setAlignment( Qt::AlignRight );
+  d->activateRichText();
+}
+
+void KMeditor::slotTextBold( bool _b )
+{
+  QTextCharFormat fmt;
+  fmt.setFontWeight( _b ? QFont::Bold : QFont::Normal );
+  d->mergeFormatOnWordOrSelection( fmt );
+  d->activateRichText();
+}
+
+void KMeditor::slotTextItalic( bool _b)
+{
+  QTextCharFormat fmt;
+  fmt.setFontItalic( _b );
+  d->mergeFormatOnWordOrSelection( fmt );
+  d->activateRichText();
+}
+
+void KMeditor::slotTextUnder( bool _b )
+{
+  QTextCharFormat fmt;
+  fmt.setFontUnderline( _b );
+  d->mergeFormatOnWordOrSelection( fmt );
+  d->activateRichText();
+}
+
+void KMeditor::slotTextColor()
+{
+  QColor color = textColor();
+
+  if ( KColorDialog::getColor( color, this ) ) {
+    QTextCharFormat fmt;
+    fmt.setForeground( color );
+    d->mergeFormatOnWordOrSelection( fmt );
+    d->activateRichText();
+  }
+}
+
+void KMeditor::slotFontFamilyChanged( const QString &f )
+{
+  QTextCharFormat fmt;
+  fmt.setFontFamily( f );
+  d->mergeFormatOnWordOrSelection( fmt );
+  setFocus();
+  d->activateRichText();
+}
+
+void KMeditor::slotFontSizeChanged( int size )
+{
+  QTextCharFormat fmt;
+  fmt.setFontPointSize( size );
+  d->mergeFormatOnWordOrSelection( fmt );
+  setFocus();
+  d->activateRichText();
+}
+
 KUrl KMeditor::insertFile( const QStringList &encodingLst, QString &encodingStr )
 {
   KUrl url;
@@ -682,6 +861,7 @@ void KMeditor::killExternalEditor()
   d->mExtEditorTempFile = 0;
 }
 
+
 void KMeditor::setCursorPositionFromStart( unsigned int pos )
 {
   if ( pos > 0 )
@@ -883,7 +1063,7 @@ void KMeditor::insertSignature( const QS
     document()->setModified( isModified );
 
     if ( isHtml )
-      enableRichTextMode();
+      d->activateRichText();
   }
 }
 
@@ -933,7 +1113,7 @@ void KMeditor::replaceSignature( const K
     if ( newSig.isInlinedHtml() &&
          newSig.type() == KPIMIdentities::Signature::Inlined ) {
       cursor.insertHtml( newSig.rawText() );
-      enableRichTextMode();
+      d->activateRichText();
     }
     else
       cursor.insertText( newSig.rawText() );
@@ -944,6 +1124,35 @@ void KMeditor::replaceSignature( const K
   cursor.endEditBlock();
 }
 
+void KMeditor::switchToPlainText()
+{
+  if ( d->mMode == Rich ) {
+    d->mMode = Plain;
+    // TODO: Warn the user about this?
+    document()->setPlainText( document()->toPlainText() );
+    setAcceptRichText( false );
+    emit textModeChanged( d->mMode );
+  }
+}
+
+void KMeditor::enableRichTextMode()
+{
+  d->activateRichText();
+}
+
+KMeditor::Mode KMeditor::textMode() const
+{
+  return d->mMode;
+}
+
+QString KMeditor::textOrHTML() const
+{
+  if ( textMode() == Rich )
+    return toHtml();
+  else
+    return toPlainText();
+}
+
 void KMeditor::setSpellCheckLanguage( const QString &language )
 {
   if ( KTextEdit::highlighter() ) {
@@ -1023,4 +1232,102 @@ void KMeditor::ensureCursorVisible()
   QTimer::singleShot( 500, this, SLOT( ensureCursorVisibleDelayed() ) );
 }
 
+QString KMeditor::currentLinkText() const
+{
+    QTextCursor cursor = textCursor();
+    d->selectLinkText(&cursor);
+    return cursor.selectedText();
+}
+
+void KMeditorPrivate::selectLinkText(QTextCursor *cursor) const
+{
+     // If the cursor is on a link, select the text of the link.
+    if (cursor->charFormat().isAnchor()) {
+        QString aHref = cursor->charFormat().anchorHref();
+
+        // Move cursor to start of link
+        while (cursor->charFormat().anchorHref() == aHref) {
+            if (cursor->atStart())
+                break;
+            cursor->setPosition(cursor->position() - 1);
+        }
+        if (cursor->charFormat().anchorHref() != aHref)
+            cursor->setPosition(cursor->position() + 1, QTextCursor::KeepAnchor);
+
+        // Move selection to the end of the link
+        while (cursor->charFormat().anchorHref() == aHref) {
+            if (cursor->atEnd())
+                break;
+            cursor->setPosition(cursor->position() + 1, QTextCursor::KeepAnchor);
+        }
+        if (cursor->charFormat().anchorHref() != aHref)
+            cursor->setPosition(cursor->position() - 1, QTextCursor::KeepAnchor);
+    }
+}
+
+QString KMeditor::currentLinkUrl() const
+{
+    return textCursor().charFormat().anchorHref();
+}
+
+void KMeditor::slotConfigureLink()
+{
+    QTextCursor cursor = textCursor();
+    cursor.beginEditBlock();
+    QTextCharFormat format = cursor.charFormat();
+
+    d->selectLinkText(&cursor);
+    if (!cursor.hasSelection()) {
+        cursor.select(QTextCursor::WordUnderCursor);
+    }
+
+    setTextCursor(cursor);
+    KLinkDialog *linkDialog = new KLinkDialog(this);
+    linkDialog->setLinkText(cursor.selectedText());
+    linkDialog->setLinkUrl(format.anchorHref());
+
+    if (linkDialog->exec()) {
+        if (!linkDialog->linkUrl().isEmpty()) {
+            format.setAnchor(true);
+            format.setAnchorHref(linkDialog->linkUrl());
+        }
+        else {
+            format = cursor.block().charFormat();
+            format.setAnchor(false);
+            format.setAnchorHref(QString());
+        }
+
+        QString linkText;
+
+        int lowPos = qMin(cursor.selectionStart(), cursor.selectionEnd());
+        if (!linkDialog->linkText().isEmpty()) {
+            linkText = linkDialog->linkText();
+        }
+        else {
+            linkText = linkDialog->linkUrl();
+        }
+        cursor.insertText(linkText, format);
+
+        // Workaround for qt bug 203510:
+        // Link formatting does not get applied immediately. Removing and reinserting
+        // the marked up html does format the text correctly.
+        // -- Stephen Kelly, 15th March 2008
+        cursor.setPosition(lowPos);
+        cursor.setPosition(lowPos + linkText.length(), QTextCursor::KeepAnchor);
+
+        cursor.insertHtml(cursor.selection().toHtml());
+
+        // Insert a space after the link if at the end of the block so that
+        // typing some text after the link does not carry link formatting
+        if (cursor.position() == cursor.block().position() + cursor.block().length() - 1) {
+            cursor.setCharFormat(cursor.block().charFormat());
+            cursor.insertText(QString(' '));
+        }
+
+        d->activateRichText();
+    }
+    cursor.endEditBlock();
+    delete linkDialog;
+}
+
 #include "kmeditor.moc"
Index: libkdepim/klinkdialog.h
===================================================================
--- libkdepim/klinkdialog.h	(revision 0)
+++ libkdepim/klinkdialog.h	(revision 809980)
@@ -0,0 +1,85 @@
+/**
+ * klinkdialog
+ *
+ * Copyright 2008  Stephen Kelly <steveire@gmailcom>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301  USA
+ */
+
+#ifndef __KLINKDIALOG_H
+#define __KLINKDIALOG_H
+
+#include <KDialog>
+
+class KLinkDialogPrivate;
+class QString;
+
+/**
+    @short Dialog to allow user to configure a hyperlink.
+    @author Stephen Kelly
+    @since 4.1
+
+    This class provides a dialog to ask the user for a link target url and
+    text.
+
+    The size of the dialog is automatically saved to and restored from the
+    global KDE config file.
+ */
+class KLinkDialog : public KDialog
+{
+    Q_OBJECT
+    public:
+        /**
+         * Create a link dialog.
+         * @param parent  Parent widget.
+         */
+        KLinkDialog(QWidget *parent = 0);
+
+        /**
+         * Destructor
+         */
+        ~KLinkDialog();
+
+
+        /**
+         * Returns the link text shown in the dialog
+         * @param linkText The initial text
+         */
+        void setLinkText(const QString &linkText);
+
+        /**
+         * Sets the target link url shown in the dialog
+         * @param linkUrl The initial link target url
+         */
+        void setLinkUrl(const QString &linkUrl);
+
+        /**
+         * Returns the link text entered by the user.
+         * @return The link text
+         */
+        QString linkText() const;
+
+        /**
+         * Returns the target link url entered by the user.
+         * @return The link url
+         */
+        QString linkUrl() const;
+
+    private:
+        KLinkDialogPrivate *d;
+};
+
+#endif
Index: libkdepim/kmstylelistselectaction.cpp
===================================================================
--- libkdepim/kmstylelistselectaction.cpp	(revision 0)
+++ libkdepim/kmstylelistselectaction.cpp	(revision 809980)
@@ -0,0 +1,108 @@
+/**
+ * kmstylelistselectaction.cpp
+ *
+ * Copyright (C)  2007 Laurent Montel <montel@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301  USA
+ */
+
+#include "kmstylelistselectaction.h"
+#include <klocale.h>
+
+using namespace KPIM;
+
+KMStyleListSelectAction::KMStyleListSelectAction( const QString& text, QWidget *parent)
+ : KSelectAction(text, parent)
+{
+  init();
+  connect( this, SIGNAL( triggered(int) ),
+           this, SLOT( slotChangeStyle(int) ) );
+}
+
+void KMStyleListSelectAction::setCurrentStyle( QTextListFormat::Style style )
+{
+  switch ( style ) {
+    default:
+    case QTextListFormat::ListStyleUndefined:
+      setCurrentItem( 0 );
+      break;
+    case QTextListFormat::ListDisc:
+      setCurrentItem( 1 );
+      break;
+    case QTextListFormat::ListCircle:
+      setCurrentItem( 2 );
+      break;
+    case QTextListFormat::ListSquare:
+      setCurrentItem( 3 );
+      break;
+    case QTextListFormat::ListDecimal:
+      setCurrentItem( 4 );
+      break;
+    case QTextListFormat::ListLowerAlpha:
+      setCurrentItem( 5 );
+      break;
+    case QTextListFormat::ListUpperAlpha:
+      setCurrentItem( 6 );
+      break;
+  }
+}
+
+void KMStyleListSelectAction::slotChangeStyle( int styleIndex )
+{
+  QTextListFormat::Style paragStyle = QTextListFormat::ListStyleUndefined;
+  switch ( styleIndex ) {
+    default:
+    case 0:
+      paragStyle = QTextListFormat::ListStyleUndefined;
+      break;
+    case 1:
+      paragStyle = QTextListFormat::ListDisc;
+      break;
+    case 2:
+      paragStyle = QTextListFormat::ListCircle;
+      break;
+    case 3:
+      paragStyle = QTextListFormat::ListSquare;
+      break;
+    case 4:
+      paragStyle = QTextListFormat::ListDecimal;
+      break;
+    case 5:
+      paragStyle = QTextListFormat::ListLowerAlpha;
+      break;
+    case 6:
+      paragStyle = QTextListFormat::ListUpperAlpha;
+      break;
+  }
+
+  emit applyStyle( paragStyle );
+}
+
+void KMStyleListSelectAction::init()
+{
+  QStringList styleItems;
+  styleItems << i18n( "Standard" );
+  styleItems << i18n( "Bulleted List (Disc)" );
+  styleItems << i18n( "Bulleted List (Circle)" );
+  styleItems << i18n( "Bulleted List (Square)" );
+  styleItems << i18n( "Ordered List (Decimal)" );
+  styleItems << i18n( "Ordered List (Alpha lower)" );
+  styleItems << i18n( "Ordered List (Alpha upper)" );
+  setItems( styleItems );
+  setCurrentItem( 0 );
+}
+
+#include "kmstylelistselectaction.moc"

Property changes on: libkdepim/kmstylelistselectaction.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Index: libkdepim/kmeditor.h
===================================================================
--- libkdepim/kmeditor.h	(revision 809981)
+++ libkdepim/kmeditor.h	(revision 809980)
@@ -3,6 +3,7 @@
  *
  * Copyright 2007 Laurent Montel <montel@kde.org>
  * Copyright 2008 Thomas McGuire <thomas.mcguire@gmx.net>
+ * Copyright 2008 Stephen Kelly  <steveire@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -24,14 +25,16 @@
 #define KMEDITOR_H
 
 #include "kdepim_export.h"
-#include <krichtextwidget.h>
+#include <ktextedit.h>
+#include <qtextformat.h>
+
+class KFindDialog;
+class KUrl;
 
 namespace KPIMIdentities {
   class Signature;
 }
 
-class KUrl;
-
 namespace KPIM {
 
 class KMeditorPrivate;
@@ -41,7 +44,7 @@ class KEMailQuotingHighlighter;
  * The KMeditor class provides a widget to edit and display text,
  * specially geared towards writing e-mails.
  *
- * It offers sevaral additional functions of a KRichTextWidget:
+ * It offers sevaral additional functions of a KTextEdit:
  *
  * @li Quote highlighting
  * @li The ability to us an external editor
@@ -49,11 +52,20 @@ class KEMailQuotingHighlighter;
  * @li Better spellcheck support
  * @li Utility functions like removing whitespace, inserting a file,
  *     adding quotes or rot13'ing the text
+ * @li Easier access to many common rich text editing tasks, like changing
+ *     the font.
+ * @li Ability to edit and remove hyperlinks
+ *
+ * The editor can be in two modes: Rich text mode and plain text mode.
+ * Calling functions which modify he format/style of the text will automatically
+ * enable the rich text mode. Rich text mode is sometimes also referred to as
+ * HTML mode.
  *
+ * Do not call setAcceptRichText() or acceptRichText() yourself.
  * Do not call any spellchecking related function of KTextEdit, use the function
  * of this class instead.
  */
-class KDEPIM_EXPORT KMeditor : public KRichTextWidget
+class KDEPIM_EXPORT KMeditor : public KTextEdit
 {
   Q_OBJECT
 
@@ -69,6 +81,13 @@ class KDEPIM_EXPORT KMeditor : public KR
                    };
 
     /**
+     * The mode the edit widget is in.
+     */
+    enum Mode { Plain,    ///< Plain text mode
+                Rich      ///< Rich text mode
+              };
+
+    /**
      * Constructs a KMeditor object
      */
     explicit KMeditor( const QString& text, QWidget *parent = 0 );
@@ -107,6 +126,15 @@ class KDEPIM_EXPORT KMeditor : public KR
      */
     void disableWordWrap();
 
+    void setColor( const QColor& );
+
+    /**
+     * Sets the font of the currently selected text.
+     *
+     * @param font the font that the selection will get
+     */
+    void setFont( const QFont &font );
+
     /**
      * Changes the font of the whole text.
      * Also sets the default font for the document.
@@ -188,6 +216,29 @@ class KDEPIM_EXPORT KMeditor : public KR
     void cleanWhitespace( const KPIMIdentities::Signature &sig );
 
     /**
+     * This will switch the editor to plain text mode.
+     * All rich text formatting will be destroyed.
+     */
+    void switchToPlainText();
+
+    /**
+     * This enables rich text mode. Nothing is done except changing the internal
+     * mode and allowing rich text pastes.
+     */
+    void enableRichTextMode();
+
+    /**
+     * @return the current text mode
+     */
+    Mode textMode() const;
+
+    /**
+     * @return the plain text string if in plain text mode or the HTML code
+     *         if in rich text mode. The text is not word-wrapped.
+     */
+    QString textOrHTML() const;
+
+    /**
      * @return true if highlighting of missspelled words is enabled
      * @ref slotToggleSpellChecking
      */
@@ -224,6 +275,26 @@ class KDEPIM_EXPORT KMeditor : public KR
      */
     void ensureCursorVisible();
 
+    /**
+     * Returns the text of the link at the current position or an empty string
+     * if the cursor is not on a link.
+     *
+     * @sa currentLinkUrl
+     * @return The link text
+     * @since 4.1
+     */
+    QString currentLinkText() const;
+
+    /**
+     * Returns the URL target (href) of the link at the current position or an
+     * empty string if the cursor is not on a link.
+     *
+     * @sa currentLinkText
+     * @return The link target URL
+     * @since 4.1
+     */
+    QString currentLinkUrl() const;
+
   public Q_SLOTS:
 
     /**
@@ -239,6 +310,10 @@ class KDEPIM_EXPORT KMeditor : public KR
     void slotAddQuotes();
     void slotRemoveBox();
     void slotAddBox();
+    void slotAlignLeft();
+    void slotAlignCenter();
+    void slotAlignRight();
+    void slotChangeParagStyle( QTextListFormat::Style _style );
 
     /**
      * Shows the spell checkdialog, where the user can perform spell checking
@@ -248,6 +323,8 @@ class KDEPIM_EXPORT KMeditor : public KR
      */
     void slotCheckSpelling();
 
+    void slotFontFamilyChanged( const QString &f );
+    void slotFontSizeChanged( int size );
     void slotPasteAsQuotation();
     void slotRemoveQuotes();
 
@@ -256,11 +333,33 @@ class KDEPIM_EXPORT KMeditor : public KR
      */
     void slotRot13();
 
+    void slotTextBold( bool _b );
+    void slotTextItalic( bool _b );
+    void slotTextUnder( bool _b );
+    void slotTextColor();
+
+    /**
+     * Opens a dialog which lets the user turn the currently selected text into
+     * a link.
+     * If no text is selected, the word under the cursor will be taken.
+     * If the cursor is already over a link, the user can edit that link.
+     *
+     * @since 4.1
+     */
+    void slotConfigureLink();
+
     void slotChangeInsertMode();
 
   Q_SIGNALS:
 
     /**
+     * Emitted whenever the text mode is changed.
+     *
+     * @param mode the new text mode
+     */
+    void textModeChanged( KPIM::KMeditor::Mode mode );
+
+    /**
      * Emitted when the user chooses a different spellcheck language,
      * either in the config dialog or in the checking dialog.
      * Also emitted after setSpellCheckLanguage().
Index: libkdepim/kmstylelistselectaction.h
===================================================================
--- libkdepim/kmstylelistselectaction.h	(revision 0)
+++ libkdepim/kmstylelistselectaction.h	(revision 809980)
@@ -0,0 +1,62 @@
+/**
+ * kmstylelistselectaction.h
+ *
+ * Copyright (C)  2007  Laurent Montel <montel@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301  USA
+ */
+
+#ifndef KMSTYLELISTSELECTACTION_H
+#define KMSTYLELISTSELECTACTION_H
+
+#include "kdepim_export.h"
+#include <KSelectAction>
+#include <qtextformat.h>
+
+namespace KPIM {
+
+class KDEPIM_EXPORT KMStyleListSelectAction : public KSelectAction
+{
+    Q_OBJECT
+
+  public:
+    /**
+     * Constructs a KMStyleListSelectAction
+     */
+    explicit KMStyleListSelectAction( const QString& text, QWidget *parent = 0 );
+
+    /**
+     * Sets the current item of the action the the specified style.
+     * Call this whenever the cursor position of the editor changes and therefore
+     * the list style might have changed.
+     *
+     * @param style the new current style of the action
+     */
+    void setCurrentStyle( QTextListFormat::Style style );
+
+  Q_SIGNALS:
+    //emit style will be applyed.
+    void applyStyle( QTextListFormat::Style );
+  protected Q_SLOTS:
+    void slotChangeStyle( int );
+  protected:
+    void init();
+};
+
+}
+
+#endif
+

Property changes on: libkdepim/kmstylelistselectaction.h
___________________________________________________________________
Added: svn:eol-style
   + native

Index: libkdepim/klinkdialog.cpp
===================================================================
--- libkdepim/klinkdialog.cpp	(revision 0)
+++ libkdepim/klinkdialog.cpp	(revision 809980)
@@ -0,0 +1,99 @@
+/**
+ * klinkdialog
+ *
+ * Copyright 2008  Stephen Kelly <steveire@gmailcom>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301  USA
+ */
+
+#include "klinkdialog.h"
+
+#include <KLocale>
+#include <KLineEdit>
+#include <KUrl>
+
+#include <QLabel>
+#include <QGridLayout>
+
+class KLinkDialogPrivate
+{
+    public:
+        QLabel *textLabel;
+        KLineEdit *textLineEdit;
+        QLabel *linkUrlLabel;
+        KLineEdit *linkUrlLineEdit;
+};
+
+KLinkDialog::KLinkDialog(QWidget *parent)
+  : KDialog(parent), d(new KLinkDialogPrivate)
+{
+    setCaption(i18n("Manage Link"));
+    setButtons(Ok|Cancel);
+    setDefaultButton(Ok);
+    setModal(true);
+
+    QWidget *entries = new QWidget();
+
+    QGridLayout *layout = new QGridLayout(entries);
+
+    d->textLabel = new QLabel(i18n("Link Text"), this);
+    d->textLineEdit = new KLineEdit(this);
+    d->linkUrlLabel = new QLabel(i18n("Link URL"), this);
+    d->linkUrlLineEdit = new KLineEdit(this);
+
+    layout->addWidget(d->textLabel, 0, 0);
+    layout->addWidget(d->textLineEdit, 0, 1);
+    layout->addWidget(d->linkUrlLabel, 1, 0);
+    layout->addWidget(d->linkUrlLineEdit, 1, 1);
+
+    setMainWidget(entries);
+
+    KConfigGroup group(KGlobal::config(), "KLinkDialog");
+    restoreDialogSize(group);
+
+    d->textLineEdit->setFocus();
+}
+
+KLinkDialog::~KLinkDialog()
+{
+    KConfigGroup group(KGlobal::config(), "KLinkDialog");
+    saveDialogSize(group);
+    delete d;
+    d = 0;
+}
+
+void KLinkDialog::setLinkText(const QString &linkText)
+{
+    d->textLineEdit->setText(linkText);
+    if (!linkText.trimmed().isEmpty())
+        d->linkUrlLineEdit->setFocus();
+}
+
+void KLinkDialog::setLinkUrl(const QString &linkUrl)
+{
+    d->linkUrlLineEdit->setText(linkUrl);
+}
+
+
+QString KLinkDialog::linkText() const
+{
+    return d->textLineEdit->text().trimmed();
+}
+
+QString KLinkDialog::linkUrl() const
+{
+    return d->linkUrlLineEdit->text();
+}
Index: libkdepim/CMakeLists.txt
===================================================================
--- libkdepim/CMakeLists.txt	(revision 809981)
+++ libkdepim/CMakeLists.txt	(revision 809980)
@@ -72,10 +72,12 @@ set(kdepim_LIB_SRCS
    kmailcompletion.cpp
    networkstatus.cpp
    kmeditor.cpp
+   kmstylelistselectaction.cpp
    autochecktreewidget.cpp
    kmutils.cpp
    colorlistbox.cpp
    dictionarycombobox.cpp
+   klinkdialog.cpp
 )

Places

File kmail_revert_krichtext-r809981.diff of Package kdepim4 (Revision ec8529b5d5ddd95e7cc1264cd4188fef)

Places