Dropped the KviTalPopupMenu layer, ported the involved code to QAction.

This fixes most of the random crashes on osx, and is the base for a next change in the menubar.
Addiotional fix: "disconnect" menu entry was broken since the 3.x era


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

13 files changed, 71 insertions, 66 deletions

diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index 24662c81c..20c4adcd3 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -34,7 +34,7 @@
 #include "KviPointerHashTable.h"
 #include "KviTalVBox.h"
 #include "KviTalToolTip.h"
-#include "KviTalPopupMenu.h"
+#include "QMenu.h"
 #include "KviTalGroupBox.h"
 
 #include <QLayout>
diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index 21db51a8a..b33de8197 100644
--- a/src/modules/options/OptionsWidget_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -112,7 +112,7 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent)
 
 		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
 		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
-		m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1, tmp2));
+        m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1, tmp2));
 	}
 	m_pBanTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
 
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index cd4498f85..e79564221 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -351,7 +351,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	{
 		QString tmp;
 		tmp.setNum(i);
-		m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp);
+        m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp);
 	}
 
 	bool bOk;
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index ed5c2b742..9ff8ddab3 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -39,6 +39,7 @@
 #include <QPushButton>
 #include <QCursor>
 #include <QPainter>
+#include <QWidgetAction>
 
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#include <unistd.h> // symlink()
@@ -398,10 +399,10 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent)
 	m_pIconButton = new QToolButton(box);
 	connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
 
-	m_pIconPopup = new KviTalPopupMenu(this);
+    m_pIconPopup = new QMenu(this);
 	KviIconWidget * iw = new KviIconWidget(m_pIconPopup);
 	connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(newIconSelected(KviIconManager::SmallIcon)));
-	m_pIconPopup->insertItem(iw);
+    m_pIconPopup->addAction(new QWidgetAction(iw));
 
 
 	m_pEnableLogging = new QCheckBox(__tr2qs_ctx("Log this","options"),box);
diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h
index c9e1bdee5..cf1b71c80 100644
--- a/src/modules/options/OptionsWidget_message.h
+++ b/src/modules/options/OptionsWidget_message.h
@@ -26,7 +26,7 @@
 
 #include "KviOptionsWidget.h"
 #include "KviMessageTypeSettings.h"
-#include "KviTalPopupMenu.h"
+#include "QMenu.h"
 #include "KviIconManager.h"
 
 #include <QTreeWidget>
@@ -173,7 +173,7 @@ public:
 	MessageListWidgetItem     * m_pLastItem;
 	QCheckBox                  * m_pEnableLogging;
 	QToolButton                * m_pIconButton;
-	KviTalPopupMenu            * m_pIconPopup;
+	QMenu            * m_pIconPopup;
 public:
 	void saveLastItem();
 protected slots:
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 8784e2a7b..3849db285 100644
--- a/src/modules/options/OptionsWidget_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -33,7 +33,7 @@
 #include "kvi_settings.h"
 #include "KviOptions.h"
 #include "KviTalGroupBox.h"
-#include "KviTalPopupMenu.h"
+#include "QMenu.h"
 #include "KviTalToolTip.h"
 
 #include <QLabel>
@@ -140,7 +140,7 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent)
 	layout()->setRowStretch(0,1);
 	layout()->setColumnStretch(0,1);
 
-	m_pContextPopup = new KviTalPopupMenu(this);
+    m_pContextPopup = new QMenu(this);
 }
 
 OptionsWidget_proxy::~OptionsWidget_proxy()
@@ -323,8 +323,9 @@ void OptionsWidget_proxy::customContextMenuRequested(const QPoint &pos)
 {
 	QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
 	m_pContextPopup->clear();
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy()));
-	m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())),it);
+    m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy()));
+    m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent()))
+            ->setEnabled(it);
 	m_pContextPopup->popup(QCursor::pos());
 }
 
diff --git a/src/modules/options/OptionsWidget_proxy.h b/src/modules/options/OptionsWidget_proxy.h
index 429bd7bf9..930cfda29 100644
--- a/src/modules/options/OptionsWidget_proxy.h
+++ b/src/modules/options/OptionsWidget_proxy.h
@@ -34,7 +34,7 @@ class QLabel;
 class QLineEdit;
 class QComboBox;
 class KviIpEditor;
-class KviTalPopupMenu;
+class QMenu;
 class KviProxy;
 class KviProxyDataBase;
 
