Commit c67a16fc authored by Laurent Montel's avatar Laurent Montel 😁

Really not useful as apps that we can launch from kmail

parent 23aeca9d
......@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE gui>
<gui version="529" name="kmmainwin" translationDomain="kmail">
<gui version="530" name="kmmainwin" translationDomain="kmail">
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
......@@ -198,7 +198,6 @@
<Separator/>
<Action name="addressbook"/>
<Action name="tools_start_certman"/>
<Action name="tools_start_kwatchgnupg"/>
<Separator/>
<Action name="tools_edit_vacation"/>
<Separator/>
......
......@@ -97,15 +97,6 @@ void KMLaunchExternalComponent::slotStartCertManager()
}
}
void KMLaunchExternalComponent::slotStartWatchGnuPG()
{
if (!QProcess::startDetached(QStringLiteral("kwatchgnupg"))) {
KMessageBox::error(mParentWidget, i18n("Could not start GnuPG LogViewer (kwatchgnupg); "
"please check your installation."),
i18n("KMail Error"));
}
}
void KMLaunchExternalComponent::slotImportWizard()
{
const QString path = QStandardPaths::findExecutable(QStringLiteral("akonadiimportwizard"));
......
......@@ -33,7 +33,6 @@ public Q_SLOTS:
void slotConfigureAutomaticArchiving();
void slotConfigureFollowupReminder();
void slotStartCertManager();
void slotStartWatchGnuPG();
void slotImportWizard();
void slotExportData();
void slotRunAddressBook();
......
......@@ -2831,19 +2831,7 @@ void KMMainWidget::setupActions()
action->setEnabled(false);
}
}
{
QAction *action = new QAction(QIcon::fromTheme(QStringLiteral("pgp-keys")), i18n("GnuPG Log Viewer"), this);
actionCollection()->addAction(QStringLiteral("tools_start_kwatchgnupg"), action);
connect(action, &QAction::triggered, mLaunchExternalComponent, &KMLaunchExternalComponent::slotStartWatchGnuPG);
#ifdef Q_OS_WIN32
// not ported yet, underlying infrastructure missing on Windows
const bool usableKWatchGnupg = false;
#else
// disable action if no kwatchgnupg binary is around
bool usableKWatchGnupg = !QStandardPaths::findExecutable(QStringLiteral("kwatchgnupg")).isEmpty();
#endif
action->setEnabled(usableKWatchGnupg);
}
{
QAction *action = new QAction(QIcon::fromTheme(QStringLiteral("document-import")), i18n("&Import Messages..."), this);
actionCollection()->addAction(QStringLiteral("import"), action);
......
......@@ -2,7 +2,7 @@
the same menu entries at the same place in KMail and Kontact -->
<!DOCTYPE gui>
<gui version="529" name="kmmainwin" translationDomain="kmail">
<gui version="530" name="kmmainwin" translationDomain="kmail">
<MenuBar>
<Menu noMerge="1" name="file" >
<text>&amp;File</text>
......@@ -198,7 +198,6 @@
<Separator/>
<Action name="addressbook"/>
<Action name="tools_start_certman"/>
<Action name="tools_start_kwatchgnupg"/>
<Separator/>
<Action name="tools_edit_vacation"/>
<Separator/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment