File disable-korganizer-richtexteditwidget-r808952+8... of Package kdepim4

Overview Repositories Revisions Requests Users Attributes Meta

File disable-korganizer-richtexteditwidget-r808952+808798.diff of Package kdepim4 (Revision dccea5b0be3399174baccb64d6e3f605)

Currently displaying revision dccea5b0be3399174baccb64d6e3f605 , Show latest

Index: korganizer/koeditorgeneraljournal.cpp
===================================================================
--- korganizer/koeditorgeneraljournal.cpp	(revision 808952)
+++ korganizer/koeditorgeneraljournal.cpp	(revision 808797)
@@ -41,7 +41,6 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <KSqueezedTextLabel>
-#include <KRichTextWidget>
 
 #include <q3groupbox.h>
 #include <QDateTime>
Index: korganizer/koeditorgeneraltodo.cpp
===================================================================
--- korganizer/koeditorgeneraltodo.cpp	(revision 808952)
+++ korganizer/koeditorgeneraltodo.cpp	(revision 808797)
@@ -39,7 +39,6 @@
 #include <kfiledialog.h>
 #include <ktextedit.h>
 #include <KComboBox>
-#include <KRichTextWidget>
 
 #include <QLayout>
 #include <QDateTime>
Index: korganizer/koeditorgeneralevent.cpp
===================================================================
--- korganizer/koeditorgeneralevent.cpp	(revision 808952)
+++ korganizer/koeditorgeneralevent.cpp	(revision 808797)
@@ -41,7 +41,6 @@
 #include <kstandarddirs.h>
 #include <ktextedit.h>
 #include <KComboBox>
-#include <KRichTextWidget>
 
 #include <QLayout>
 #include <QSpinBox>
Index: korganizer/koeditorgeneral.cpp
===================================================================
--- korganizer/koeditorgeneral.cpp	(revision 808952)
+++ korganizer/koeditorgeneral.cpp	(revision 808797)
@@ -42,8 +42,7 @@
 #include <kfiledialog.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
-#include <KRichTextWidget>
-#include <KActionCollection>
+#include <ktextedit.h>
 #include <krestrictedline.h>
 #include <kvbox.h>
 #include <KLineEdit>
@@ -64,7 +63,6 @@
 #include <QBoxLayout>
 #include <QTextCharFormat>
 #include <QTextList>
-#include <QToolButton>
 
 #include "koeditorattachments.h"
 #include "koeditorgeneral.moc"
@@ -186,55 +184,73 @@ void KOEditorGeneral::initDescription( Q
   mRichDescription->setToolTip( i18n( "Toggle Rich Text" ) );
   connect( mRichDescription, SIGNAL(toggled(bool)),
            this, SLOT(setDescriptionRich(bool)) );
+  mDescriptionBoldButton = new QPushButton( parent );
+  mDescriptionBoldButton->setIcon( KIcon( "format-text-bold" ) );
+  mDescriptionBoldButton->setToolTip( i18n( "Bold text" ) );
+  connect( mDescriptionBoldButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionBold()) );
+
+  mDescriptionItalicButton = new QPushButton( parent );
+  mDescriptionItalicButton->setIcon( KIcon( "format-text-italic" ) );
+  mDescriptionItalicButton->setToolTip( i18n( "Italicize text" ) );
+  connect( mDescriptionItalicButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionItalic()) );
+
+  mDescriptionUnderlineButton = new QPushButton( parent );
+  mDescriptionUnderlineButton->setIcon( KIcon( "format-text-underline" ) );
+  mDescriptionUnderlineButton->setToolTip( i18n( "Underline text" ) );
+  connect( mDescriptionUnderlineButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionUnderline()) );
+
+  mDescriptionStrikethroughButton = new QPushButton( parent );
+  mDescriptionStrikethroughButton->setIcon( KIcon( "format-text-strikethrough" ) );
+  mDescriptionStrikethroughButton->setToolTip( i18n( "Strike-through text" ) );
+  connect( mDescriptionStrikethroughButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionStrikethrough()) );
+
+  mDescriptionLeftAlignButton = new QPushButton( parent );
+  mDescriptionLeftAlignButton->setIcon( KIcon( "format-justify-left" ) );
+  mDescriptionLeftAlignButton->setToolTip( i18n( "Left-justify text" ) );
+  connect( mDescriptionLeftAlignButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionLeftAlign()) );
+
+  mDescriptionCentreAlignButton = new QPushButton( parent );
+  mDescriptionCentreAlignButton->setIcon( KIcon( "format-justify-center" ) );
+  mDescriptionCentreAlignButton->setToolTip( i18n( "Center text" ) );
+  connect( mDescriptionCentreAlignButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionCentreAlign()) );
+
+  mDescriptionRightAlignButton = new QPushButton( parent );
+  mDescriptionRightAlignButton->setIcon( KIcon( "format-justify-right" ) );
+  mDescriptionRightAlignButton->setToolTip( i18n( "Right-justify text" ) );
+  connect( mDescriptionRightAlignButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionRightAlign()) );
+
+  mDescriptionUnorderedListButton = new QPushButton( parent );
+  mDescriptionUnorderedListButton->setIcon( KIcon( "format-list-unordered" ) );
+  mDescriptionUnorderedListButton->setToolTip( i18n( "Unordered-list item" ) );
+  connect( mDescriptionUnorderedListButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionUnorderedList()) );
+
+  mDescriptionOrderedListButton = new QPushButton( parent );
+  mDescriptionOrderedListButton->setIcon( KIcon( "format-list-ordered" ) );
+  mDescriptionOrderedListButton->setToolTip( i18n( "Ordered-list item" ) );
+  connect( mDescriptionOrderedListButton, SIGNAL(clicked()),
+           this, SLOT(toggleDescriptionOrderedList()) );
 
