Commit 47d9ebff authored by Luigi Toscano's avatar Luigi Toscano

Merge remote-tracking branch 'origin/Applications/17.08'

parents 3e8248c3 a5a8a394
<?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() {}
......
......@@ -172,9 +172,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