diff options
author | Anne Jan Brouwer <brouwer@annejan.com> | 2017-10-11 17:45:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-11 17:45:06 +0200 |
commit | d674481b7fa249b7d5826a0d9b598497539359d6 (patch) | |
tree | 631dc4e32d1f9a84884dd2fb61bb49eb7639e7d4 | |
parent | b2aa11821ca07eb3f7dedc6dcbfce245ad8043fb (diff) | |
parent | 31b6844609926a15e419e9a829b971667274a0bd (diff) |
Merge pull request #322 from cgonzalez/master
Add sftp, ftps, webdav and webdavs as supported links
-rw-r--r-- | src/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 356951b6..83b75d84 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -733,7 +733,7 @@ void MainWindow::DisplayInTextBrowser(QString output, QString prefix, output.replace(QRegExp(">"), ">"); output.replace(QRegExp(" "), " "); - output.replace(QRegExp("((?:https?|ftp|ssh)://\\S+)"), + output.replace(QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), "<a href=\"\\1\">\\1</a>"); output.replace(QRegExp("\n"), "<br />"); output = prefix + output + postfix; @@ -756,7 +756,7 @@ void MainWindow::processErrorExit(int exitCode, const QString &p_error) { output = "<span style=\"color: red;\">" + error + "</span><br />"; } - output.replace(QRegExp("((?:https?|ftp|ssh)://\\S+)"), + output.replace(QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), "<a href=\"\\1\">\\1</a>"); output.replace(QRegExp("\n"), "<br />"); if (!ui->textBrowser->toPlainText().isEmpty()) @@ -1467,7 +1467,7 @@ void MainWindow::addToGridLayout(int position, const QString &field, line->setSizePolicy( QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); line->setObjectName(trimmedField); - trimmedValue.replace(QRegExp("((?:https?|ftp|ssh)://\\S+)"), + trimmedValue.replace(QRegExp("((?:https?|ftp|ssh|sftp|ftps|webdav|webdavs)://\\S+)"), "<a href=\"\\1\">\\1</a>"); line->setText(trimmedValue); line->setReadOnly(true); |