-  KActionCollection *collection = new KActionCollection( this );
-  mDescriptionEdit = new KRichTextWidget( parent );
-  mDescriptionEdit->setRichTextSupport(
-    KRichTextWidget::SupportBold |
-    KRichTextWidget::SupportItalic |
-    KRichTextWidget::SupportUnderline |
-    KRichTextWidget::SupportStrikeOut |
-    KRichTextWidget::SupportAlignment |
-    KRichTextWidget::SupportChangeListStyle );
-
-  mDescriptionEdit->createActions( collection );
-
-  mDescriptionBoldButton = new QToolButton( parent );
-  mDescriptionBoldButton->setDefaultAction( collection->action( "format_text_bold" ) );
-
-  mDescriptionItalicButton = new QToolButton( parent );
-  mDescriptionItalicButton->setDefaultAction( collection->action( "format_text_italic" ) );
-
-  mDescriptionUnderlineButton = new QToolButton( parent );
-  mDescriptionUnderlineButton->setDefaultAction( collection->action( "format_text_underline" ) );
-
-  mDescriptionStrikeoutButton = new QToolButton( parent );
-  mDescriptionStrikeoutButton->setDefaultAction( collection->action( "format_text_strikeout" ) );
-
-  mDescriptionLeftAlignButton = new QToolButton( parent );
-  mDescriptionLeftAlignButton->setDefaultAction( collection->action( "format_align_left" ) );
-
-  mDescriptionCentreAlignButton = new QToolButton( parent );
-  mDescriptionCentreAlignButton->setDefaultAction( collection->action( "format_align_center" ) );
-
-  mDescriptionRightAlignButton = new QToolButton( parent );
-  mDescriptionRightAlignButton->setDefaultAction( collection->action( "format_align_right" ) );
-
-  mDescriptionListButton = new QToolButton( parent );
-  mDescriptionListButton->setDefaultAction( collection->action( "format_list_style" ) );
-
-  htmlLayout->setSpacing(5);
   htmlLayout->addWidget( mRichDescription );
   htmlLayout->addWidget( mDescriptionBoldButton );
   htmlLayout->addWidget( mDescriptionItalicButton );
   htmlLayout->addWidget( mDescriptionUnderlineButton );
-  htmlLayout->addWidget( mDescriptionStrikeoutButton );
+  htmlLayout->addWidget( mDescriptionStrikethroughButton );
   htmlLayout->addWidget( mDescriptionLeftAlignButton );
   htmlLayout->addWidget( mDescriptionCentreAlignButton );
   htmlLayout->addWidget( mDescriptionRightAlignButton );
-  htmlLayout->addWidget( mDescriptionListButton );
+  htmlLayout->addWidget( mDescriptionUnorderedListButton );
+  htmlLayout->addWidget( mDescriptionOrderedListButton );
   htmlLayout->addStretch();
 
