Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
tamlok committed Jul 19, 2024
1 parent e3bce37 commit 35a754a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 12 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Install Dependencies
run: |
brew install tree libiodbc libpq optool
brew install tree libiodbc libpq
- name: Fix SQL
run: |
Expand All @@ -72,6 +72,13 @@ jobs:
git clone https://github.com/tamlok/macdeployqtfix.git macdeployqtfix --depth=1
working-directory: ${{runner.workspace}}

- name: Install optool
run: |
wget --no-verbose https://github.com/alexzielenski/optool/releases/download/0.1/optool.zip
unzip ./optool.zip
sudo ln -s ./optool /usr/local/bin/optool
working-directory: ${{runner.workspace}}

- name: Cache Qt
id: cache-qt
uses: actions/cache@v1 # not v2!
Expand Down
25 changes: 14 additions & 11 deletions src/utils/widgetutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <QPushButton>
#include <QSplitter>
#include <QFormLayout>
#include <QFileInfo>

#include <core/global.h>
#include <widgets/messageboxhelper.h>
Expand Down Expand Up @@ -78,19 +79,21 @@ QSize WidgetUtils::availableScreenSize(QWidget *p_widget)
void WidgetUtils::openUrlByDesktop(const QUrl &p_url)
{
const auto scheme = p_url.scheme();
if (scheme != "http" && scheme != "https") {
// Prompt for user.
int ret = MessageBoxHelper::questionYesNo(MessageBoxHelper::Warning,
MainWindow::tr("Are you sure to open link (%1)?").arg(p_url.toString()),
MainWindow::tr("Malicious link might do harm to your device."),
QString(),
nullptr);
if (ret == QMessageBox::No) {
return;
}
if (scheme == "http" || scheme == "https" ||
(p_url.isLocalFile() && QFileInfo(p_url.toLocalFile()).isDir())) {
QDesktopServices::openUrl(p_url);
return;
}

QDesktopServices::openUrl(p_url);
// Prompt for user.
int ret = MessageBoxHelper::questionYesNo(MessageBoxHelper::Warning,
MainWindow::tr("Are you sure to open link (%1)?").arg(p_url.toString()),
MainWindow::tr("Malicious link might do harm to your device."),
QString(),
nullptr);
if (ret == QMessageBox::No) {
return;
}
}

bool WidgetUtils::processKeyEventLikeVi(QWidget *p_widget,
Expand Down

0 comments on commit 35a754a

Please sign in to comment.