diff options
| author | saturneric <[email protected]> | 2025-04-19 03:22:28 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-04-19 03:28:53 +0000 |
| commit | 2e6ea3a072795685261ca07a6ac8e56f57f73b45 (patch) | |
| tree | da31fa9d1956ed62feeac9924bfd6a6c73e83fae /src | |
| parent | fix: specify search paths to avoid the pinentry notice on macOS (diff) | |
| download | GpgFrontend-2e6ea3a072795685261ca07a6ac8e56f57f73b45.tar.gz GpgFrontend-2e6ea3a072795685261ca07a6ac8e56f57f73b45.zip | |
fix: should set default workspace to home path on macOS
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/utils/GpgUtils.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widgets/TextEditTabWidget.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/core/utils/GpgUtils.cpp b/src/core/utils/GpgUtils.cpp index 5ca10618..aecfad10 100644 --- a/src/core/utils/GpgUtils.cpp +++ b/src/core/utils/GpgUtils.cpp @@ -462,7 +462,7 @@ auto GPGFRONTEND_CORE_EXPORT DecidePinentry() -> QString { QStringList preferred_list = {"pinentry-gnome3", "pinentry-qt" "pinentry-gtk2"}; - QStringList search_paths = {"/bin", "/usr/bin", "/usr/local/bin"} + QStringList search_paths = {"/bin", "/usr/bin", "/usr/local/bin"}; #elif defined(__APPLE__) && defined(__MACH__) QStringList preferred_list = {"pinentry-mac", "pinentry-qt"}; QStringList search_paths = {"/opt/homebrew/bin", "/usr/local/bin"}; @@ -479,6 +479,7 @@ auto GPGFRONTEND_CORE_EXPORT DecidePinentry() -> QString { for (const QString& name : preferred_list) { QString path = QStandardPaths::findExecutable(name); if (!path.isEmpty()) { + LOG_D() << "find pinentry path: " << path; return path; } } @@ -488,6 +489,7 @@ auto GPGFRONTEND_CORE_EXPORT DecidePinentry() -> QString { for (const QString& name : preferred_list) { QString path = QStandardPaths::findExecutable(name, search_paths); if (!path.isEmpty()) { + LOG_D() << "find pinentry path by search path: " << path; return path; } } diff --git a/src/ui/widgets/TextEditTabWidget.cpp b/src/ui/widgets/TextEditTabWidget.cpp index f13d8392..d156143f 100644 --- a/src/ui/widgets/TextEditTabWidget.cpp +++ b/src/ui/widgets/TextEditTabWidget.cpp @@ -312,8 +312,12 @@ void TextEditTabWidget::SlotNewTabWithContent(QString title, } void TextEditTabWidget::SlotOpenDefaultPath() { +#if defined(__APPLE__) && defined(__MACH__) + auto* page = new FilePage(qobject_cast<QWidget*>(parent()), QDir::homePath()); +#else auto* page = new FilePage(qobject_cast<QWidget*>(parent()), QDir::currentPath()); +#endif auto index = this->addTab(page, QString()); this->setTabIcon(index, QIcon(":/icons/workspace.png")); this->setTabText(index, tr("Default Workspace")); |