diff options
| author |  Fabio Bas | 2012-11-13 12:21:28 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-11-13 12:21:28 +0000 |
| commit | 6f32b4477e31e4ddfaa5cd6d7d416353b3c9969b (patch) | |
| tree | 52e5215775203bfbd902118df73d62cc317fabb3 | |
| parent | fix #1334 (diff) | |
| download | KVIrc-6f32b4477e31e4ddfaa5cd6d7d416353b3c9969b.tar.gz KVIrc-6f32b4477e31e4ddfaa5cd6d7d416353b3c9969b.tar.bz2 KVIrc-6f32b4477e31e4ddfaa5cd6d7d416353b3c9969b.zip | |
fixes incorrect usage of QWidgetAction (as already corrected for #1334)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6284 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/ui/KviStatusBar.cpp | 5 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_message.cpp | 4 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_textIcons.cpp | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/kvirc/ui/KviStatusBar.cpp b/src/kvirc/ui/KviStatusBar.cpp index 91b984c82..0dc3290b1 100644 --- a/src/kvirc/ui/KviStatusBar.cpp +++ b/src/kvirc/ui/KviStatusBar.cpp @@ -370,7 +370,10 @@ void KviStatusBar::contextPopupAboutToShow() QLabel * pLabel = new QLabel(szTmp,m_pContextPopup); QPalette p; pLabel->setStyleSheet("background-color: " + p.color(QPalette::Normal, QPalette::Mid).name()); - m_pContextPopup->addAction(new QWidgetAction(pLabel)); + + QWidgetAction * pWaction = new QWidgetAction(m_pContextPopup); + pWaction->setDefaultWidget(pLabel); + m_pContextPopup->addAction(pWaction); m_pClickedApplet->fillContextPopup(m_pContextPopup); diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index efb7519fc..d2faae649 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -402,8 +402,10 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent) m_pIconPopup = new QMenu(this); KviIconWidget * iw = new KviIconWidget(m_pIconPopup); connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(newIconSelected(KviIconManager::SmallIcon))); - m_pIconPopup->addAction(new QWidgetAction(iw)); + QWidgetAction * pWaction = new QWidgetAction(m_pIconPopup); + pWaction->setDefaultWidget(iw); + m_pIconPopup->addAction(pWaction); m_pEnableLogging = new QCheckBox(__tr2qs_ctx("Log this","options"),box); diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index 0c5bde729..a7d4225e1 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -160,7 +160,9 @@ void OptionsWidget_textIcons::doPopup() m_pPopup = new QMenu(this); KviIconWidget * iw = new KviIconWidget(m_pPopup); connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(iconSelected(KviIconManager::SmallIcon))); - m_pPopup->addAction(new QWidgetAction(iw)); + QWidgetAction * pWaction = new QWidgetAction(m_pPopup); + pWaction->setDefaultWidget(iw); + m_pPopup->addAction(pWaction); } m_pPopup->popup(QCursor::pos()); } |