diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/kvi_app.cpp | 6 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_coreactions.cpp | 6 | ||||
| -rw-r--r-- | src/kvirc/kernel/kvi_options.cpp | 9 |
3 files changed, 13 insertions, 8 deletions
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index eaafe40b5..63a298dcd 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -1871,10 +1871,6 @@ void KviApp::fillRecentServersPopup(KviTalPopupMenu * m) m->clear(); for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentServers).end(); ++it) { - /* - FIXME - HACK This hack removes the empty entry in the list - */ if(*it == "") continue; m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),*it); } @@ -1887,6 +1883,7 @@ void KviApp::fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsole * pConsole) bool bAlreadyFound = false; for(QStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).begin(); it != KVI_OPTION_STRINGLIST(KviOption_stringlistRecentNicknames).end(); ++it) { + if(*it == "") continue; id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICK)),*it); if(!pConsole->isConnected())m->setItemEnabled(id,false); else { @@ -1909,6 +1906,7 @@ void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole) { for(QStringList::Iterator it = pList->begin(); it != pList->end(); ++it) { + if(*it == "") continue; id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),*it); if(!pConsole->isConnected())m->setItemEnabled(id,false); else { diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index be3b2aae2..cca2baadf 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -828,6 +828,9 @@ void KviChangeNickAction::popupAboutToShow() m_pPopup->insertSeparator(); m_pPopup->insertItem(*(smallIcon()),__tr2qs("Other...")); + + m_pPopup->insertSeparator(); + m_pPopup->insertItem(*(smallIcon()),__tr2qs("Clear Recent Nicks List")); } void KviChangeNickAction::popupActivated(int id) @@ -842,6 +845,9 @@ void KviChangeNickAction::popupActivated(int id) if(__tr2qs("Other...") == text) { activate(); + } else if(__tr2qs("Clear Recent Nicks List") == text) + { + KviKvsScript::run("option stringlistRecentNicknames",c); } else { szText = text; szText.prepend("nick "); diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 95d368685..376a14bc4 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -1328,12 +1328,15 @@ void KviApp::optionResetUpdate(int flags) } bool KviApp::setOptionValue(const QString &optName,const QString &value) { - if (!setCommonOptionValue(optName,value)) return false; + if (!setCommonOptionValue(optName,value)) + return false; + if(KviQString::equalCI(optName,"stringlistRecentChannels")) { buildRecentChannels(); return true; } + // The pixmap options have special treating if(KviQString::equalCIN(optName,KVI_PIXMAP_OPTIONS_PREFIX,KVI_PIXMAP_OPTIONS_PREFIX_LEN)) { @@ -1360,9 +1363,7 @@ bool KviApp::setOptionValue(const QString &optName,const QString &value) return false; } - return false; - - + return true; } bool KviApp::setCommonOptionValue(const QString &optName,const QString &value) |