diff options
| author | Nate Graham <[email protected]> | 2019-04-18 07:43:09 -0600 |
|---|---|---|
| committer | Nate Graham <[email protected]> | 2019-04-18 13:17:00 -0600 |
| commit | 48c082767e3124b1ac6575f83bfcdcdc3e3e9b62 (patch) | |
| tree | f90f1ccec5737a9f41cb583c888c216d158d119d /src | |
| parent | 924c883edc98dbe9d3101847c0eef0b62e5c0f8c (diff) | |
Fix adding "Create New..." menu to toolbar
Summary:
Access the object by its existing name rather than renaming it.
BUG: 405780
FIXED-IN: 19.04.1
Test Plan:
- Add {nav Create New} item to toolbar; it now works
- Verify that {nav Create New} menu and toolbar items are disabled when in the trash
- All tests still pass
Reviewers: elvisangelaccio, broulik, #dolphin, cfeck
Reviewed By: cfeck
Subscribers: cfeck, kfm-devel
Tags: #dolphin
Differential Revision: https://phabricator.kde.org/D20664
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinmainwindow.cpp | 1 | ||||
| -rw-r--r-- | src/tests/dolphinmainwindowtest.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 296cb1400..7224c8ea9 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1103,7 +1103,6 @@ void DolphinMainWindow::setupActions() { // setup 'File' menu m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this); - m_newFileMenu->setObjectName("newFileMenu"); QMenu* menu = m_newFileMenu->menu(); menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp index c98ababa6..3d09699fe 100644 --- a/src/tests/dolphinmainwindowtest.cpp +++ b/src/tests/dolphinmainwindowtest.cpp @@ -243,7 +243,7 @@ void DolphinMainWindowTest::testNewFileMenuEnabled() QVERIFY(QTest::qWaitForWindowExposed(m_mainWindow.data())); QVERIFY(m_mainWindow->isVisible()); - auto newFileMenu = m_mainWindow->findChild<DolphinNewFileMenu*>("newFileMenu"); + auto newFileMenu = m_mainWindow->findChild<DolphinNewFileMenu*>("new_menu"); QVERIFY(newFileMenu); QFETCH(bool, expectedEnabled); |
