1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00

Merge branch 'Falkon/3.1'

This commit is contained in:
David Rosca 2019-04-20 16:15:29 +02:00
commit 0b261874cb
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8

View File

@ -107,9 +107,9 @@ void BookmarksManager::createContextMenu(const QPoint &pos)
QAction* actNewPrivateWindow = menu.addAction(IconProvider::privateBrowsingIcon(), tr("Open in new private window")); QAction* actNewPrivateWindow = menu.addAction(IconProvider::privateBrowsingIcon(), tr("Open in new private window"));
menu.addSeparator(); menu.addSeparator();
menu.addAction(tr("New Bookmark"), this, SLOT(addBookmark())); QAction *actNewBookmark = menu.addAction(tr("New Bookmark"), this, SLOT(addBookmark()));
menu.addAction(tr("New Folder"), this, &BookmarksManager::addFolder); QAction *actNewFolder = menu.addAction(tr("New Folder"), this, &BookmarksManager::addFolder);
menu.addAction(tr("New Separator"), this, &BookmarksManager::addSeparator); QAction *actNewSeparator = menu.addAction(tr("New Separator"), this, &BookmarksManager::addSeparator);
menu.addSeparator(); menu.addSeparator();
QAction* actDelete = menu.addAction(QIcon::fromTheme(QSL("edit-delete")), tr("Delete")); QAction* actDelete = menu.addAction(QIcon::fromTheme(QSL("edit-delete")), tr("Delete"));
@ -138,6 +138,12 @@ void BookmarksManager::createContextMenu(const QPoint &pos)
actNewPrivateWindow->setDisabled(true); actNewPrivateWindow->setDisabled(true);
} }
if (!m_selectedBookmark) {
actNewBookmark->setDisabled(true);
actNewFolder->setDisabled(true);
actNewSeparator->setDisabled(true);
}
menu.exec(pos); menu.exec(pos);
} }