modules editor (wip), objects(wip) QT4 port.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2209 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 6 insertions, 5 deletions

diff --git a/src/modules/editor/editor_QT4_vc05.vcproj b/src/modules/editor/editor_QT4_vc05.vcproj
index 22b461580..484ac9245 100644
--- a/src/modules/editor/editor_QT4_vc05.vcproj
+++ b/src/modules/editor/editor_QT4_vc05.vcproj
@@ -135,7 +135,7 @@
 				EnableFiberSafeOptimizations="true"

 				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvilib\net";"$(ProjectDir)\..\..\kvilib\core\wstring";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\config";"$(SSLINCDIR)";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvirc\uparser\scripttoolbar";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvirc\sparser";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvirc\ui";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EDITOR_EXPORTS;_CRT_SECURE_NO_DEPRECATE;"

 				StringPooling="true"

 				MinimalRebuild="true"

 				ExceptionHandling="1"

diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 6ed605fd5..a055bd733 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -88,6 +88,7 @@ KviCompletionBox::KviCompletionBox(QTextEdit * parent = 0)
 

 void KviCompletionBox::updateContents(QString buffer)

 {

+	return;

 	//buffer=buffer.trimmed();

 	KviPointerList<QString> *list;

 	clear();

@@ -227,7 +228,7 @@ void KviScriptEditorWidgetColorOptions::okClicked()
 KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent)

 : QTextEdit(pParent)

 {

-	

+	setTabStopWidth(48);

 	setWordWrapMode(QTextOption::NoWrap);

 	m_pParent=pParent;

 	m_szHelp="Nothing";

@@ -539,8 +540,8 @@ void KviScriptEditorWidget::completition(bool bCanComplete)
 		else completelistbox->resize(completelistbox->width(),6*completelistbox->fontMetrics().height()+20);

 //		int posy=paragraphRect(line).bottom();

 //		int posx=fontMetrics().width(this->text(line).left(index));

-		completelistbox->move(0,0);

-		completelistbox->show();

+//		completelistbox->move(0,0);

+//		completelistbox->show();

 	}

 

 }

@@ -1081,7 +1082,7 @@ void KviScriptEditorImplementation::setText(const QString &txt)
 {

 	m_pEditor->setText(txt);

 //	m_pEditor->setTextFormat(Qt::PlainText);

-	m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false);

+	m_pEditor->textCursor().movePosition(QTextCursor::End);

 	m_pEditor->document()->setModified(false);

 	updateRowColLabel();

 }