diff options
| author | 2016-11-16 17:15:08 -0500 | |
|---|---|---|
| committer | 2016-11-16 17:15:08 -0500 | |
| commit | a5932bfdfedda384e10faa9806f83d62c50a5281 (patch) | |
| tree | b841558bb3231d8eaaf72087a09deb041a6fe3fe /src | |
| parent | Fix issue with parsing two strings for Poedit (diff) | |
| download | KVIrc-a5932bfdfedda384e10faa9806f83d62c50a5281.tar.gz KVIrc-a5932bfdfedda384e10faa9806f83d62c50a5281.tar.bz2 KVIrc-a5932bfdfedda384e10faa9806f83d62c50a5281.zip | |
Default DCC Send console confirmation links to use stringUrlFileCommand instead of hardcoded play command
* Also changes default of stringUrlFileCommand to be RUN_THE_BROWSER instead of play
* Fixes #1989
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/kernel/KviOptions.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/DccFileTransfer.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp index 5061a8f5e..31df83585 100644 --- a/src/kvirc/kernel/KviOptions.cpp +++ b/src/kvirc/kernel/KviOptions.cpp @@ -371,7 +371,7 @@ KviStringOption g_stringOptionsTable[KVI_NUM_STRING_OPTIONS] = { STRING_OPTION("UrlHttpsCommand", RUN_THE_BROWSER, KviOption_sectFlagUrl), STRING_OPTION("UrlMailtoCommand", RUN_THE_BROWSER, KviOption_sectFlagUrl), STRING_OPTION("PreferredMediaPlayer", "auto", KviOption_sectFlagFrame), - STRING_OPTION("UrlFileCommand", "play $0", KviOption_sectFlagUrl), + STRING_OPTION("UrlFileCommand", RUN_THE_BROWSER, KviOption_sectFlagUrl), STRING_OPTION("NickCompletionPostfix", ": ", KviOption_sectFlagInput), STRING_OPTION("UrlUnknownCommand", RUN_THE_BROWSER, KviOption_sectFlagUrl), STRING_OPTION("IPv4ConnectionBindAddress", "", KviOption_sectFlagConnection), diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp index a066714a9..2ffb3d317 100644 --- a/src/modules/dcc/DccFileTransfer.cpp +++ b/src/modules/dcc/DccFileTransfer.cpp @@ -2199,9 +2199,10 @@ bool DccFileTransfer::event(QEvent * e) c = g_pApp->activeConsole(); else c = m_pDescriptor->console(); - c->output(KVI_OUT_DCCMSG, __tr2qs_ctx("DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]play $0\r%Q\r", "dcc"), + c->output(KVI_OUT_DCCMSG, __tr2qs_ctx("DCC %s transfer with %Q@%Q:%Q completed: \r![!dbl]%Q\r%Q\r", "dcc"), m_pDescriptor->bIsTdcc ? (m_pDescriptor->bRecvFile ? "TRECV" : "TSEND") : (m_pDescriptor->bRecvFile ? "RECV" : "SEND"), &(m_pDescriptor->szNick), &(m_pDescriptor->szIp), &(m_pDescriptor->szPort), + KVI_OPTION_STRING(KviOption_stringUrlFileCommand), &(m_pDescriptor->szLocalFileName)); } |
