Skip to content

Disable folder selection when selecting bookmark as home page #1628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Disable folder selection when selecting bookmark as home page #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/ui/Menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,11 +692,16 @@ void Menu::populateBookmarkSelectorMenu()
}

const BookmarksModel::Bookmark *folderBookmark(BookmarksManager::getModel()->getBookmark(m_menuOptions.value(QLatin1String("bookmark")).toULongLong()));
Action *addFolderAction(new Action(-1, {}, {{QLatin1String("icon"), QLatin1String("document-open-folder")}, {QLatin1String("text"), QT_TRANSLATE_NOOP("actions", "This Folder")}}, ActionExecutor::Object(), this));
addFolderAction->setData(folderBookmark->getIdentifier());

addAction(addFolderAction);
addSeparator();
const bool supportsFolderSelection = m_menuOptions.value(QLatin1String("supportsFolderSelection"), true).toBool();
if (supportsFolderSelection)
{
Action *addFolderAction(new Action(-1, {}, {{QLatin1String("icon"), QLatin1String("document-open-folder")}, {QLatin1String("text"), QT_TRANSLATE_NOOP("actions", "This Folder")}}, ActionExecutor::Object(), this));
addFolderAction->setData(folderBookmark->getIdentifier());

addAction(addFolderAction);
addSeparator();
}

for (int i = 0; i < folderBookmark->rowCount(); ++i)
{
Expand All @@ -718,7 +723,7 @@ void Menu::populateBookmarkSelectorMenu()
if (type != BookmarksModel::UrlBookmark)
{
Menu *menu(new Menu(BookmarkSelectorMenu, this));
menu->setMenuOptions({{QLatin1String("bookmark"), bookmark->getIdentifier()}});
menu->setMenuOptions({{QLatin1String("bookmark"), bookmark->getIdentifier()}, {QLatin1String("supportsFolderSelection"), supportsFolderSelection}});

action->setMenu(menu);
}
Expand Down
1 change: 1 addition & 0 deletions src/ui/preferences/PreferencesGeneralPageWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ PreferencesGeneralPageWidget::PreferencesGeneralPageWidget(QWidget *parent) : QW
m_ui->homePageLineEditWidget->setText(SettingsManager::getOption(SettingsManager::Browser_HomePageOption).toString());

Menu *bookmarksMenu(new Menu(Menu::BookmarkSelectorMenu, m_ui->useBookmarkAsHomePageButton));
bookmarksMenu->setMenuOptions({{QLatin1String("supportsFolderSelection"), false}});

m_ui->useBookmarkAsHomePageButton->setMenu(bookmarksMenu);
m_ui->useBookmarkAsHomePageButton->setEnabled(BookmarksManager::getModel()->getRootItem()->rowCount() > 0);
Expand Down