more work on #911:

- removed two more "restore default icons" checks
- correctly update the ctrl+i popup when icon associations changes

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

4 files changed, 14 insertions, 8 deletions

diff --git a/src/kvilib/irc/kvi_mirccntrl.cpp b/src/kvilib/irc/kvi_mirccntrl.cpp
index 3da1f18c9..64f7893e1 100644
--- a/src/kvilib/irc/kvi_mirccntrl.cpp
+++ b/src/kvilib/irc/kvi_mirccntrl.cpp
@@ -286,11 +286,14 @@ namespace KviMircCntrl
 					if(i != begin)
 						ret += szData.mid(begin,i - begin);
 					i++;
+					/*
+					* These lines will strip out the first word following the icon escape character
 					while(i < l)
 					{
 						if(szData[i].unicode() == ' ')break;
 						else i++;
 					}
+					*/
 					begin = i;
 				break;
 				default:
diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp
index 1dde52730..905f82eca 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/kvi_texticonmanager.cpp
@@ -279,7 +279,6 @@ int KviTextIconManager::load(const QString & szFileName, bool bMerge)
 		}
 	}
 
-	checkDefaultAssociations();
 	emit changed();
 
 	return iUpd;
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index d27378893..ffddee4d0 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -52,15 +52,10 @@ KviTextIconWindow::KviTextIconWindow()
 	m_pTable->horizontalHeader()->hide();
 	m_pTable->verticalHeader()->hide();
 	m_pTable->setShowGrid(false);
-	m_pTable->setColumnCount(KVI_TEXTICON_COLUMNS);
 	m_pTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-	int iColWidth=((width()-24)/KVI_TEXTICON_COLUMNS);
-	for(int i=0; i<KVI_TEXTICON_COLUMNS;i++)
-		m_pTable->setColumnWidth(i,iColWidth);
-
 
 	fill();
-	//connect(g_pTextIconManager,SIGNAL(changed()),this,SLOT(fill()));
+	connect(g_pTextIconManager,SIGNAL(changed()),this,SLOT(fill()));
 	connect(m_pTable,SIGNAL(cellClicked( int, int )),this,SLOT(cellSelected(int, int)));
 }
 
@@ -73,6 +68,12 @@ void KviTextIconWindow::fill()
 {
 	m_pTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
 	m_pTable->clear();
+	m_pTable->setRowCount(0);
+
+	m_pTable->setColumnCount(KVI_TEXTICON_COLUMNS);
+	int iColWidth=((width()-24)/KVI_TEXTICON_COLUMNS);
+	for(int i=0; i<KVI_TEXTICON_COLUMNS;i++)
+		m_pTable->setColumnWidth(i,iColWidth);
 
 	KviPointerHashTable<QString,KviTextIcon> * pDict = g_pTextIconManager->textIconDict();
 	KviPointerHashTableIterator<QString,KviTextIcon> it(*pDict);
@@ -126,6 +127,10 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent * e)
 			cellSelected(m_pTable->currentRow(), m_pTable->currentColumn());
 		}
 		break;
+		case Qt::Key_Tab:
+			//avoid the text edit field to move to the icon cells using tab
+			break;
+		break;
 		case Qt::Key_Escape:
 			doHide();
 			break;
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index 77ad31743..dbb3e2877 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -129,7 +129,6 @@ static bool texticons_kvs_cmd_set(KviKvsModuleCommandCall * c)
 			pIcon->setFilename(szIcon);
 
 	}
-	g_pTextIconManager->checkDefaultAssociations();
 	return true;
 }