diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/General/hal/halplugin.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/streambrowser/streambrowser.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/udisks2/udisks2plugin.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Ui/qsui/mainwindow.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/playlist.cpp | 1 |
5 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp index dfea19cf9..cd4ee96de 100644 --- a/src/plugins/General/hal/halplugin.cpp +++ b/src/plugins/General/hal/halplugin.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2014 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -179,7 +179,7 @@ void HalPlugin::updateActions() action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveHDIcon)); m_actions->addAction(action); - UiHelper::instance()->addAction(action, UiHelper::TOOLS_MENU); + UiHelper::instance()->addAction(action, UiHelper::ADD_MENU); addPath(dev_path); } } diff --git a/src/plugins/General/streambrowser/streambrowser.cpp b/src/plugins/General/streambrowser/streambrowser.cpp index 69fbcd836..87cb86b69 100644 --- a/src/plugins/General/streambrowser/streambrowser.cpp +++ b/src/plugins/General/streambrowser/streambrowser.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012 by Ilya Kotov * + * Copyright (C) 2012-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,7 +33,7 @@ StreamBrowser::StreamBrowser(QObject *parent) : QObject(parent) m_action = new QAction(tr("Stream Browser"), this); m_action->setIcon(QIcon::fromTheme("applications-internet")); m_action->setShortcut(tr("Ctrl+U")); - UiHelper::instance()->addAction(m_action, UiHelper::TOOLS_MENU); + UiHelper::instance()->addAction(m_action, UiHelper::ADD_MENU); connect (m_action, SIGNAL(triggered ()), SLOT(showStreamWindow())); } diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp index 8a37b00e1..2f1f6d675 100644 --- a/src/plugins/General/udisks2/udisks2plugin.cpp +++ b/src/plugins/General/udisks2/udisks2plugin.cpp @@ -153,7 +153,7 @@ void UDisks2Plugin::updateActions() action->setText(actionText); action->setData(dev_path); m_actions->addAction(action); - UiHelper::instance()->addAction(action, UiHelper::TOOLS_MENU); + UiHelper::instance()->addAction(action, UiHelper::ADD_MENU); addPath(dev_path); } } diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp index 42a34e1f2..d523aa041 100644 --- a/src/plugins/Ui/qsui/mainwindow.cpp +++ b/src/plugins/Ui/qsui/mainwindow.cpp @@ -476,7 +476,8 @@ void MainWindow::createActions() m_ui.menuFile->addAction(SET_ACTION(ActionManager::PL_ADD_FILE, this, SLOT(addFiles()))); m_ui.menuFile->addAction(SET_ACTION(ActionManager::PL_ADD_DIRECTORY, this, SLOT(addDir()))); m_ui.menuFile->addAction(SET_ACTION(ActionManager::PL_ADD_URL, this, SLOT(addUrl()))); - m_ui.menuFile->addSeparator(); + QAction *sep = m_ui.menuFile->addSeparator(); + UiHelper::instance()->registerMenu(UiHelper::ADD_MENU, m_ui.menuFile, sep); m_ui.menuFile->addAction(SET_ACTION(ActionManager::PL_NEW, m_pl_manager, SLOT(createPlayList()))); m_ui.menuFile->addAction(SET_ACTION(ActionManager::PL_CLOSE, this, SLOT(removePlaylist()))); m_ui.menuFile->addAction(SET_ACTION(ActionManager::PL_RENAME, this, SLOT(renameTab()))); diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp index edb87cc41..67a5b3d93 100644 --- a/src/plugins/Ui/skinned/playlist.cpp +++ b/src/plugins/Ui/skinned/playlist.cpp @@ -210,6 +210,7 @@ void PlayList::createActions() m_addMenu->addAction(SET_ACTION(ActionManager::PL_ADD_FILE, parent(), SLOT(addFile()))); m_addMenu->addAction(SET_ACTION(ActionManager::PL_ADD_DIRECTORY, parent(), SLOT(addDir()))); m_addMenu->addAction(SET_ACTION(ActionManager::PL_ADD_URL, parent(), SLOT(addUrl()))); + UiHelper::instance()->registerMenu(UiHelper::ADD_MENU, m_addMenu); //sub menu m_subMenu->addAction(SET_ACTION(ActionManager::PL_REMOVE_SELECTED, m_pl_manager, SLOT(removeSelected()))); m_subMenu->addAction(SET_ACTION(ActionManager::PL_REMOVE_ALL, m_pl_manager, SLOT(clear()))); |