3 files changed, 18 insertions, 49 deletions

diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 932348577..641e5bee8 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -208,6 +208,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label)
 bool KviKvsObject_label::init(KviKvsRunTimeContext *,KviKvsVariantList *)
 {
 	SET_OBJECT(QLabel)
+	((QLabel *)widget())->setWordWrap(true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 0f2ef158c..7ed93c0e4 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -33,30 +33,10 @@
 #include <QTextDocument>
 #include <QTextEdit>
 #include <QTextStream>
- #include <QTextCursor>
+#include <QTextCursor>
 
 #include "class_multilineedit.h"
 
-
-//->Tables for Text Format
-static const char * const mod_tbl[] = {
-	"PlainText",
-	"RichText",
-	"AutoText",
-	"LogText"
-};
-/*
-static int mod_cod[] = {
-	Qt::PlainText,
-	Qt::RichText,
-	Qt::AutoText,
-	Qt::LogText
-};
-*/
-#define mod_num		(sizeof(mod_tbl) / sizeof(mod_tbl[0]))
-
-
-
 /*
 	@doc: multilineedit
 	@keyterms:
@@ -191,10 +171,9 @@ static int mod_cod[] = {
 		!fn: $setOverwriteMode(<bOverwrite:boolean>)
 		Sets the Multilineedit edit's overwrite mode to b (1=Enabled or 0=Disabled) .
 		!fn: $setTextFormat(<textformat:string>)
-		Sets the text format. Correct values are RichText, PlainText, LogText or AutoText.
+		Sets the text format. Correct values are RichText, PlainText.
 		!fn: <string> $textFormat()
-		Returns the text format: rich text, plain text, log text or auto text.
-		// findme
+		Returns the text format: rich text or plain text.
 		!fn: $setParagraphBackgroundColor(<paragraph:integer>,<exadecimal color value>)
 		Sets the background color of the paragraph <paragraph> to color value specified.[br]
 		Example: %mymultiline->$setParagraphBackgroundColor(2,0C686F)
@@ -305,9 +284,10 @@ KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"addwidget", functionAddWidget)
 	*/
 	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setPointSize", functionsetPointSize)
 	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setReadOnly",functionSetReadOnly)
-	/*
+	
 	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setTextFormat" , functionsetTextFormat)
 	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"textFormat" , functiontextFormat)
+	/*
 	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"setParagraphBackgroundColor", functionsetParagraphBackgroundColor)
 	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"clearParagraphBackgroundColor", functionsetParagraphBackgroundColor)
 	KVSO_REGISTER_HANDLER(KviKvsObject_textedit,"loadFile" , functionloadFile); // let's fantasy
@@ -948,21 +928,13 @@ bool KviKvsObject_textedit::functionsetOverwriteMode(KviKvsObjectFunctionCall *
 	return true;
 }
 
-bool KviKvsObject_textedit::functiontextFormat(KviKvsObjectFunctionCall *)
+bool KviKvsObject_textedit::functiontextFormat(KviKvsObjectFunctionCall *c)
 {
 	if(!widget())return true;
-	/*
-	int fstyle = ((QTextEdit *)widget())->textFormat();
-	QString format="";
-	for(unsigned int i = 0; i < mod_num; i++)
-	{
-		if(fstyle & mod_cod[i])
-		{
-			format=mod_tbl[i];
-		}
-	}
-	c->returnValue()->setString(format);
-	*/
+	if(((QTextEdit *)widget())->acceptRichText())
+		c->returnValue()->setString(QString("RichText"));
+	else
+		c->returnValue()->setString(QString("PlainText"));
 	return true;
 }
 
@@ -973,17 +945,11 @@ bool KviKvsObject_textedit::functionsetTextFormat(KviKvsObjectFunctionCall * c)
 		KVSO_PARAMETER("textformat",KVS_PT_STRING,0,szFormat)
 	KVSO_PARAMETERS_END(c)
 	if(!widget()) return true;
-	/*
 	if(KviQString::equalCI(szFormat,"PlainText"))
-		((QTextEdit *)widget())->setTextFormat(Qt::PlainText);
+		((QTextEdit *)widget())->setAcceptRichText(false);
 	else if(KviQString::equalCI(szFormat,"RichText"))
-		((QTextEdit *)widget())->setTextFormat(Qt::RichText);
-	else if(KviQString::equalCI(szFormat,"LogText"))
-		((QTextEdit *)widget())->setTextFormat(Qt::LogText);
-	else if(KviQString::equalCI(szFormat,"AutoText"))
-		((QTextEdit *)widget())->setTextFormat(Qt::AutoText);
+		((QTextEdit *)widget())->setAcceptRichText(true);
         else c->warning(__tr2qs_ctx("Unknown text format '%Q'","objects"),&szFormat);
-	*/
 	return true;
 }
 
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index 63165335a..76adab385 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -1149,14 +1149,16 @@ KVSO_CLASS_FUNCTION(painter,drawText)
 {
 	CHECK_INTERNAL_POINTER(m_pPainter)
 	QString szText,szMode;
-	kvs_int_t iX,iY;
+	kvs_int_t iX,iY,iN=-1;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("x",KVS_PT_INT,0,iX)
 		KVSO_PARAMETER("y",KVS_PT_INT,0,iY)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
+		KVSO_PARAMETER("num_chars",KVS_PT_INT,KVS_PF_OPTIONAL,iN)
 		KVSO_PARAMETER("mode",KVS_PT_STRING,KVS_PF_OPTIONAL,szMode)
 	KVSO_PARAMETERS_END(c)
-	if (!szMode.isEmpty()){
+	if (!szMode.isEmpty() && !KviQString::equalCI(szMode,"Auto"))
+	{
 		if(KviQString::equalCI(szMode,"RTL"))m_pPainter->setLayoutDirection(Qt::RightToLeft);
 		else if(KviQString::equalCI(szMode,"LTR"))m_pPainter->setLayoutDirection(Qt::LeftToRight);
 		else
@@ -1165,7 +1167,7 @@ KVSO_CLASS_FUNCTION(painter,drawText)
 				return true;
 		}
 	}
-	m_pPainter->drawText(iX,iY,szText);
+	m_pPainter->drawText(iX,iY,szText.left(iN));
 	return true;
 }