+  mDescriptionEdit = new KTextEdit( parent );
   mDescriptionEdit->setWhatsThis(
     i18n( "Sets the description for this event, to-do or journal. "
           "This will be displayed in a reminder if one is set, "
@@ -363,6 +379,7 @@ void KOEditorGeneral::enableAlarm( bool
   mAlarmEditButton->setEnabled( enable );
 }
 
+
 void KOEditorGeneral::toggleAlarm( bool on )
 {
     mAlarmButton->setChecked( on );
@@ -564,28 +581,126 @@ QObject *KOEditorGeneral::typeAheadRecei
   return mSummaryEdit;
 }
 
+void KOEditorGeneral::toggleDescriptionBold()
+{
+  mRichDescription->setChecked( true );
+  QTextCursor cursor( mDescriptionEdit->textCursor() );
+  if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+    cursor.select( QTextCursor::WordUnderCursor );
+  }
+  QTextCharFormat text;
+  if ( cursor.charFormat().fontWeight() == QFont::Bold ) {
+    text.setFontWeight( QFont::Normal );
+  } else {
+    text.setFontWeight( QFont::Bold );
+  }
+  cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionItalic()
+{
+  mRichDescription->setChecked( true );
+  QTextCursor cursor( mDescriptionEdit->textCursor() );
+  if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+    cursor.select( QTextCursor::WordUnderCursor );
+  }
+  QTextCharFormat text;
+  text.setFontItalic( !cursor.charFormat().fontItalic() );
+  cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionUnderline()
+{
+  mRichDescription->setChecked( true );
+  QTextCursor cursor( mDescriptionEdit->textCursor() );
+  if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+    cursor.select( QTextCursor::WordUnderCursor );
+  }
+  QTextCharFormat text;
+  text.setFontUnderline( !cursor.charFormat().fontUnderline() );
+  cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionStrikethrough()
+{
+  mRichDescription->setChecked( true );
+  QTextCursor cursor( mDescriptionEdit->textCursor() );
+  if ( cursor.selectionStart() == cursor.selectionEnd() ) {
+    cursor.select( QTextCursor::WordUnderCursor );
+  }
+  QTextCharFormat text;
+  text.setFontStrikeOut( !cursor.charFormat().fontStrikeOut() );
+  cursor.mergeCharFormat( text );
+}
+
+void KOEditorGeneral::toggleDescriptionLeftAlign()
+{
+  setAlignment( Qt::AlignLeft );
+}
+
+void KOEditorGeneral::toggleDescriptionCentreAlign()
+{
+  setAlignment( Qt::AlignHCenter );
+}
+
+void KOEditorGeneral::toggleDescriptionRightAlign()
+{
+  setAlignment( Qt::AlignRight );
+}
+
+void KOEditorGeneral::setAlignment( Qt::Alignment alignment )
+{
+  mRichDescription->setChecked( true );
+  QTextCursor cursor( mDescriptionEdit->textCursor() );
+  cursor.select( QTextCursor::LineUnderCursor );
+  QTextBlockFormat text;
+  if ( alignment != cursor.blockFormat().alignment() ) {
+    text.setAlignment( alignment );
+    cursor.mergeBlockFormat( text );
+  }
+}
+
+void KOEditorGeneral::toggleDescriptionOrderedList()
+{
+  createList( QTextListFormat::ListDecimal );
+}
+
+void KOEditorGeneral::toggleDescriptionUnorderedList()
+{
+  createList( QTextListFormat::ListDisc );
+}
+
 void KOEditorGeneral::toggleDescriptionRichButtons( bool rich )
 {
   mDescriptionBoldButton->setEnabled( rich );
   mDescriptionItalicButton->setEnabled( rich );
   mDescriptionUnderlineButton->setEnabled( rich );
-  mDescriptionStrikeoutButton->setEnabled( rich );
+  mDescriptionStrikethroughButton->setEnabled( rich );
   mDescriptionLeftAlignButton->setEnabled( rich );
   mDescriptionCentreAlignButton->setEnabled( rich );
   mDescriptionRightAlignButton->setEnabled( rich );
-  mDescriptionListButton->setEnabled( rich );
+  mDescriptionUnorderedListButton->setEnabled( rich );
+  mDescriptionOrderedListButton->setEnabled( rich );
 }
 
 void KOEditorGeneral::setDescriptionRich( bool rich )
 {
   toggleDescriptionRichButtons( rich );
   if ( !rich ) {
-    mDescriptionEdit->switchToPlainText();
-  } else {
-    mDescriptionEdit->enableRichTextMode();
+    QTextCursor cursor( mDescriptionEdit->textCursor() );
+    cursor.select( QTextCursor::Document );
+    cursor.setCharFormat( QTextCharFormat() );
+    mDescriptionEdit->setPlainText( mDescriptionEdit->toPlainText() );
   }
 }
 
+QTextList *KOEditorGeneral::createList( QTextListFormat::Style style )
+{
+  mRichDescription->setChecked( true );
+  QTextCursor cursor( mDescriptionEdit->textCursor() );
+  return cursor.createList( style );
+}
+
 void KOEditorGeneral::updateAttendeeSummary( int count )
 {
   if ( count <= 0 ) {
Index: korganizer/koeditorgeneral.h
===================================================================
--- korganizer/koeditorgeneral.h	(revision 808952)
+++ korganizer/koeditorgeneral.h	(revision 808797)
@@ -40,10 +40,9 @@ class QCheckBox;
 class QStackedWidget;
 class QSpinBox;
 class QPushButton;
-class QToolButton;
 class KComboBox;
 class KLineEdit;
-class KRichTextWidget;
+class KTextEdit;
 class KSqueezedTextLabel;
 class KUrl;
 class KOEditorAttachments;
@@ -114,6 +113,15 @@ class KOEditorGeneral : public QObject
     void updateAlarmWidgets();
     void updateDefaultAlarmTime();
     void updateAttendeeSummary( int count );
+    void toggleDescriptionBold();
+    void toggleDescriptionItalic();
+    void toggleDescriptionUnderline();
+    void toggleDescriptionStrikethrough();
+    void toggleDescriptionLeftAlign();
+    void toggleDescriptionCentreAlign();
+    void toggleDescriptionRightAlign();
+    void toggleDescriptionOrderedList();
+    void toggleDescriptionUnorderedList();
     void setDescriptionRich( bool rich );
 
   signals:
@@ -121,9 +129,10 @@ class KOEditorGeneral : public QObject
     void updateCategoryConfig();
     void focusReceivedSignal();
     void openURL( const KUrl & );
-
   protected:
     Alarm *alarmFromSimplePage() const;
+    void setAlignment( Qt::Alignment alignment );
+    QTextList *createList( QTextListFormat::Style style );
 
     KLineEdit               *mSummaryEdit;
     KLineEdit               *mLocationEdit;
@@ -135,19 +144,20 @@ class KOEditorGeneral : public QObject
     QSpinBox                *mAlarmTimeEdit;
     KComboBox               *mAlarmIncrCombo;
     QPushButton             *mAlarmEditButton;
-    KRichTextWidget         *mDescriptionEdit;
+    KTextEdit               *mDescriptionEdit;
     QLabel                  *mOwnerLabel;
     KComboBox               *mSecrecyCombo;
     QPushButton             *mCategoriesButton;
     KSqueezedTextLabel      *mCategoriesLabel;
-    QToolButton             *mDescriptionBoldButton;
-    QToolButton             *mDescriptionItalicButton;
-    QToolButton             *mDescriptionUnderlineButton;
-    QToolButton             *mDescriptionStrikeoutButton;
-    QToolButton             *mDescriptionLeftAlignButton;
-    QToolButton             *mDescriptionCentreAlignButton;
-    QToolButton             *mDescriptionRightAlignButton;
-    QToolButton             *mDescriptionListButton;
+    QPushButton             *mDescriptionBoldButton;
+    QPushButton             *mDescriptionItalicButton;
+    QPushButton             *mDescriptionUnderlineButton;
+    QPushButton             *mDescriptionStrikethroughButton;
+    QPushButton             *mDescriptionLeftAlignButton;
+    QPushButton             *mDescriptionCentreAlignButton;
+    QPushButton             *mDescriptionRightAlignButton;
+    QPushButton             *mDescriptionUnorderedListButton;
+    QPushButton             *mDescriptionOrderedListButton;
     QCheckBox               *mRichDescription;
     KOEditorAttachments     *mAttachments;
     QLabel                  *mResourceLabel;

Places

File disable-korganizer-richtexteditwidget-r808952+808798.diff of Package kdepim4 (Revision dccea5b0be3399174baccb64d6e3f605)

Places