@@ -76,7 +76,7 @@ protected:
 	QLineEdit    * m_pPortEdit;
 	QLabel       * m_pProtocolLabel;
 	QComboBox    * m_pProtocolBox;
-	KviTalPopupMenu   * m_pContextPopup;
+	QMenu   * m_pContextPopup;
 	QCheckBox    * m_pIPv6Check;
 	ProxyOptionsTreeWidgetItem * m_pLastEditedItem;
 private:
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 154c937bf..1c75a72ee 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -53,7 +53,7 @@
 #include "KviProxyDataBase.h"
 #include "KviKvsScript.h"
 #include "KviPointerHashTable.h"
-#include "KviTalPopupMenu.h"
+#include "QMenu.h"
 #include "KviTalToolTip.h"
 
 #include <QLineEdit>
@@ -230,8 +230,8 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	while(d->pcName)
 	{
 		tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription);
-		m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
-		m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
+        m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
+        m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
 		if(KviQString::equalCI(d->pcName,n->encoding()))
 			srvcurrent = i + 1;
 		if(KviQString::equalCI(d->pcName,n->textEncoding()))
@@ -786,8 +786,8 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	while(d->pcName)
 	{
 		tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription);
-		m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
-		m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
+        m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp);
+        m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp);
 		if(KviQString::equalCI(d->pcName,s->encoding()))
 			srvcurrent = i + 1;
 		if(KviQString::equalCI(d->pcName,s->textEncoding()))
@@ -815,7 +815,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList();
 	for(KviProxy * p = proxylist->first();p;p = proxylist->next())
 	{
-		m_pProxyEditor->insertItem(m_pProxyEditor->count(),QString("%1:%2").arg(p->hostName()).arg(p->port()));
+        m_pProxyEditor->insertItem(m_pProxyEditor->count(),QString("%1:%2").arg(p->hostName()).arg(p->port()));
 	}
 	if(m_pProxyEditor->count() > (s->proxy()+2))
 		m_pProxyEditor->setCurrentIndex(s->proxy()+2);
@@ -1258,11 +1258,11 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 
 	createLayout();
 
-	m_pContextPopup = new KviTalPopupMenu(this);
-	m_pImportPopup = new KviTalPopupMenu(this);
+    m_pContextPopup = new QMenu(this);
+    m_pImportPopup = new QMenu(this);
 
 	connect(m_pImportPopup,SIGNAL(aboutToShow()),this,SLOT(importPopupAboutToShow()));
-	connect(m_pImportPopup,SIGNAL(activated(int)),this,SLOT(importPopupActivated(int)));
+    connect(m_pImportPopup,SIGNAL(triggered(QAction *)),this,SLOT(importPopupActivated(QAction *)));
 
 	m_pServerDetailsDialog = 0;
 	m_pNetworkDetailsDialog = 0;
@@ -1371,9 +1371,9 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent)
 	connect(m_pDetailsButton,SIGNAL(clicked()),this,SLOT(detailsClicked()));
 	KviTalToolTip::add(m_pDetailsButton,__tr2qs_ctx("<center>Click here to edit advanced options for this entry</center>","options"));
 
-	m_pRecentPopup = new KviTalPopupMenu(gbox);
+    m_pRecentPopup = new QMenu(gbox);
 	connect(m_pRecentPopup,SIGNAL(aboutToShow()),this,SLOT(recentServersPopupAboutToShow()));
-	connect(m_pRecentPopup,SIGNAL(activated(int)),this,SLOT(recentServersPopupClicked(int)));
+    connect(m_pRecentPopup,SIGNAL(triggered(QAction *)),this,SLOT(recentServersPopupClicked(QAction *)));
 
 	QToolButton * tb = new QToolButton(gbox);
 	tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Time))));
@@ -1479,11 +1479,11 @@ void OptionsWidget_servers::recentServersPopupAboutToShow()
 {
 	g_pApp->fillRecentServersPopup(m_pRecentPopup);
 
-	m_pRecentPopup->insertSeparator();
-	m_pRecentPopup->insertItem(__tr2qs("Clear Recent Servers List"));
+    m_pRecentPopup->addSeparator();
+	m_pRecentPopup->addAction(__tr2qs("Clear Recent Servers List"));
 }
 
