more work on alias editor QT4 port (wip) and fix.

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

4 files changed, 23 insertions, 16 deletions

diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index dfab9a4be..dd4980716 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -91,7 +91,7 @@ KviAliasListViewItem::KviAliasListViewItem(KviAliasNamespaceListViewItem * pPare
 : KviAliasEditorListViewItem(pParentNamespaceItem,KviAliasEditorListViewItem::Alias,szName)

 {

 	setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS))));

-	m_cPos=QPoint(0,0);

+	m_cPos=0;

 	

 }

 

@@ -100,7 +100,7 @@ KviAliasListViewItem::KviAliasListViewItem(QTreeWidget * pListView,const QString
 : KviAliasEditorListViewItem(pListView,KviAliasEditorListViewItem::Alias,szName)

 {

 	setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS))));

-	m_cPos=QPoint(0,0);

+	m_cPos=0;

 

 }

 

@@ -1377,7 +1377,7 @@ void KviAliasEditor::renameItem()
 	}

 	

 	QString szCode;

-	QPoint pntCursor;

+	int pntCursor;

 	if(bAlias)

 	{

 		m_pEditor->getText(szCode);

@@ -1479,6 +1479,8 @@ void KviAliasEditor::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *pre
 	m_pNameLabel->setText(szLabelText);

 	m_pRenameButton->setEnabled(true);

 	m_pEditor->setText(((KviAliasListViewItem *)it)->buffer());

+	

+	m_pEditor->setFocus();

 	m_pEditor->setCursorPosition(((KviAliasListViewItem *)it)->cursorPosition());

 	m_pEditor->setEnabled(true);

 }

@@ -1489,7 +1491,7 @@ void KviAliasEditor::recursiveCommit(KviAliasEditorListViewItem * it)
 	if(it->isAlias())

 	{

 		QString szName = buildFullItemName(it);

-		debug("Commit alias %s",szName.toUtf8().data());

+//		debug("Commit alias %s",szName.toUtf8().data());

 		//debug("ADDING %s",szName.latin1());

 		// WARNING: On MSVC operator new here is valid ONLY because

 		//          KviKvsScript has a non virtual detructor!

diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index 6d6b234ce..4acde046a 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -104,12 +104,12 @@ public:
 	~KviAliasListViewItem();
 public:
 	QString m_szBuffer;
-	QPoint  m_cPos;
+	int  m_cPos;
 public:
 	const QString & buffer(){ return m_szBuffer; };
-	const QPoint & cursorPosition(){ return m_cPos; };
+	const int & cursorPosition(){ debug ("Returing cPos %d",m_cPos);return m_cPos; };
 	void setBuffer(const QString &szBuffer){ m_szBuffer = szBuffer; };
-	void setCursorPosition(const QPoint &cPos){ m_cPos = cPos; };
+	void setCursorPosition(const int &cPos){ debug("Saving cpos %d",cPos);m_cPos = cPos; };
 };
 
 class KviAliasEditor : public QWidget
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index b445a2c9c..2004f7220 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -906,7 +906,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 {

 	if(g_pScriptEditorWindowList->isEmpty())loadOptions();

 	g_pScriptEditorWindowList->append(this);

-	m_lastCursorPos=QPoint(0,0);

+	m_lastCursorPos=0;

 	QGridLayout * g = new QGridLayout(this,2,3,0,0);

 

 	m_pFindLineedit = new QLineEdit(" ",this);

@@ -954,7 +954,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	connect(m_pEditor,SIGNAL(keyPressed()),this,SLOT(updateRowColLabel()));

 	connect(m_pEditor,SIGNAL(textChanged()),this,SLOT(updateRowColLabel()));

 	connect(m_pEditor,SIGNAL(selectionChanged()),this,SLOT(updateRowColLabel()));

-	m_lastCursorPos = QPoint(-1,-1);

+	m_lastCursorPos = 0;

 }

 

 KviScriptEditorImplementation::~KviScriptEditorImplementation()

@@ -1112,11 +1112,14 @@ void KviScriptEditorImplementation::setFindLineeditReadOnly(bool b)
 

 void KviScriptEditorImplementation::updateRowColLabel()

 {

+	if (m_lastCursorPos==m_pEditor->textCursor().position()) return;

 	int iRow=m_pEditor->textCursor().blockNumber();

 	int iCol=m_pEditor->textCursor().columnNumber();

 	QString tmp;

 	KviQString::sprintf(tmp,__tr2qs_ctx("Row: %d Col: %d","editor"),iRow,iCol);

 	m_pRowColLabel->setText(tmp);

+	m_lastCursorPos=m_pEditor->textCursor().position();

+

 /*

 	int iRow,iCol;

 	m_pEditor->getCursorPosition(&iRow,&iCol);

@@ -1128,18 +1131,20 @@ void KviScriptEditorImplementation::updateRowColLabel()
 		m_pRowColLabel->setText(tmp);

 	}

 	*/

+

 }

 

-QPoint KviScriptEditorImplementation::getCursor()

+int KviScriptEditorImplementation::getCursor()

 {

 	return m_lastCursorPos;

 }

 

-void KviScriptEditorImplementation::setCursorPosition(QPoint pos)

+void KviScriptEditorImplementation::setCursorPosition(int pos)

 {

-

+debug("Set cursor position to %d",pos);

+	m_pEditor->textCursor().setPosition(pos,QTextCursor::MoveAnchor);

 	/*

-	m_pEditor->setCursorPosition(pos.x(),pos.y());

+	m_pEditor->setCursorPosition(pos.x(),pos.y());int

 	m_pEditor->setFocus();

 	m_pEditor->ensureCursorVisible();

 	QString tmp;

diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 817fd8d2f..7170e9a45 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -128,7 +128,7 @@ public:
 protected:
 	KviScriptEditorWidget * m_pEditor;
 	QLabel                * m_pRowColLabel;
-	QPoint                  m_lastCursorPos;
+	int                  m_lastCursorPos;
 public:
 	virtual void setText(const QString &txt);
 	virtual void getText(QString &txt);
@@ -139,8 +139,8 @@ public:
 	virtual void setFocus();
 	virtual bool isModified();
 	void setFindLineeditReadOnly(bool b);
-	void setCursorPosition(QPoint);
-	QPoint getCursor();
+	void setCursorPosition(int);
+	int getCursor();
 	QLineEdit *m_pFindlineedit;
 	QLineEdit * getFindlineedit();
 protected: