Merge remote-tracking branch 'origin/4.5'

Change-Id: Iebd340258966aff910fb9ab0e45b5149e8f242f0
This commit is contained in:
Eike Ziller
2017-10-12 09:49:14 +02:00
73 changed files with 3874 additions and 1032 deletions

View File

@@ -2,8 +2,6 @@
<qresource prefix="/help">
<file>images/find.png</file>
<file>images/book.png</file>
<file>images/home.png</file>
<file>images/home@2x.png</file>
<file>images/category_help.png</file>
<file>images/mode_help.png</file>
<file>images/mode_help@2x.png</file>

View File

@@ -176,7 +176,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_switchToHelp, cmd));
}
m_homeAction = new QAction(Icons::HOME_TOOLBAR.icon(), tr("Home"), this);
m_homeAction = new QAction(Utils::Icons::HOME_TOOLBAR.icon(), tr("Home"), this);
cmd = Core::ActionManager::registerAction(m_homeAction, Constants::HELP_HOME, context);
connect(m_homeAction, &QAction::triggered, this, &HelpWidget::goHome);
layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_homeAction, cmd));

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B