Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit a5a8a394 authored by Luigi Toscano's avatar Luigi Toscano

Restore the full help menu for Kontact

Summary:
- let the KXMLGui magic work, and do not disable the Help menu;
- set the translation domain upon creation of the QApplication
  (so the KAboutData is translated too).

The About entry for the current module is not shown yet, and
it will be nice to add it, but this is not a regression compared
to the current status.

Test Plan:
The full standard help menu is shown, with the additional entry
which activates the Kontact start page (which was the only entry
before this patch).
The About box shows the "Translators" field when a translation
is used.

Reviewers: mlaurent

Reviewed By: mlaurent

Subscribers: mlaurent, #kde_pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D8097
parent f0d833f4
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
<gui version="415" name="kontact" >
<gui version="416" name="kontact" >
<MenuBar>
<Menu name="file" noMerge="1">
<text>&amp;File</text>
......@@ -20,7 +20,7 @@
<Action name="settings_configure_kontact"/>
</Menu>
<Menu name="help"><text>&amp;Help</text>
<Action name="help_introduction"/>
<Action name="help_introduction" append="help_whats_this_merge"/>
</Menu>
</MenuBar>
<ToolBar position="Top" noMerge="1" name="mainToolBar"><text>Main Toolbar</text>
......
......@@ -57,6 +57,7 @@ public:
, mMainWindow(nullptr)
, mSessionRestored(false)
{
KLocalizedString::setApplicationDomain("kontact");
}
~KontactApp() {}
......
......@@ -175,9 +175,6 @@ void MainWindow::initGUI()
{
initWidgets();
setupActions();
setHelpMenuEnabled(false);
KHelpMenu *helpMenu = new KHelpMenu(this, QString(), true);
connect(helpMenu, &KHelpMenu::showAboutApplication, this, &MainWindow::showAboutDialog);
KStandardAction::keyBindings(this, &MainWindow::configureShortcuts, actionCollection());
KStandardAction::configureToolbars(this, &MainWindow::configureToolbars, actionCollection());
......
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