ui: bookmarks

can now bookmark tokens
This commit is contained in:
wrongway88
2017-02-12 15:06:07 +01:00
parent e1d2c3a4e0
commit 97fd40fe9b
84 changed files with 5024 additions and 65 deletions
+283
View File
@@ -0,0 +1,283 @@
#include "QtBookmarkBrowser.h"
#include "qt/element/QtBookmark.h"
#include "qt/element/QtBookmarkCategory.h"
#include <QHeaderView>
#include "data/bookmark/Bookmark.h"
#include "qt/utility/utilityQt.h"
#include "utility/ResourcePaths.h"
QtBookmarkBrowser::QtBookmarkBrowser(QWidget* parent)
: QtWindow(parent)
, m_headerBackground(NULL)
{
}
QtBookmarkBrowser::~QtBookmarkBrowser()
{
}
void QtBookmarkBrowser::setupBookmarkBrowser()
{
m_layout = new QHBoxLayout();
m_layout->setSpacing(0);
m_layout->setContentsMargins(0, 0, 0, 0);
m_layout->setAlignment(Qt::AlignTop);
setLayout(m_layout);
m_headerBackground = new QWidget(m_window);
m_headerBackground->setObjectName("header_background");
m_headerBackground->setGeometry(0, 0, 0, 0);
m_headerBackground->show();
m_headerBackground->lower();
m_headerLayout = new QVBoxLayout(this);
m_headerLayout->setObjectName("header");
m_headerLayout->setSpacing(0);
m_headerLayout->setContentsMargins(0, 0, 0, 0);
m_headerLayout->setAlignment(Qt::AlignTop);
m_layout->addLayout(m_headerLayout);
m_bodyLayout = new QVBoxLayout(this);
m_bodyLayout->setObjectName("body");
m_bodyLayout->setSpacing(0);
m_bodyLayout->setContentsMargins(0, 0, 0, 0);
m_bodyLayout->setAlignment(Qt::AlignLeft);
m_layout->addLayout(m_bodyLayout);
m_title = new QLabel(this);
m_title->setObjectName("title");
m_title->setText("Bookmarks");
m_headerLayout->addWidget(m_title);
m_filterLabel = new QLabel(this);
m_filterLabel->setObjectName("filter_label");
m_filterLabel->setText("Show:");
m_headerLayout->addWidget(m_filterLabel);
m_filterComboBox = new QComboBox(this);
m_filterComboBox->addItem("All");
m_filterComboBox->addItem("Nodes");
m_filterComboBox->addItem("Edges");
m_filterComboBox->setObjectName("filter_box");
m_headerLayout->addWidget(m_filterComboBox);
connect(m_filterComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(filterBoxChanged(const QString&)));
m_orderLabel = new QLabel(this);
m_orderLabel->setObjectName("order_label");
m_orderLabel->setText("Sort by:");
m_headerLayout->addWidget(m_orderLabel);
m_orderNames.push_back("Date des.");
m_orderNames.push_back("Date asc.");
m_orderNames.push_back("Name des.");
m_orderNames.push_back("Name asc.");
m_currentOrderIndex = 0;
m_orderComboBox = new QComboBox(this);
// m_orderComboBox->setToolTip("Select Bookmark Order");
m_orderComboBox->addItem(m_orderNames[0].c_str());
m_orderComboBox->addItem(m_orderNames[1].c_str());
m_orderComboBox->addItem(m_orderNames[2].c_str());
m_orderComboBox->addItem(m_orderNames[3].c_str());
m_orderComboBox->setObjectName("order_box");
m_headerLayout->addWidget(m_orderComboBox);
connect(m_orderComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(orderBoxChanged(const QString&)));
m_headerLayout->addWidget(m_orderComboBox);
m_bookmarkTree = new QTreeWidget();
m_bookmarkTree->setObjectName("bookmark_tree");
m_bookmarkTree->setSelectionMode(QAbstractItemView::SelectionMode::NoSelection);
m_bookmarkTree->header()->close();
m_bookmarkTree->setAlternatingRowColors(true);
m_bookmarkTree->setIndentation(0);
m_bookmarkTree->setHeaderLabel("Bookmarks");
connect(m_bookmarkTree, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(itemExpanded(QTreeWidgetItem*)));
connect(m_bookmarkTree, SIGNAL(itemCollapsed(QTreeWidgetItem*)), this, SLOT(itemCollapsed(QTreeWidgetItem*)));
// m_bookmarkTree->icon
m_bodyLayout->addWidget(m_bookmarkTree);
m_closeButton = new QPushButton(this);
m_closeButton->setObjectName("close_button");
m_closeButton->setToolTip("Close Window");
m_closeButton->setText("Close");
m_closeButton->setAttribute(Qt::WA_LayoutUsesWidgetRect); // fixes layouting on Mac
m_bodyLayout->addWidget(m_closeButton);
m_bodyLayout->setAlignment(m_closeButton, Qt::AlignRight);
connect(m_closeButton, SIGNAL(clicked()), this, SLOT(closeButtonClicked()));
setFixedSize(QSize(790, 600));
setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath() + "bookmark_view/bookmark_view.css").c_str());
m_headerBackground->setGeometry(0, 0, 247, size().height()-20);
}
void QtBookmarkBrowser::setBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks)
{
m_bookmarkTree->clear();
// m_bookmarkTree->adjustSize();
for (unsigned int i = 0; i < bookmarks.size(); i++)
{
QtBookmark* bookmark = new QtBookmark();
bookmark->setName(bookmarks[i]->getDisplayName());
bookmark->setBookmark(bookmarks[i]);
QTreeWidgetItem* top = findOrCreateTreeCategory(bookmarks[i]->getCategory().getName(), bookmarks[i]->getCategory().getId());
QTreeWidgetItem* treeWidgetItem = new QTreeWidgetItem(top);
// treeWidgetItem->setText(0, bookmarks[i]->getDisplayName().c_str());
treeWidgetItem->setSizeHint(0, bookmark->minimumSizeHint());
m_bookmarkTree->setItemWidget(treeWidgetItem, 0, bookmark);
top->addChild(treeWidgetItem);
bookmark->setTreeWidgetItem(top);
top->setExpanded(true);
}
}
void QtBookmarkBrowser::closeButtonClicked()
{
try
{
close();
}
catch (std::exception& e)
{
std::string message = e.what();
LOG_ERROR(message);
}
}
void QtBookmarkBrowser::filterBoxChanged(const QString& text)
{
MessageDisplayBookmarks(getSelectedFilter(), getSelectedOrder()).dispatch();
}
void QtBookmarkBrowser::orderBoxChanged(const QString& text)
{
MessageDisplayBookmarks(getSelectedFilter(), getSelectedOrder()).dispatch();
}
void QtBookmarkBrowser::itemExpanded(QTreeWidgetItem* item)
{
QWidget* widget = m_bookmarkTree->itemWidget(item, 0);
QtBookmarkCategory* category = dynamic_cast<QtBookmarkCategory*>(widget);
if (category != NULL)
{
category->updateArrow();
}
}
void QtBookmarkBrowser::itemCollapsed(QTreeWidgetItem* item)
{
QWidget* widget = m_bookmarkTree->itemWidget(item, 0);
QtBookmarkCategory* category = dynamic_cast<QtBookmarkCategory*>(widget);
if (category != NULL)
{
category->updateArrow();
}
}
void QtBookmarkBrowser::handleMessage(MessageDeleteBookmark* message)
{
MessageDisplayBookmarks(getSelectedFilter(), getSelectedOrder()).dispatch();
}
void QtBookmarkBrowser::handleMessage(MessageEditBookmark* message)
{
MessageDisplayBookmarks(getSelectedFilter(), getSelectedOrder()).dispatch();
}
MessageDisplayBookmarks::BookmarkFilter QtBookmarkBrowser::getSelectedFilter()
{
std::string text = m_filterComboBox->currentText().toStdString();
if (text == "Nodes")
{
return MessageDisplayBookmarks::BookmarkFilter::NODES;
}
else if (text == "Edges")
{
return MessageDisplayBookmarks::BookmarkFilter::EDGES;
}
return MessageDisplayBookmarks::BookmarkFilter::ALL;
}
MessageDisplayBookmarks::BookmarkOrder QtBookmarkBrowser::getSelectedOrder()
{
std::string orderString = m_orderComboBox->currentText().toStdString(); // m_orderButton->text().toStdString();
if (orderString == m_orderNames[0])
{
return MessageDisplayBookmarks::BookmarkOrder::DATE_DESCENDING;
}
else if (orderString == m_orderNames[1])
{
return MessageDisplayBookmarks::BookmarkOrder::DATE_ASCENDING;
}
else if (orderString == m_orderNames[2])
{
return MessageDisplayBookmarks::BookmarkOrder::NAME_DESCENDING;
}
else if (orderString == m_orderNames[3])
{
return MessageDisplayBookmarks::BookmarkOrder::NAME_ASCENDING;
}
else
{
return MessageDisplayBookmarks::BookmarkOrder::NONE;
}
}
QTreeWidgetItem* QtBookmarkBrowser::findOrCreateTreeCategory(const std::string& name, const Id id)
{
for (int i = 0; i < m_bookmarkTree->topLevelItemCount(); i++)
{
QTreeWidgetItem* item = m_bookmarkTree->topLevelItem(i);
if (item->whatsThis(0).toStdString() == name)
{
return item;
}
}
QtBookmarkCategory* category = new QtBookmarkCategory();
if (name.length() > 0)
{
category->setName(name);
}
else
{
category->setName("No Category");
}
category->setId(id);
QTreeWidgetItem* newItem = new QTreeWidgetItem(m_bookmarkTree);
newItem->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
newItem->setSizeHint(0, category->minimumSizeHint());
newItem->setWhatsThis(0, name.c_str());
category->setTreeWidgetItem(newItem);
m_bookmarkTree->setItemWidget(newItem, 0, category);
m_bookmarkTree->addTopLevelItem(newItem);
return newItem;
}
+74
View File
@@ -0,0 +1,74 @@
#ifndef QT_BOOKMARK_BROWSER_H
#define QT_BOOKMARK_BROWSER_H
#include <QWidget>
#include <QComboBox>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include <QWidget>
#include <QListWidget>
#include <QTreeWidget>
#include "qt/window/QtWindow.h"
#include "utility/messaging/MessageListener.h"
#include "utility/messaging/type/MessageDeleteBookmark.h"
#include "utility/messaging/type/MessageDisplayBookmarks.h"
#include "utility/messaging/type/MessageEditBookmark.h"
class Bookmark;
class QtBookmark;
class QtBookmarkBrowser
: public QtWindow
, public MessageListener<MessageDeleteBookmark>
, public MessageListener<MessageEditBookmark>
{
Q_OBJECT
public:
QtBookmarkBrowser(QWidget* parent = nullptr);
~QtBookmarkBrowser();
void setupBookmarkBrowser();
void setBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks);
private slots:
void closeButtonClicked();
void filterBoxChanged(const QString& text);
void orderBoxChanged(const QString& text);
void itemExpanded(QTreeWidgetItem* item);
void itemCollapsed(QTreeWidgetItem* item);
private:
virtual void handleMessage(MessageDeleteBookmark* message);
virtual void handleMessage(MessageEditBookmark* message);
MessageDisplayBookmarks::BookmarkFilter getSelectedFilter();
MessageDisplayBookmarks::BookmarkOrder getSelectedOrder();
QTreeWidgetItem* findOrCreateTreeCategory(const std::string& name, const Id id);
QHBoxLayout* m_layout;
QVBoxLayout* m_headerLayout;
QVBoxLayout* m_bodyLayout;
QTreeWidget* m_bookmarkTree;
QPushButton* m_closeButton;
QLabel* m_title;
QLabel* m_filterLabel;
QLabel* m_orderLabel;
QComboBox* m_filterComboBox;
QComboBox* m_orderComboBox;
std::vector<std::string> m_orderNames;
int m_currentOrderIndex;
QWidget* m_headerBackground;
};
#endif // QT_BOOKMARK_BROWSER_H
+233
View File
@@ -0,0 +1,233 @@
#include "QtBookmarkCreator.h"
#include <QHBoxLayout>
#include "data/bookmark/BookmarkCategory.h"
#include "utility/messaging/type/MessageCreateBookmark.h"
#include "utility/messaging/type/MessageCreateBookmarkCategory.h"
#include "utility/messaging/type/MessageEditBookmark.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/ResourcePaths.h"
#include "qt/utility/utilityQt.h"
#include "settings/ApplicationSettings.h"
#include "settings/ColorScheme.h"
QString QtBookmarkCreator::m_namePlaceholder = "Name";
QString QtBookmarkCreator::m_commentPlaceholder = "Comment";
QString QtBookmarkCreator::m_categoryPlaceholder = "Category";
QtBookmarkCreator::QtBookmarkCreator(QWidget* parent, bool edit, Id id)
: QtWindow(parent)
, m_edit(edit)
, m_bookmarkId(id)
, m_categoryCount(0)
{
}
QtBookmarkCreator::~QtBookmarkCreator()
{
}
void QtBookmarkCreator::setupBookmarkCreator()
{
m_displayName = new QLineEdit(this);
m_displayName->setObjectName("display_name_edit");
m_commentBox = new QTextEdit(this);
m_commentBox->setObjectName("comment_box");
m_categoryBox = new QComboBox(this);
m_categoryBox->setObjectName("category_box");
m_title = new QLabel();
if (m_edit == true)
{
m_title->setText("Edit Bookmark");
}
else
{
m_title->setText("Create Bookmark");
}
m_title->setObjectName("creator_title_label");
m_nameLabel = new QLabel();
m_nameLabel->setText("Bookmark:");
m_nameLabel->setObjectName("creator_name_label");
m_commentLabel = new QLabel();
m_commentLabel->setText("Comment:");
m_commentLabel->setObjectName("creator_comment_label");
m_categoryLabel = new QLabel();
m_categoryLabel->setText("Choose or Create Bookmark:");
m_categoryLabel->setObjectName("category_label");
m_categoryBox->addItem("");
m_categoryBox->setEditable(true);
m_categoryBox->setInsertPolicy(QComboBox::InsertPolicy::InsertAtTop);
m_categoryCount = m_categoryBox->count();
m_cancelButton = new QPushButton(this);
m_cancelButton->setObjectName("creator_cancel_button");
m_cancelButton->setText("Cancel");
m_createButton = new QPushButton(this);
m_createButton->setObjectName("creator_create_button");
if (m_edit)
{
m_createButton->setText("Save");
}
else
{
m_createButton->setText("Create");
}
m_commentBox->setPlaceholderText(m_commentPlaceholder);
m_displayName->setPlaceholderText(m_namePlaceholder);
m_categoryBox->lineEdit()->setPlaceholderText(m_categoryPlaceholder);
m_createButton->setEnabled(false);
connect(m_displayName, SIGNAL(textChanged(const QString&)), this, SLOT(onNameChanged(const QString&)));
connect(m_commentBox, SIGNAL(textChanged()), this, SLOT(onCommentChanged()));
connect(m_categoryBox, SIGNAL(currentTextChanged(const QString&)), this, SLOT(onCategoryChanged(const QString&)));
connect(m_categoryBox, SIGNAL(currentIndexChanged(int)), this, SLOT(onComboBoxIndexChanged(int)));
connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
connect(m_createButton, SIGNAL(clicked()), this, SLOT(create()));
m_layout = new QVBoxLayout(this);
m_layout->addWidget(m_title);
m_layout->addWidget(m_nameLabel);
m_layout->addWidget(m_displayName);
m_layout->addWidget(m_commentLabel);
m_layout->addWidget(m_commentBox);
m_layout->addWidget(m_categoryLabel);
m_layout->addWidget(m_categoryBox);
QHBoxLayout* buttonLayout = new QHBoxLayout(this);
buttonLayout->addWidget(m_cancelButton);
buttonLayout->setAlignment(m_cancelButton, Qt::AlignLeft);
buttonLayout->addWidget(m_createButton);
buttonLayout->setAlignment(m_createButton, Qt::AlignRight);
m_layout->addLayout(buttonLayout);
m_headerBackground = new QWidget(m_window);
m_headerBackground->setObjectName("creator_header_background");
m_headerBackground->setGeometry(0, 0, 0, 0);
m_headerBackground->show();
m_headerBackground->lower();
setFixedSize(QSize(500, 580));
refreshStyle();
m_headerBackground->setGeometry(0, 0, size().width() - 10, 70);
}
void QtBookmarkCreator::refreshStyle()
{
setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath() + "bookmark_view/bookmark_view.css").c_str());
}
void QtBookmarkCreator::setDisplayName(const std::string& name)
{
m_displayName->setText(name.c_str());
}
void QtBookmarkCreator::setComment(const std::string& comment)
{
m_commentBox->setText(comment.c_str());
}
void QtBookmarkCreator::setBookmarkCategories(const std::vector<BookmarkCategory>& categories)
{
for (unsigned int i = 0; i < categories.size(); i++)
{
m_categoryBox->addItem(categories[i].getName().c_str());
}
}
void QtBookmarkCreator::setCurrentBookmarkCategory(const BookmarkCategory& category)
{
int index = m_categoryBox->findText(category.getName().c_str());
if (index > -1)
{
m_categoryBox->setCurrentIndex(index);
}
else
{
m_categoryBox->addItem(category.getName().c_str());
m_categoryBox->setCurrentIndex(1);
}
}
bool QtBookmarkCreator::getIsEdge() const
{
return m_isEdge;
}
void QtBookmarkCreator::setIsEdge(const bool isEdge)
{
m_isEdge = isEdge;
}
void QtBookmarkCreator::onNameChanged(const QString& text)
{
if (text.length() > 0)
{
m_createButton->setEnabled(true);
}
else
{
m_createButton->setEnabled(false);
}
}
void QtBookmarkCreator::onCommentChanged()
{
/*if (m_commentBox->toPlainText().size() <= 0)
{
m_commentBox->
}*/
}
void QtBookmarkCreator::onCategoryChanged(const QString& text)
{
}
void QtBookmarkCreator::onComboBoxIndexChanged(int index)
{
if (m_categoryBox->count() > m_categoryCount)
{
std::string categoryName = m_categoryBox->currentText().toStdString();
MessageCreateBookmarkCategory(categoryName).dispatch();
m_categoryCount = m_categoryBox->count();
}
}
void QtBookmarkCreator::cancel()
{
close();
}
void QtBookmarkCreator::create()
{
QString qComment = m_commentBox->toPlainText();
QString qDisplayName = m_displayName->text();
QString qCategory = m_categoryBox->currentText();
if (m_edit)
{
MessageEditBookmark(m_bookmarkId, qComment.toStdString(), qDisplayName.toStdString(), qCategory.toStdString(), m_isEdge).dispatch();
}
else
{
MessageCreateBookmark(qComment.toStdString(), qDisplayName.toStdString(), qCategory.toStdString()).dispatch();
}
MessageStatus("Creating Bookmark for active Token").dispatch();
close();
}
+79
View File
@@ -0,0 +1,79 @@
#ifndef QT_BOOKMARK_CREATOR_H
#define QT_BOOKMARK_CREATOR_H
#include <QComboBox>
#include <QLineEdit>
#include <QLabel>
#include <QPushButton>
#include <QTextEdit>
#include <QWidget>
#include <QVBoxLayout>
#include "qt/window/QtWindow.h"
#include "utility/types.h"
class BookmarkCategory;
class QtBookmarkCreator
: public QtWindow
{
Q_OBJECT
public:
QtBookmarkCreator(QWidget* parent = nullptr, bool edit = false, Id id = -1);
~QtBookmarkCreator();
void setupBookmarkCreator();
void refreshStyle();
void setDisplayName(const std::string& name);
void setComment(const std::string& comment);
void setBookmarkCategories(const std::vector<BookmarkCategory>& categories);
void setCurrentBookmarkCategory(const BookmarkCategory& category);
bool getIsEdge() const;
void setIsEdge(const bool isEdge);
private slots:
void onNameChanged(const QString& text);
void onCommentChanged();
void onCategoryChanged(const QString& text);
void onComboBoxIndexChanged(int index);
void cancel();
void create();
private:
bool m_edit;
Id m_bookmarkId; // important for editing
QLabel* m_title;
QLabel* m_nameLabel;
QLabel* m_commentLabel;
QLabel* m_categoryLabel;
QLineEdit* m_displayName;
QTextEdit* m_commentBox;
QComboBox* m_categoryBox;
QPushButton* m_cancelButton;
QPushButton* m_createButton;
QVBoxLayout* m_layout;
int m_categoryCount;
static QString m_namePlaceholder;
static QString m_commentPlaceholder;
static QString m_categoryPlaceholder;
bool m_isEdge;
QWidget* m_headerBackground;
};
#endif // QT_BOOKMARK_CREATOR_H
+11 -2
View File
@@ -53,9 +53,18 @@ void QtRecentProjectButton::handleButtonClick()
{
std::string text = "Couldn't find " + m_projectFilePath.str()
+ " in your filesystem. Delete it from this recent Proejct list?";
int ret = QMessageBox::question(this, "Missing Project File", text.c_str(), QMessageBox::Yes | QMessageBox::No);
// int ret = QMessageBox::question(this, "Missing Project File", text.c_str(), QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes)
QMessageBox msgBox;
msgBox.setText("Missing Project File");
msgBox.setInformativeText(text.c_str());
QAbstractButton* yesButton = msgBox.addButton("Delete", QMessageBox::ButtonRole::YesRole);
QAbstractButton* noButton = msgBox.addButton("Keep", QMessageBox::ButtonRole::NoRole);
msgBox.setIcon(QMessageBox::Icon::Question);
int ret = msgBox.exec();
if (ret == 0) // QMessageBox::Yes)
{
std::vector<FilePath> recentProjects = ApplicationSettings::getInstance()->getRecentProjects();
const int maxRecentProjectsCount = ApplicationSettings::getInstance()->getMaxRecentProjectsCount();