3 files changed, 16 insertions, 48 deletions

diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index c903a9401..cd573b0bd 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -399,20 +399,10 @@ KviStringListSelector::~KviStringListSelector()
 
 void KviStringListSelector::itemSelectionChanged()
 {
-
-	//unsigned int uCount = m_pListWidget->count();
 	bool bSomeSelected ;
 	if (m_pListWidget->selectedItems().count())  bSomeSelected = true;
 	else bSomeSelected = false;
-	/*for(unsigned int u=0;u<uCount;u++)
-	{
-		if(m_pListWidget->isSelected(u))
-		{
-			bSomeSelected = true;
-			break;
-		}
-	}
-	*/
+
 	m_pRemoveButton->setEnabled(isEnabled() && bSomeSelected);
 }
 
@@ -430,18 +420,10 @@ void KviStringListSelector::setEnabled(bool bEnabled)
 	QString txt = m_pLineEdit->text();
 	txt.trimmed();
 	m_pAddButton->setEnabled(bEnabled && (txt.length() > 0));
-	//unsigned int uCount = m_pListWidget->count();
+
 	bool bSomeSelected;
 	if (m_pListWidget->selectedItems().count())  bSomeSelected = true;
 	else bSomeSelected = false;
-	/*for(unsigned int u=0;u<uCount;u++)
-	{
-		if(m_pListWidget->isSelected(u))
-		{
-			bSomeSelected = true;
-			break;
-		}
-	}*/
 
 	m_pRemoveButton->setEnabled(bEnabled && bSomeSelected);
 	m_pListWidget->setEnabled(bEnabled);
@@ -469,12 +451,15 @@ void KviStringListSelector::addClicked()
 
 void KviStringListSelector::removeClicked()
 {
-	unsigned int uCount = m_pListWidget->count();
-	for(unsigned int u=0;u<uCount;u++)
+	int u=0;
+	while(u<m_pListWidget->count())
 	{
-		while(m_pListWidget->item(u)->isSelected()){
-			delete (KviTalListWidgetItem*)m_pListWidget->takeItem(u);
+		if(m_pListWidget->item(u)->isSelected())
+		{
+			m_pListWidget->takeItem(u);
+			continue;
 		}
+		u++;
 	}
 }
 
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 7473fe5b0..db6a111fb 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -162,6 +162,7 @@ void KviProxyOptionsWidget::fillProxyList()
 		if(p == g_pProxyDataBase->currentProxy())
 		{
 			prx->setSelected(true);
+			m_pTreeWidget->setCurrentItem(prx);
 			m_pTreeWidget->scrollToItem(prx);
 		}
 	}
@@ -330,6 +331,7 @@ void KviProxyOptionsWidget::newProxy()
 	KviProxy prx;
 	KviProxyOptionsTreeWidgetItem * it = new KviProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),&prx);
 	it->setSelected(true);
+	m_pTreeWidget->setCurrentItem(it);
 	m_pTreeWidget->scrollToItem(it);
 }
 
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index b5d2f402e..55bea871d 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -47,8 +47,6 @@ KviTextIconTableItem::KviTextIconTableItem(QTableWidget * t,KviTextIcon * icon)
 		m_pIcon=new KviTextIcon(0);
 	QPixmap* pix=m_pIcon->pixmap();
 	if(pix) setIcon(QIcon(*pix));
-	
-
 }
 
 KviTextIconTableItem::~KviTextIconTableItem()
@@ -84,6 +82,8 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
 	header.append(__tr2qs("Emoticon"));
 
 	m_pTable->setHorizontalHeaderLabels(header);
+	m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+	m_pTable->setSelectionMode(QAbstractItemView::SingleSelection);
 
 	mergeTip(m_pTable->viewport(),__tr2qs_ctx("This table contains the text icon associations.<br>" \
 			"KVirc will use them to display the CTRL+I escape sequences and eventually the " \
@@ -168,7 +168,7 @@ void KviTextIconsOptionsWidget::itemClicked(QTableWidgetItem *i)
 {
 	if (i->column()!=1) return;
 	if (m_iLastEditedRow==i->row()) return;
-	if (m_pBox) 
+	if (m_pBox)
 		delete m_pBox;
 	m_pBox=new KviTalHBox(0);
 	m_pItem=(KviTextIconTableItem *)i;
@@ -189,6 +189,7 @@ void KviTextIconsOptionsWidget::addClicked()
 	m_pTable->setRowCount(m_pTable->rowCount() + 1);
 	m_pTable->setItem(m_pTable->rowCount() - 1,0,new QTableWidgetItem(__tr2qs_ctx("unnamed","options")));
 	m_pTable->setItem(m_pTable->rowCount() - 1,1,new KviTextIconTableItem(m_pTable,0));
+	m_pTable->scrollToBottom();
 	m_pDel->setEnabled(true);
 }
 
@@ -198,27 +199,7 @@ void KviTextIconsOptionsWidget::delClicked()
 
 	if((i > -1) && (i < m_pTable->rowCount()))
 	{
-		// remove row i
-		m_pTable->takeItem(i,0);
-		m_pTable->takeItem(i,1);
-		m_pTable->takeItem(i,2);
-
-		for(;i < (m_pTable->rowCount() - 1);i++)
-		{
-			// Get first line data
-			QString cellData1 = m_pTable->item(i,0)->text();
-			QString cellData2 = m_pTable->item(i,1)->text();
-
-			// Fill in first line with second line data
-			m_pTable->item(i,0)->setText(m_pTable->item(i+1,0)->text());
-			m_pTable->item(i,1)->setText(m_pTable->item(i+1,1)->text());
-
-			// Put first line data in second line
-			m_pTable->item(i+1,0)->setText(cellData1);
-			m_pTable->item(i+1,1)->setText(cellData2);
-		}
-
-		m_pTable->setRowCount(m_pTable->rowCount() - 1);
+		m_pTable->removeRow(i);
 		if(m_pTable->rowCount() == 0) m_pDel->setEnabled(false);
 	}
 }