-void OptionsWidget_servers::recentServersPopupClicked(int id)
+void OptionsWidget_servers::recentServersPopupClicked(QAction *pAction)
 {
 	if(!g_pActiveWindow)
 		return; // doh
@@ -1492,7 +1492,7 @@ void OptionsWidget_servers::recentServersPopupClicked(int id)
 	if(!c)
 		return;
 
-	QString szItemText = m_pRecentPopup->text(id);
+    QString szItemText = pAction->text();
 	szItemText.remove(QChar('&'));
 	if(szItemText.isEmpty())
 		return;
@@ -1798,27 +1798,26 @@ void OptionsWidget_servers::commit()
 
 void OptionsWidget_servers::customContextMenuRequested(const QPoint &pnt)
 {
-	int id;
 	QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt);
 	bool bServer = (it && ((IrcServerOptionsTreeWidgetItem *)it)->m_pServerData);
 	m_pContextPopup->clear();
-	m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::World)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent()));
-	m_pContextPopup->setItemEnabled(id,!bServer);
-	m_pContextPopup->insertSeparator();
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Server)),__tr2qs_ctx("&New Server","options"),this,SLOT(newServer()));
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Server","options"),this,SLOT(removeCurrent()));
-	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer()));
-	m_pContextPopup->setItemEnabled(id,bServer);
-	id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer()));
-	m_pContextPopup->setItemEnabled(id,m_pClipboard);
+	m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::World)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork()));
+    m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent()))
+        ->setEnabled(!bServer);
+    m_pContextPopup->addSeparator();
+    m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Server)),__tr2qs_ctx("&New Server","options"),this,SLOT(newServer()));
+    m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Cut)),__tr2qs_ctx("Re&move Server","options"),this,SLOT(removeCurrent()))
+        ->setEnabled(bServer);
+    m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer()));
+    m_pContextPopup->setEnabled(bServer);
+    m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer()))
+        ->setEnabled(m_pClipboard);
 
-	m_pContextPopup->insertSeparator();
-	//	m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,SLOT(importFromIni()));
-	m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,SLOT(clearList()));
-	m_pContextPopup->insertSeparator();
-	m_pContextPopup->insertItem(__tr2qs_ctx("Import List","options"),m_pImportPopup);
+    m_pContextPopup->addSeparator();
+	//	m_pContextPopup->addAction(__c2q(__tr("Merge list from server.ini","options")),this,SLOT(importFromIni()));
+	m_pContextPopup->addAction(__tr2qs_ctx("Clear List","options"),this,SLOT(clearList()));
+    m_pContextPopup->addSeparator();
+    m_pContextPopup->addAction(__tr2qs_ctx("Import List","options"))->setMenu(m_pImportPopup);
 	m_pContextPopup->popup(QCursor::pos());
 }
 
@@ -1831,19 +1830,19 @@ void OptionsWidget_servers::importPopupAboutToShow()
 
 	if(!l)return;
 
-	int id;
+    QAction *pAction;
 
 	for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next())
 	{
 		if(d->icon())
-			id = m_pImportPopup->insertItem(*(d->icon()),d->visibleName());
+            pAction = m_pImportPopup->addAction(*(d->icon()),d->visibleName());
 		else
-			id = m_pImportPopup->insertItem(d->visibleName());
-		m_pImportPopup->setItemParameter(id,d->id());
+            pAction = m_pImportPopup->addAction(d->visibleName());
+        pAction->setData(d->id());
 	}
 }
 
-void OptionsWidget_servers::importPopupActivated(int id)
+void OptionsWidget_servers::importPopupActivated(QAction *pAction)
 {
 	// ensure that we have all the modules : they could have been unloaded while the popup was displayed
 	g_pModuleManager->loadModulesByCaps("serverimport");
@@ -1866,7 +1865,10 @@ void OptionsWidget_servers::importPopupActivated(int id)
 		m_pImportFilter = 0;
 	}
 
-	id = m_pImportPopup->itemParameter(id);
+    bool bOk=false;
+    int id = pAction->data().toInt(&bOk);
+    if(!bOk)
+        return;
 
 	m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport",id,0);
 
diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h
index f1a40e731..c23851ded 100644
--- a/src/modules/options/OptionsWidget_servers.h
+++ b/src/modules/options/OptionsWidget_servers.h
@@ -40,7 +40,7 @@ class QComboBox;
 class QPushButton;
 class KviIpEditor;
 class KviIrcServer;
-class KviTalPopupMenu;
+class QMenu;
 class KviScriptEditor;
 class KviNickServRule;
 class NickServRuleEditor;
