aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kvirc_QT4_vc05.vcproj2
-rw-r--r--src/kvirc/kvs/kvi_kvs_kernel.h6
-rw-r--r--src/kvirc/ui/kvi_scripteditor.cpp6
-rw-r--r--src/kvirc/ui/kvi_scripteditor.h4
-rw-r--r--src/kvirc/ui/kvi_texticonwin.cpp2
-rw-r--r--src/modules/aliaseditor/aliaseditor.cpp10
-rw-r--r--src/modules/aliaseditor/aliaseditor.h6
-rw-r--r--src/modules/editor/scripteditor.cpp17
-rw-r--r--src/modules/editor/scripteditor.h6
9 files changed, 34 insertions, 25 deletions
diff --git a/src/kvirc/kvirc_QT4_vc05.vcproj b/src/kvirc/kvirc_QT4_vc05.vcproj
index ff291f9ca..76bb18f20 100644
--- a/src/kvirc/kvirc_QT4_vc05.vcproj
+++ b/src/kvirc/kvirc_QT4_vc05.vcproj
@@ -3968,7 +3968,7 @@
>
</File>
<File
- RelativePath="..\..\data\resources\kvirc.rc"
+ RelativePath="..\..\data\resources_win32\kvirc.rc"
>
</File>
<File
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h
index 62ad5fb67..59cc7e213 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.h
+++ b/src/kvirc/kvs/kvi_kvs_kernel.h
@@ -128,6 +128,7 @@ public:
KviPointerList<QString> * completeCommandAllocateResult(const QString &szCommandBegin)
{
KviPointerList<QString> *p=new KviPointerList<QString>;
+ p->setAutoDelete(true);
completeCommand(szCommandBegin,p);
return p;
}
@@ -140,12 +141,13 @@ public:
}
void freeCompletionResult(KviPointerList<QString> * l)
{
- if (!l) return;
+ /* if (!l) return;
for (int i=0;i<l->count();i++)
{
delete l->at(i);
}
- delete l;
+ */
+ delete l;
}
diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp
index 8c8a28fd2..85fce505f 100644
--- a/src/kvirc/ui/kvi_scripteditor.cpp
+++ b/src/kvirc/ui/kvi_scripteditor.cpp
@@ -67,7 +67,7 @@ void KviScriptEditor::getText(KviQCString &txt)
{
}
-void KviScriptEditor::setCursorPosition(QPoint)
+void KviScriptEditor::setCursorPosition(int)
{
}
@@ -76,9 +76,9 @@ bool KviScriptEditor::isModified()
return false;
}
-QPoint KviScriptEditor::getCursor()
+int KviScriptEditor::getCursor()
{
- return QPoint(0,0);
+ return 0;
}
void KviScriptEditor::getText(QString &txt)
{
diff --git a/src/kvirc/ui/kvi_scripteditor.h b/src/kvirc/ui/kvi_scripteditor.h
index d119d31d7..305aa1005 100644
--- a/src/kvirc/ui/kvi_scripteditor.h
+++ b/src/kvirc/ui/kvi_scripteditor.h
@@ -56,8 +56,8 @@ public:
virtual void getText(QString &txt);
virtual void setInfoText(const QString &text);
virtual void setFindText(const QString &text);
- virtual void setCursorPosition(QPoint);
- virtual QPoint getCursor();
+ virtual void setCursorPosition(int);
+ virtual int getCursor();
virtual void setFindLineeditReadOnly(bool b);
virtual bool isModified();
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index ea6e9285a..25d439439 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -68,7 +68,7 @@ KviTextIconWindow::~KviTextIconWindow()
killTimer(m_iTimerId);
m_iTimerId = -1;
}
-// killTimers();
+
// if(m_pOwner)m_pOwner->setFocus();
}
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:
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 06:10:00 +0000