kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/19.04'

Browse source
This commit is contained in:
Nate Graham 2019-04-18 13:17:13 -06:00
parent e26e823909 48c082767e
commit 546ff9a19e
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dolphinmainwindow.cpp
View file

@ -1103,7 +1103,6 @@ void DolphinMainWindow::setupActions()
{ {
// setup 'File' menu // setup 'File' menu
m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this); m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
m_newFileMenu->setObjectName("newFileMenu");
QMenu* menu = m_newFileMenu->menu(); QMenu* menu = m_newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New")); menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new"))); menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));

2
src/tests/dolphinmainwindowtest.cpp
View file

@ -243,7 +243,7 @@ void DolphinMainWindowTest::testNewFileMenuEnabled()
QVERIFY(QTest::qWaitForWindowExposed(m_mainWindow.data())); QVERIFY(QTest::qWaitForWindowExposed(m_mainWindow.data()));
QVERIFY(m_mainWindow->isVisible()); QVERIFY(m_mainWindow->isVisible());
auto newFileMenu = m_mainWindow->findChild<DolphinNewFileMenu*>("newFileMenu"); auto newFileMenu = m_mainWindow->findChild<DolphinNewFileMenu*>("new_menu");
QVERIFY(newFileMenu); QVERIFY(newFileMenu);
QFETCH(bool, expectedEnabled); QFETCH(bool, expectedEnabled);