@@ -182,9 +182,9 @@ protected:
 	QLabel                       * m_pFilterLabel;
 	QLineEdit                    * m_pFilterEdit;
 	QPushButton                  * m_pDetailsButton;
-	KviTalPopupMenu              * m_pRecentPopup;
-	KviTalPopupMenu              * m_pContextPopup;
-	KviTalPopupMenu              * m_pImportPopup;
+    QMenu              * m_pRecentPopup;
+    QMenu              * m_pContextPopup;
+    QMenu              * m_pImportPopup;
 	KviIrcServer                 * m_pClipboard;
 	QPushButton                  * m_pConnectCurrent;
 	QPushButton                  * m_pConnectNew;
@@ -222,8 +222,8 @@ protected slots:
 	void detailsClicked();
 	void connectCurrentClicked();
 	void recentServersPopupAboutToShow();
-	void recentServersPopupClicked(int id);
-	void importPopupActivated(int id);
+    void recentServersPopupClicked(QAction *pAction);
+    void importPopupActivated(QAction *pAction);
 	void serverNetworkEditTextEdited(const QString &szNewText);
 	void filterTextEdited(const QString &szNewText);
 public:
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index 454d39fca..533303284 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -108,7 +108,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
 	{
 		if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))
 			iMatch = i + 1;
-		m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->pcName);
+        m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->pcName);
 		i++;
 		d = KviLocale::instance()->encodingDescription(i);
 	}
@@ -132,7 +132,7 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent)
 	{
 		if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)))
 			iMatch = i + 1;
-		m_pWinampEncodingCombo->insertItem(m_pWinampEncodingCombo->count(),d->pcName);
+		m_pWinampEncodingCombo->addAction(m_pWinampEncodingCombo->count(),d->pcName);
 		i++;
 		d = KviLocale::instance()->encodingDescription(i);
 	}
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index dda641f9c..f87a5ebad 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -69,8 +69,8 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 		if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding)))
 			iSrvMatch = i + 1;
 
-		m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->pcName);
-		m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(),d->pcName);
+        m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->pcName);
+        m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(),d->pcName);
 		i++;
 		d = KviLocale::instance()->encodingDescription(i);
 	}
@@ -113,7 +113,7 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent)
 		QString szTmp=*it;
 		szTmp.replace("kvirc_","");
 		szTmp.replace(".mo","");
-		m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(),szTmp);
+        m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(),szTmp);
 		if(KviQString::equalCI(szTmp,m_szLanguage))
 			iMatch = i + 2;
 		i++;
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index e933d33b4..6e3dacf6b 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -32,7 +32,7 @@
 #include "KviLocale.h"
 #include "KviFileDialog.h"
 #include "kvi_fileextensions.h"
-#include "KviTalPopupMenu.h"
+#include "QMenu.h"
 #include "KviTalHBox.h"
 #include "KviFileUtils.h"
 
@@ -40,6 +40,7 @@
 #include <QLayout>
 #include <QCursor>
 #include <QHeaderView>
+#include <QWidgetAction>
 
 TextIconTableItem::TextIconTableItem(QTableWidget *,KviTextIcon * icon)
 : QTableWidgetItem(QString(),Qt::ItemIsEditable)
@@ -152,10 +153,10 @@ void OptionsWidget_textIcons::doPopup()
 {
 	if(!m_pPopup)
 	{
-		m_pPopup = new KviTalPopupMenu(this);
+        m_pPopup = new QMenu(this);
 		KviIconWidget * iw = new KviIconWidget(m_pPopup);
 		connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(iconSelected(KviIconManager::SmallIcon)));
-		m_pPopup->insertItem(iw);
+        m_pPopup->addAction(new QWidgetAction(iw));
 	}
 	m_pPopup->popup(QCursor::pos());
 }
diff --git a/src/modules/options/OptionsWidget_textIcons.h b/src/modules/options/OptionsWidget_textIcons.h
index 2d535cf65..cf4cb91e4 100644
--- a/src/modules/options/OptionsWidget_textIcons.h
+++ b/src/modules/options/OptionsWidget_textIcons.h
@@ -67,7 +67,7 @@ protected:
 	QPushButton  * m_pDel;
 	QPushButton  * m_pRestore;
 	QToolButton * m_pCurrentIconButton;
-	KviTalPopupMenu *m_pPopup;
+	QMenu *m_pPopup;
 private:
 	void fillTable();
 public: