FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-02-02 10:27:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try to solve #123.

Browse Source
This commit is contained in:
Martin Rotter 2015-08-26 07:25:37 +02:00
parent 1760e14295
commit bd0b6b9b0e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network-web/downloadmanager.cpp
View File

@ -206,8 +206,8 @@ void DownloadItem::stop() {
void DownloadItem::openFile() { void DownloadItem::openFile() {
if (!QDesktopServices::openUrl(QUrl::fromLocalFile(m_output.fileName()))) { if (!QDesktopServices::openUrl(QUrl::fromLocalFile(m_output.fileName()))) {
MessageBox::show(this, QMessageBox::Warning, tr("Cannot open file"), tr("Cannot open output file. Open it manually."), qApp->showGuiMessage(tr("Cannot open file"), tr("Cannot open output file. Open it manually."),
QString(), QDir::toNativeSeparators(m_output.fileName())); QSystemTrayIcon::Warning, qApp->mainForm(), true);
} }
} }

7
src/network-web/webfactory.cpp
View File

@ -49,7 +49,12 @@ bool WebFactory::openUrlInExternalBrowser(const QString &url) {
QString browser = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserExecutable)).toString(); QString browser = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserExecutable)).toString();
QString arguments = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserArguments)).toString(); QString arguments = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserArguments)).toString();
return QProcess::startDetached(QString("\"") + browser + QSL("\""), QStringList() << arguments.arg(url)); QString call_line = "\"" + browser + "\" \"" + arguments.arg(url) + "\"";
qDebug("Running code '%s'.", qPrintable(call_line));
return QProcess::startDetached(call_line);
//return QProcess::startDetached(QString("\"") + browser + QSL("\""), QStringList() << arguments.arg(url));
} }
else { else {
return QDesktopServices::openUrl(url); return QDesktopServices::openUrl(url);