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

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation
From:       Dario Abatianni <eisfuchs () tigress ! com>
Date:       2004-01-31 21:55:14
Message-ID: 20040131215514.B7715995A () office ! kde ! org
[Download RAW message or body]

CVS commit by abatianni: 

Switching to Rich Text input line, cursor position fix


  M +22 -6     ircinput.cpp   1.36
  M +1 -1      ircinput.h   1.12


--- kdeextragear-2/konversation/konversation/ircinput.cpp  #1.35:1.36
@@ -28,4 +28,5 @@
 
 #define MAXHISTORY 100
+#define RICHTEXT 1
 
 IRCInput::IRCInput(QWidget* parent) : KTextEdit(parent)
@@ -46,5 +47,7 @@ IRCInput::IRCInput(QWidget* parent) : KT
   // widget may not resize vertically
   setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
-//  setTextFormat(RichText);
+#ifdef RICHTEXT
+  setTextFormat(RichText);
+#endif
 }
 
@@ -66,7 +69,7 @@ QSize IRCInput::sizeHint() const
 QString IRCInput::text() const
 {
-  return KTextEdit::text();
-
+#ifdef RICHTEXT
   QString content=KTextEdit::text();
+
   QDomDocument document;
 
@@ -73,8 +76,21 @@ QString IRCInput::text() const
   document.setContent(content,false);
   QDomNodeList nodes=document.elementsByTagName("p");
+  if(nodes.count())
+  {
+    QDomElement node=nodes.item(0).toElement();
+    return node.text();
+  }
+  return QString::null;
   
-  kdDebug() << "IRCInput::text(): " << nodes.count() << endl;
+#else
+  return KTextEdit::text();
+#endif
+}
 
-  return nodes.item(0).toText().nodeValue();
+void IRCInput::setText(const QString& text)
+{
+  // reimplemented to  set cursor at the end of the new text
+  KTextEdit::setText(text);
+  setCursorPosition(0,text.length()+1);
 }
 

--- kdeextragear-2/konversation/konversation/ircinput.h  #1.11:1.12
@@ -55,4 +54,5 @@ class IRCInput : public KTextEdit
     void insert(const QString& text);
     void showCompletionList(const QStringList& nicks);
+    void setText(const QString& text);
 
   protected slots:


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