Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kleopatra
Commits
87458c2a
Commit
87458c2a
authored
Feb 03, 2022
by
Laurent Montel
Browse files
Make sure helper apps we start are in path
parent
8cc6819d
Pipeline
#132233
passed with stage
in 1 minute and 44 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/conf/kleopageconfigdialog.cpp
View file @
87458c2a
...
...
@@ -180,7 +180,14 @@ void KleoPageConfigDialog::slotHelpClicked()
docUrl
=
QUrl
(
QStringLiteral
(
"help:/"
)).
resolved
(
QUrl
(
docPath
));
// same code as in KHelpClient::invokeHelp
#endif
if
(
docUrl
.
scheme
()
==
QLatin1String
(
"help"
)
||
docUrl
.
scheme
()
==
QLatin1String
(
"man"
)
||
docUrl
.
scheme
()
==
QLatin1String
(
"info"
))
{
QProcess
::
startDetached
(
QStringLiteral
(
"khelpcenter"
),
QStringList
()
<<
docUrl
.
toString
());
const
QString
exec
=
QStandardPaths
::
findExecutable
(
QStringLiteral
(
"khelpcenter"
));
if
(
exec
.
isEmpty
())
{
qCWarning
(
KLEOPATRA_LOG
)
<<
"Could not find khelpcenter in PATH."
;
}
else
{
QProcess
::
startDetached
(
QStringLiteral
(
"khelpcenter"
),
QStringList
()
<<
docUrl
.
toString
());
}
}
else
{
QDesktopServices
::
openUrl
(
docUrl
);
}
...
...
src/libkleopatraclient/core/command.cpp
View file @
87458c2a
...
...
@@ -34,10 +34,11 @@
#include
<gpg-error.h>
#include
<gpgme++/global.h>
#include
<QStandardPaths>
#include
<algorithm>
#include
<string>
#include
<sstream>
#include
<memory>
#include
<sstream>
#include
<string>
#include
<type_traits>
using
namespace
KleopatraClientCopy
;
...
...
@@ -458,11 +459,17 @@ static QString uiserver_executable()
static
QString
start_uiserver
()
{
if
(
!
QProcess
::
startDetached
(
uiserver_executable
(),
QStringList
()
<<
QStringLiteral
(
"--daemon"
)))
{
return
i18n
(
"Failed to start uiserver %1"
,
uiserver_executable
());
}
else
{
return
QString
();
}
const
QString
executable
=
uiserver_executable
();
const
QString
exec
=
QStandardPaths
::
findExecutable
(
executable
);
if
(
exec
.
isEmpty
())
{
qCWarning
(
LIBKLEOPATRACLIENTCORE_LOG
)
<<
"Could not find "
<<
executable
<<
" in PATH."
;
return
i18n
(
"Failed to start uiserver %1"
,
executable
);
}
else
{
QProcess
::
startDetached
(
executable
,
QStringList
()
<<
QStringLiteral
(
"--daemon"
));
}
return
QString
();
}
static
assuan_error_t
getinfo_pid_cb
(
void
*
opaque
,
const
void
*
buffer
,
size_t
length
)
...
...
src/mainwindow.cpp
View file @
87458c2a
...
...
@@ -217,10 +217,17 @@ public:
void
gnupgLogViewer
()
{
if
(
!
QProcess
::
startDetached
(
QStringLiteral
(
"kwatchgnupg"
),
QStringList
()))
KMessageBox
::
error
(
q
,
i18n
(
"Could not start the GnuPG Log Viewer (kwatchgnupg). "
"Please check your installation."
),
i18n
(
"Error Starting KWatchGnuPG"
));
const
QString
exec
=
QStandardPaths
::
findExecutable
(
QStringLiteral
(
"kwatchgnupg"
));
if
(
exec
.
isEmpty
())
{
KMessageBox
::
error
(
q
,
i18n
(
"Could not start the GnuPG Log Viewer (kwatchgnupg). "
"Please check your installation."
),
i18n
(
"Error Starting KWatchGnuPG"
));
}
else
{
QProcess
::
startDetached
(
QStringLiteral
(
"kwatchgnupg"
),
QStringList
());
}
}
void
forceUpdateCheck
()
...
...
Ingo Klöcker
@kloecker
mentioned in commit
61c5cad6
·
Dec 12, 2022
mentioned in commit
61c5cad6
mentioned in commit 61c5cad62ca2a21efa1238e199d9adcfbfd0c60c
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment