From b2891fe17c395b885b4fac8634fa8cca1a45fbb6 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 26 Feb 2012 14:57:49 +0000 Subject: 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 --- src/modules/options/OptionsWidget_textIcons.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/modules/options/OptionsWidget_textIcons.cpp') 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 #include #include +#include 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()); } -- cgit v1.3.1-10-gc9f91