diff options
| author |  un1versal | 2015-11-06 00:58:42 +0000 |
|---|---|---|
| committer | un1versal | 2015-11-06 00:58:42 +0000 |
| commit | 75536b4841197d003920248f59422cf6eb4fa0a7 (patch) | |
| tree | b17167df6af4ac215d104a8f9bdd4aeabbe98b99 | |
| parent | build: Check compilers directly when linking perl (diff) | |
| parent | OptionsWidget_server: switch order & assign icons to Clear and Import Server ... (diff) | |
| download | KVIrc-75536b4841197d003920248f59422cf6eb4fa0a7.tar.gz KVIrc-75536b4841197d003920248f59422cf6eb4fa0a7.tar.bz2 KVIrc-75536b4841197d003920248f59422cf6eb4fa0a7.zip | |
Merge pull request #1722 from un1versal/My-Favorite-Martian
OptionsWidget_server: switch order & assign icons to Clear and Import Server list context menu entries
| -rw-r--r-- | src/modules/options/OptionsWidget_servers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index e33bd3288..f72653bf3 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -1369,7 +1369,7 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) m_pImportButton->setMenu(m_pImportPopup); m_pImportButton->setPopupMode(QToolButton::InstantPopup); - KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import List","options")); + KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import Server List","options")); QFrame * lll = new QFrame(vbox); vbox->setStretchFactor(lll,100); @@ -1860,9 +1860,9 @@ void OptionsWidget_servers::customContextMenuRequested(const QPoint &pnt) m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer())) ->setEnabled(m_pClipboard); m_pContextPopup->addSeparator(); - m_pContextPopup->addAction(__tr2qs_ctx("Clear List","options"),this,SLOT(clearList())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Folder)),__tr2qs_ctx("Import Server List","options"))->setMenu(m_pImportPopup); m_pContextPopup->addSeparator(); - m_pContextPopup->addAction(__tr2qs_ctx("Import List","options"))->setMenu(m_pImportPopup); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)),__tr2qs_ctx("Clear Server List","options"),this,SLOT(clearList())); m_pContextPopup->popup(QCursor::pos()); } |