ui: Fixes and improvements for bookmarks

* moved bookmark buttons behind search bar
* suggest qualified name when creating, file name for files
* fixed bug when updating bookmark category
* changed comment toggle arrow
* changed edit and delete icons
* fixed undo for edge bookmarks
* keep categories always alphabetical regardless of subsorting
* keep category expansion state when opening and closing browser
* removed QtBookmarkBar, moved logic into QtBookmarkView
* added bookmarks Menu with shortcuts
	Ctrl + D: Create Bookmark
	Ctrl + B: Bookmark Manager
This commit is contained in:
Eberhard Graether
2017-04-26 00:33:34 +02:00
parent 4ac41de61e
commit 0468168d61
32 changed files with 398 additions and 563 deletions
+5 -22
View File
@@ -24,7 +24,7 @@ QtBookmarkCategory::QtBookmarkCategory()
m_expandButton->setToolTip("Show/Hide bookmarks in this category");
m_expandButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
m_expandButton->setIcon(QPixmap((ResourcePaths::getGuiPath() + "bookmark_view/images/arrow_down.png").c_str()));
m_expandButton->setIconSize(QSize(10, 10));
m_expandButton->setIconSize(QSize(8, 8));
layout->addWidget(m_expandButton);
connect(m_expandButton, SIGNAL(clicked()), this, SLOT(expandClicked()));
@@ -39,6 +39,7 @@ QtBookmarkCategory::QtBookmarkCategory()
m_deleteButton->setObjectName("category_delete_button");
m_deleteButton->setToolTip("Delete this Bookmark Category and the containing Bookmarks");
m_deleteButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
m_deleteButton->setIconSize(QSize(20, 20));
m_deleteButton->setIcon(QPixmap((ResourcePaths::getGuiPath() + "bookmark_view/images/bookmark_delete_icon.png").c_str()));
utility::setWidgetRetainsSpaceWhenHidden(m_deleteButton);
m_deleteButton->hide();
@@ -53,22 +54,12 @@ QtBookmarkCategory::~QtBookmarkCategory()
void QtBookmarkCategory::setName(const std::string& name)
{
if (m_name != NULL)
{
m_name->setText(name.c_str());
}
m_name->setText(name.c_str());
}
std::string QtBookmarkCategory::getName() const
{
std::string result = "";
if (m_name != NULL)
{
result = m_name->text().toStdString();
}
return result;
return m_name->text().toStdString();
}
void QtBookmarkCategory::setId(const Id id)
@@ -107,15 +98,7 @@ void QtBookmarkCategory::expandClicked()
{
if (m_treeItem != NULL)
{
if (m_treeItem->isExpanded())
{
m_treeItem->setExpanded(false);
}
else
{
m_treeItem->setExpanded(true);
}
m_treeItem->setExpanded(!m_treeItem->isExpanded());
updateArrow();
}
}