ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Use ControllerProxy in Bookmarking UI classes instead of messaging

Browse Source 
* changed ControllerProxy to template class
* allow passing method pointers and arguments to ControllerProxy
* replaced some messages with ControllerProxy calls
* moved logic from BookmarkView into BookmarkController
This commit is contained in:
Eberhard Graether
2017-10-03 07:59:59 +02:00
parent e604d24c40
commit a72da67d32
33 changed files with 641 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtBookmark.cpp
+7 -10
View File
@@ -6,15 +6,12 @@
#include <QTimer>
#include <QVBoxLayout>
#include "utility/messaging/type/MessageActivateBookmark.h"
#include "utility/messaging/type/MessageDeleteBookmark.h"
#include "utility/messaging/type/MessageDisplayBookmarkEditor.h"
#include "qt/utility/utilityQt.h"
#include "utility/ResourcePaths.h"
#include "qt/utility/utilityQt.h"
QtBookmark::QtBookmark()
: m_treeWidgetItem(NULL)
QtBookmark::QtBookmark(ControllerProxy<BookmarkController>* controllerProxy)
: m_controllerProxy(controllerProxy)
, m_treeWidgetItem(NULL)
, m_arrowImageName("arrow_line_down.png")
, m_hovered(false)
, m_ignoreNextResize(false)
@@ -202,12 +199,12 @@ void QtBookmark::leaveEvent(QEvent *event)
void QtBookmark::activateClicked()
{
MessageActivateBookmark(m_bookmark).dispatch();
m_controllerProxy->executeAsTaskWithArgs(&BookmarkController::activateBookmark, m_bookmark);
}
void QtBookmark::editClicked()
{
MessageDisplayBookmarkEditor(m_bookmark).dispatch();
m_controllerProxy->executeAsTaskWithArgs(&BookmarkController::showBookmarkEditor, m_bookmark);
}
void QtBookmark::deleteClicked()
@@ -222,7 +219,7 @@ void QtBookmark::deleteClicked()
if (ret == 0) // QMessageBox::Yes)
{
MessageDeleteBookmark(m_bookmark->getId()).dispatch();
m_controllerProxy->executeAsTaskWithArgs(&BookmarkController::deleteBookmark, m_bookmark->getId());
}
}
src/lib_gui/qt/element/QtBookmark.h
+5 -1
View File
@@ -6,6 +6,8 @@
#include <QPushButton>
#include <QTreeWidget>
#include "component/controller/BookmarkController.h"
#include "component/controller/helper/ControllerProxy.h"
#include "data/bookmark/Bookmark.h"
class Bookmark;
@@ -16,7 +18,7 @@ class QtBookmark
Q_OBJECT
public:
QtBookmark();
QtBookmark(ControllerProxy<BookmarkController>* controllerProxy);
virtual ~QtBookmark();
void setBookmark(const std::shared_ptr<Bookmark> bookmark);
@@ -46,6 +48,8 @@ private:
std::string getDateString() const;
ControllerProxy<BookmarkController>* m_controllerProxy;
QPushButton* m_activateButton;
QPushButton* m_editButton;
QPushButton* m_deleteButton;
src/lib_gui/qt/element/QtBookmarkCategory.cpp
+8 -6
View File
@@ -1,15 +1,17 @@
#include "QtBookmarkCategory.h"
#include <QHBoxLayout>
#include <QLabel>
#include <QMessageBox>
#include "utility/messaging/type/MessageDeleteBookmarkCategory.h"
#include "utility/ResourcePaths.h"
#include <QPushButton>
#include <QTreeWidget>
#include "qt/utility/utilityQt.h"
#include "utility/ResourcePaths.h"
QtBookmarkCategory::QtBookmarkCategory()
: m_id(0)
QtBookmarkCategory::QtBookmarkCategory(ControllerProxy<BookmarkController>* controllerProxy)
: m_controllerProxy(controllerProxy)
, m_id(0)
{
setObjectName("bookmark_category");
@@ -125,6 +127,6 @@ void QtBookmarkCategory::deleteClicked()
if (ret == 0) // QMessageBox::Yes
{
MessageDeleteBookmarkCategory(m_id).dispatch();
m_controllerProxy->executeAsTaskWithArgs(&BookmarkController::deleteBookmarkCategory, m_id);
}
}
src/lib_gui/qt/element/QtBookmarkCategory.h
+9 -4
View File
@@ -2,19 +2,22 @@
#define QT_BOOKMARK_CATEGORY_H
#include <QFrame>
#include <QLabel>
#include <QPushButton>
#include <QTreeWidget>
#include "component/controller/BookmarkController.h"
#include "component/controller/helper/ControllerProxy.h"
#include "utility/types.h"
class QLabel;
class QPushButton;
class QTreeWidgetItem;
class QtBookmarkCategory
: public QFrame
{
Q_OBJECT
public:
QtBookmarkCategory();
QtBookmarkCategory(ControllerProxy<BookmarkController>* controllerProxy);
~QtBookmarkCategory();
void setName(const std::string& name);
@@ -38,6 +41,8 @@ private slots:
void deleteClicked();
private:
ControllerProxy<BookmarkController>* m_controllerProxy;
QLabel* m_name;
Id m_id;
src/lib_gui/qt/element/QtScreenSearchBox.cpp
+3 -10
View File
@@ -8,8 +8,6 @@
#include <QPushButton>
#include <QTimer>
#include "component/controller/helper/ControllerProxy.h"
#include "component/controller/ScreenSearchController.h"
#include "qt/utility/utilityQt.h"
#include "utility/ResourcePaths.h"
@@ -30,7 +28,7 @@ bool QtFocusInFilter::eventFilter(QObject* obj, QEvent* event)
}
QtScreenSearchBox::QtScreenSearchBox(ControllerProxy* controllerProxy, QWidget* parent)
QtScreenSearchBox::QtScreenSearchBox(ControllerProxy<ScreenSearchController>* controllerProxy, QWidget* parent)
: QFrame(parent)
, m_controllerProxy(controllerProxy)
{
@@ -195,7 +193,7 @@ void QtScreenSearchBox::searchQueryChanged()
void QtScreenSearchBox::findMatches()
{
m_controllerProxy->executeAsTask<ScreenSearchController>(
m_controllerProxy->executeAsTask(
[this](ScreenSearchController* controller)
{
std::set<std::string> responderNames;
@@ -236,12 +234,7 @@ void QtScreenSearchBox::nextPressed()
void QtScreenSearchBox::activateMatch(bool next)
{
m_controllerProxy->executeAsTask<ScreenSearchController>(
[next, this](ScreenSearchController* controller)
{
controller->activateMatch(next);
}
);
m_controllerProxy->executeAsTaskWithArgs(&ScreenSearchController::activateMatch, next);
}
void QtScreenSearchBox::updateMatchLabel()
src/lib_gui/qt/element/QtScreenSearchBox.h
+5 -3
View File
@@ -3,7 +3,9 @@
#include <QFrame>
class ControllerProxy;
#include "component/controller/helper/ControllerProxy.h"
#include "component/controller/ScreenSearchController.h"
class QCheckBox;
class QHBoxLayout;
class QLineEdit;
@@ -33,7 +35,7 @@ class QtScreenSearchBox
Q_OBJECT
public:
QtScreenSearchBox(ControllerProxy* controllerProxy, QWidget* parent = nullptr);
QtScreenSearchBox(ControllerProxy<ScreenSearchController>* controllerProxy, QWidget* parent = nullptr);
virtual ~QtScreenSearchBox();
void refreshStyle();
@@ -62,7 +64,7 @@ private:
void updateMatchLabel();
ControllerProxy* m_controllerProxy;
ControllerProxy<ScreenSearchController>* m_controllerProxy;
QLineEdit* m_searchBox;
QPushButton* m_matchLabel;
src/lib_gui/qt/view/QtBookmarkView.cpp
+87 -77
View File
@@ -11,16 +11,12 @@
#include "qt/window/QtBookmarkBrowser.h"
#include "qt/view/QtMainView.h"
#include "qt/window/QtMainWindow.h"
#include "utility/messaging/type/MessageDeleteBookmarkForActiveTokens.h"
#include "utility/messaging/type/MessageDisplayBookmarks.h"
#include "utility/messaging/type/MessageDisplayBookmarkCreator.h"
#include "utility/ResourcePaths.h"
#include "settings/ApplicationSettings.h"
#include "utility/ResourcePaths.h"
QtBookmarkView::QtBookmarkView(ViewLayout* viewLayout)
: BookmarkView(viewLayout)
, m_controllerProxy(this)
, m_bookmarkBrowser(nullptr)
, m_createButtonState(BookmarkView::CreateButtonState::CANNOT_CREATE)
{
@@ -116,6 +112,85 @@ void QtBookmarkView::setCreateButtonState(const CreateButtonState& state)
);
}
void QtBookmarkView::displayBookmarkCreator(
const std::vector<std::string>& names, const std::vector<BookmarkCategory>& categories, Id nodeId
){
m_onQtThread(
[=]()
{
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator(
&m_controllerProxy,
dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow()
);
bookmarkCreator->setupBookmarkCreator();
std::string displayName = "";
for (unsigned int i = 0; i < names.size(); i++)
{
displayName += names[i];
if (i < names.size() - 1)
{
displayName += "; ";
}
}
bookmarkCreator->setDisplayName(displayName);
bookmarkCreator->setBookmarkCategories(categories);
bookmarkCreator->setNodeId(nodeId);
bookmarkCreator->show();
bookmarkCreator->raise();
}
);
}
void QtBookmarkView::displayBookmarkEditor(
std::shared_ptr<Bookmark> bookmark, const std::vector<BookmarkCategory>& categories
){
m_onQtThread(
[=]()
{
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator(
&m_controllerProxy,
dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow(),
bookmark->getId()
);
bookmarkCreator->setupBookmarkCreator();
bookmarkCreator->setDisplayName(bookmark->getName());
bookmarkCreator->setComment(bookmark->getComment());
bookmarkCreator->setBookmarkCategories(categories);
bookmarkCreator->setCurrentBookmarkCategory(bookmark->getCategory());
bookmarkCreator->show();
bookmarkCreator->raise();
}
);
}
void QtBookmarkView::displayBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks)
{
m_onQtThread(
[=]()
{
if (m_bookmarkBrowser == nullptr)
{
m_bookmarkBrowser = new QtBookmarkBrowser(
&m_controllerProxy,
dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow()
);
m_bookmarkBrowser->setupBookmarkBrowser();
}
m_bookmarkBrowser->setBookmarks(bookmarks);
m_bookmarkBrowser->show();
m_bookmarkBrowser->raise();
}
);
}
void QtBookmarkView::enableDisplayBookmarks(bool enable)
{
m_onQtThread(
@@ -142,7 +217,7 @@ void QtBookmarkView::createBookmarkClicked()
{
if (m_createButtonState == BookmarkView::CreateButtonState::CAN_CREATE)
{
MessageDisplayBookmarkCreator().dispatch();
m_controllerProxy.executeAsTaskWithArgs(&BookmarkController::showBookmarkCreator, 0);
}
else if (m_createButtonState == BookmarkView::CreateButtonState::ALREADY_CREATED)
{
@@ -158,89 +233,24 @@ void QtBookmarkView::createBookmarkClicked()
if (ret == 0) // QMessageBox::Yes
{
MessageDisplayBookmarkCreator().dispatch();
m_controllerProxy.executeAsTaskWithArgs(&BookmarkController::showBookmarkCreator, 0);
}
else if (ret == 1)
{
MessageDeleteBookmarkForActiveTokens().dispatch();
m_controllerProxy.executeAsTask(&BookmarkController::deleteBookmarkForActiveTokens);
}
}
}
void QtBookmarkView::showBookmarksClicked()
{
MessageDisplayBookmarks().dispatch();
}
void QtBookmarkView::displayBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks)
{
m_onQtThread(
[=]()
{
if (m_bookmarkBrowser == nullptr)
{
m_bookmarkBrowser = new QtBookmarkBrowser(dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow());
m_bookmarkBrowser->setupBookmarkBrowser();
}
m_bookmarkBrowser->setBookmarks(bookmarks);
m_bookmarkBrowser->show();
m_bookmarkBrowser->raise();
}
);
}
void QtBookmarkView::displayBookmarkCreator(const std::vector<std::string>& names, const std::vector<BookmarkCategory>& categories, Id nodeId)
{
m_onQtThread(
[=]()
{
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator(dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow());
bookmarkCreator->setupBookmarkCreator();
std::string displayName = "";
for (unsigned int i = 0; i < names.size(); i++)
{
displayName += names[i];
if (i < names.size() - 1)
{
displayName += "; ";
}
}
bookmarkCreator->setDisplayName(displayName);
bookmarkCreator->setBookmarkCategories(categories);
bookmarkCreator->setNodeId(nodeId);
bookmarkCreator->show();
bookmarkCreator->raise();
}
);
}
void QtBookmarkView::displayBookmarkEditor(std::shared_ptr<Bookmark> bookmark, const std::vector<BookmarkCategory>& categories)
{
m_onQtThread(
[=]()
{
QtBookmarkCreator* bookmarkCreator = new QtBookmarkCreator(dynamic_cast<QtMainView*>(dynamic_cast<View*>(getViewLayout())->getViewLayout())->getMainWindow(), true, bookmark->getId());
bookmarkCreator->setupBookmarkCreator();
bookmarkCreator->setDisplayName(bookmark->getName());
bookmarkCreator->setComment(bookmark->getComment());
bookmarkCreator->setBookmarkCategories(categories);
bookmarkCreator->setCurrentBookmarkCategory(bookmark->getCategory());
bookmarkCreator->show();
bookmarkCreator->raise();
}
);
m_controllerProxy.executeAsTask(&BookmarkController::displayBookmarks);
}
void QtBookmarkView::setStyleSheet()
{
m_widget->setStyleSheet(utility::getStyleSheet(ResourcePaths::getGuiPath().concat(FilePath("bookmark_view/bookmark_view.css"))).c_str());
m_widget->setStyleSheet(utility::getStyleSheet(
ResourcePaths::getGuiPath().concat(FilePath("bookmark_view/bookmark_view.css"))).c_str());
}
void QtBookmarkView::refreshStyle()
src/lib_gui/qt/view/QtBookmarkView.h
+10 -4
View File
@@ -1,6 +1,8 @@
#ifndef QT_BOOKMARK_VIEW_H
#define QT_BOOKMARK_VIEW_H
#include "component/controller/BookmarkController.h"
#include "component/controller/helper/ControllerProxy.h"
#include "component/view/BookmarkView.h"
#include "qt/utility/QtThreadedFunctor.h"
@@ -25,6 +27,13 @@ public:
virtual void refreshView();
virtual void setCreateButtonState(const CreateButtonState& state);
virtual void displayBookmarkCreator(
const std::vector<std::string>& names, const std::vector<BookmarkCategory>& categories, Id nodeId);
virtual void displayBookmarkEditor(
std::shared_ptr<Bookmark> bookmark, const std::vector<BookmarkCategory>& categories);
virtual void displayBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks);
virtual void enableDisplayBookmarks(bool enable);
virtual bool bookmarkBrowserIsVisible() const;
@@ -34,13 +43,10 @@ private slots:
void showBookmarksClicked();
private:
virtual void displayBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks);
virtual void displayBookmarkCreator(const std::vector<std::string>& names, const std::vector<BookmarkCategory>& categories, Id nodeId);
virtual void displayBookmarkEditor(std::shared_ptr<Bookmark> bookmark, const std::vector<BookmarkCategory>& categories);
void setStyleSheet();
void refreshStyle();
ControllerProxy<BookmarkController> m_controllerProxy;
QtThreadedLambdaFunctor m_onQtThread;
QFrame* m_widget;
src/lib_gui/qt/view/QtScreenSearchView.cpp
+1 -7
View File
@@ -2,7 +2,6 @@
#include <QToolBar>
#include "component/controller/ScreenSearchController.h"
#include "qt/element/QtScreenSearchBox.h"
#include "qt/utility/utilityQt.h"
#include "qt/view/QtMainView.h"
@@ -89,10 +88,5 @@ void QtScreenSearchView::hide()
m_bar->hide();
m_widget->setMatchCount(0);
m_controllerProxy.executeAsTask<ScreenSearchController>(
[](ScreenSearchController* controller)
{
controller->clearMatches();
}
);
m_controllerProxy.executeAsTask(&ScreenSearchController::clearMatches);
}
src/lib_gui/qt/view/QtScreenSearchView.h
+2 -1
View File
@@ -2,6 +2,7 @@
#define QT_SCREEN_SEARCH_VIEW_H
#include "component/controller/helper/ControllerProxy.h"
#include "component/controller/ScreenSearchController.h"
#include "component/view/ScreenSearchView.h"
#include "qt/utility/QtThreadedFunctor.h"
@@ -34,7 +35,7 @@ public slots:
void hide();
private:
ControllerProxy m_controllerProxy;
ControllerProxy<ScreenSearchController> m_controllerProxy;
QtThreadedLambdaFunctor m_onQtThread;
QtScreenSearchBox* m_widget;
src/lib_gui/qt/window/QtBookmarkBrowser.cpp
+20 -17
View File
@@ -6,14 +6,14 @@
#include <QPushButton>
#include <QVBoxLayout>
#include "data/bookmark/Bookmark.h"
#include "qt/element/QtBookmark.h"
#include "qt/element/QtBookmarkCategory.h"
#include "qt/utility/utilityQt.h"
#include "utility/ResourcePaths.h"
QtBookmarkBrowser::QtBookmarkBrowser(QWidget* parent)
QtBookmarkBrowser::QtBookmarkBrowser(ControllerProxy<BookmarkController>* controllerProxy, QWidget* parent)
: QtWindow(false, parent)
, m_controllerProxy(controllerProxy)
{
}
@@ -79,11 +79,11 @@ void QtBookmarkBrowser::setupBookmarkBrowser()
m_orderNames.push_back("Date des.");
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->setCurrentIndex(3);
m_orderComboBox->setObjectName("order_box");
headerLayout->addWidget(m_orderComboBox);
@@ -144,7 +144,7 @@ void QtBookmarkBrowser::setBookmarks(const std::vector<std::shared_ptr<Bookmark>
for (const std::shared_ptr<Bookmark>& bookmark : bookmarks)
{
QtBookmark* qtBookmark = new QtBookmark();
QtBookmark* qtBookmark = new QtBookmark(m_controllerProxy);
qtBookmark->setBookmark(bookmark);
QTreeWidgetItem* categoryItem = findOrCreateTreeCategory(bookmark->getCategory());
@@ -184,7 +184,10 @@ void QtBookmarkBrowser::handleNext()
void QtBookmarkBrowser::filterOrOrderChanged(const QString& text)
{
MessageDisplayBookmarks(getSelectedFilter(), getSelectedOrder()).dispatch();
Bookmark::BookmarkFilter filter = getSelectedFilter();
Bookmark::BookmarkOrder order = getSelectedOrder();
m_controllerProxy->executeAsTaskWithArgs(&BookmarkController::displayBookmarksFor, filter, order);
}
void QtBookmarkBrowser::treeItemClicked(QTreeWidgetItem* item, int column)
@@ -204,45 +207,45 @@ void QtBookmarkBrowser::treeItemClicked(QTreeWidgetItem* item, int column)
}
}
MessageDisplayBookmarks::BookmarkFilter QtBookmarkBrowser::getSelectedFilter()
Bookmark::BookmarkFilter QtBookmarkBrowser::getSelectedFilter()
{
std::string text = m_filterComboBox->currentText().toStdString();
if (text == "Nodes")
{
return MessageDisplayBookmarks::BookmarkFilter::NODES;
return Bookmark::FILTER_NODES;
}
else if (text == "Edges")
{
return MessageDisplayBookmarks::BookmarkFilter::EDGES;
return Bookmark::FILTER_EDGES;
}
return MessageDisplayBookmarks::BookmarkFilter::ALL;
return Bookmark::FILTER_ALL;
}
MessageDisplayBookmarks::BookmarkOrder QtBookmarkBrowser::getSelectedOrder()
Bookmark::BookmarkOrder QtBookmarkBrowser::getSelectedOrder()
{
std::string orderString = m_orderComboBox->currentText().toStdString(); // m_orderButton->text().toStdString();
std::string orderString = m_orderComboBox->currentText().toStdString();
if (orderString == m_orderNames[0])
{
return MessageDisplayBookmarks::BookmarkOrder::DATE_DESCENDING;
return Bookmark::ORDER_NAME_ASCENDING;
}
else if (orderString == m_orderNames[1])
{
return MessageDisplayBookmarks::BookmarkOrder::DATE_ASCENDING;
return Bookmark::ORDER_NAME_DESCENDING;
}
else if (orderString == m_orderNames[2])
{
return MessageDisplayBookmarks::BookmarkOrder::NAME_DESCENDING;
return Bookmark::ORDER_DATE_ASCENDING;
}
else if (orderString == m_orderNames[3])
{
return MessageDisplayBookmarks::BookmarkOrder::NAME_ASCENDING;
return Bookmark::ORDER_DATE_DESCENDING;
}
else
{
return MessageDisplayBookmarks::BookmarkOrder::NONE;
return Bookmark::ORDER_NONE;
}
}
@@ -258,7 +261,7 @@ QTreeWidgetItem* QtBookmarkBrowser::findOrCreateTreeCategory(const BookmarkCateg
}
}
QtBookmarkCategory* categoryItem = new QtBookmarkCategory();
QtBookmarkCategory* categoryItem = new QtBookmarkCategory(m_controllerProxy);
if (category.getName().length() > 0)
{
categoryItem->setName(category.getName());
src/lib_gui/qt/window/QtBookmarkBrowser.h
+8 -7
View File
@@ -5,12 +5,11 @@
#include <QListWidget>
#include <QTreeWidget>
#include "component/controller/BookmarkController.h"
#include "component/controller/helper/ControllerProxy.h"
#include "data/bookmark/Bookmark.h"
#include "qt/window/QtWindow.h"
#include "utility/messaging/type/MessageDisplayBookmarks.h"
class Bookmark;
class BookmarkCategory;
class QtBookmark;
class QtBookmarkBrowser
@@ -19,7 +18,7 @@ class QtBookmarkBrowser
Q_OBJECT
public:
QtBookmarkBrowser(QWidget* parent = nullptr);
QtBookmarkBrowser(ControllerProxy<BookmarkController>* controllerProxy, QWidget* parent = nullptr);
~QtBookmarkBrowser();
void setupBookmarkBrowser();
@@ -36,11 +35,13 @@ private slots:
void treeItemClicked(QTreeWidgetItem* item, int column);
private:
MessageDisplayBookmarks::BookmarkFilter getSelectedFilter();
MessageDisplayBookmarks::BookmarkOrder getSelectedOrder();
Bookmark::BookmarkFilter getSelectedFilter();
Bookmark::BookmarkOrder getSelectedOrder();
QTreeWidgetItem* findOrCreateTreeCategory(const BookmarkCategory& category);
ControllerProxy<BookmarkController>* m_controllerProxy;
QTreeWidget* m_bookmarkTree;
QComboBox* m_filterComboBox;
src/lib_gui/qt/window/QtBookmarkCreator.cpp
+19 -38
View File
@@ -1,24 +1,20 @@
#include "QtBookmarkCreator.h"
#include <QHBoxLayout>
#include <QComboBox>
#include <QLabel>
#include <QLineEdit>
#include <QTextEdit>
#include <QVBoxLayout>
#include "data/bookmark/BookmarkCategory.h"
#include "utility/messaging/type/MessageCreateBookmark.h"
#include "utility/messaging/type/MessageCreateBookmarkCategory.h"
#include "utility/messaging/type/MessageEditBookmark.h"
#include "qt/utility/utilityQt.h"
#include "utility/messaging/type/MessageStatus.h"
#include "utility/ResourcePaths.h"
#include "qt/utility/utilityQt.h"
QtBookmarkCreator::QtBookmarkCreator(QWidget* parent, bool edit, Id id)
QtBookmarkCreator::QtBookmarkCreator(ControllerProxy<BookmarkController>* controllerProxy, QWidget* parent, Id bookmarkId)
: QtWindow(false, parent)
, m_edit(edit)
, m_bookmarkId(id)
, m_categoryCount(0)
, m_controllerProxy(controllerProxy)
, m_editBookmarkId(bookmarkId)
, m_nodeId(0)
{
}
@@ -34,7 +30,7 @@ void QtBookmarkCreator::setupBookmarkCreator()
{
// title
QLabel* title = new QLabel(m_edit ? "Edit Bookmark" : "Create Bookmark");
QLabel* title = new QLabel(m_editBookmarkId ? "Edit Bookmark" : "Create Bookmark");
title->setObjectName("creator_title_label");
layout->addWidget(title);
@@ -86,17 +82,13 @@ void QtBookmarkCreator::setupBookmarkCreator()
m_categoryBox->setInsertPolicy(QComboBox::InsertPolicy::InsertAtTop);
layout->addWidget(m_categoryBox);
connect(m_categoryBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &QtBookmarkCreator::onComboBoxIndexChanged);
m_categoryCount = m_categoryBox->count();
layout->addSpacing(20);
}
{
layout->addLayout(createButtons());
setPreviousVisible(false);
updateNextButton(m_edit ? "Save" : "Create");
updateNextButton(m_editBookmarkId ? "Save" : "Create");
}
{
@@ -166,21 +158,22 @@ void QtBookmarkCreator::resizeEvent(QResizeEvent* event)
void QtBookmarkCreator::handleNext()
{
QString qComment = m_commentBox->toPlainText();
QString qDisplayName = m_displayName->text();
QString qCategory = m_categoryBox->currentText();
std::string name = m_displayName->text().toStdString();
std::string comment = m_commentBox->toPlainText().toStdString();
std::string category = m_categoryBox->currentText().toStdString();
if (m_edit)
if (m_editBookmarkId)
{
MessageEditBookmark(
m_bookmarkId, qComment.toStdString(), qDisplayName.toStdString(), qCategory.toStdString()).dispatch();
m_controllerProxy->executeAsTaskWithArgs(
&BookmarkController::editBookmark, m_editBookmarkId, name, comment, category);
}
else
{
MessageCreateBookmark(qComment.toStdString(), qDisplayName.toStdString(), qCategory.toStdString(), m_nodeId).dispatch();
}
m_controllerProxy->executeAsTaskWithArgs(
&BookmarkController::createBookmark, name, comment, category, m_nodeId);
MessageStatus("Creating Bookmark for active Token").dispatch();
MessageStatus("Creating Bookmark for active Token").dispatch();
}
close();
}
@@ -194,15 +187,3 @@ void QtBookmarkCreator::onNameChanged(const QString& text)
{
setNextEnabled(text.length() > 0);
}
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();
}
}
src/lib_gui/qt/window/QtBookmarkCreator.h
+9 -10
View File
@@ -1,16 +1,17 @@
#ifndef QT_BOOKMARK_CREATOR_H
#define QT_BOOKMARK_CREATOR_H
#include <QComboBox>
#include <QLineEdit>
#include <QTextEdit>
#include <QWidget>
#include "component/controller/BookmarkController.h"
#include "component/controller/helper/ControllerProxy.h"
#include "qt/window/QtWindow.h"
#include "utility/types.h"
class BookmarkCategory;
class QComboBox;
class QLineEdit;
class QTextEdit;
class QtBookmarkCreator
: public QtWindow
@@ -18,7 +19,7 @@ class QtBookmarkCreator
Q_OBJECT
public:
QtBookmarkCreator(QWidget* parent = nullptr, bool edit = false, Id id = 0);
QtBookmarkCreator(ControllerProxy<BookmarkController>* controllerProxy, QWidget* parent = nullptr, Id bookmarkId = 0);
~QtBookmarkCreator();
void setupBookmarkCreator();
@@ -41,18 +42,16 @@ protected:
private slots:
void onNameChanged(const QString& text);
void onComboBoxIndexChanged(int index);
private:
bool m_edit;
Id m_bookmarkId; // important for editing
ControllerProxy<BookmarkController>* m_controllerProxy;
const Id m_editBookmarkId;
QLineEdit* m_displayName;
QTextEdit* m_commentBox;
QComboBox* m_categoryBox;
int m_categoryCount;
Id m_nodeId;
QWidget* m_headerBackground;
src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
+2
View File
@@ -540,6 +540,8 @@ void QtProjectWizzard::duplicateSelectedSourceGroup()
case SOURCE_GROUP_CXX_CDB:
newSourceGroup = std::make_shared<SourceGroupSettingsCxxCdb>(*dynamic_cast<SourceGroupSettingsCxxCdb*>(oldSourceGroup.get()));
break;
default:
return;
}
newSourceGroup->setId(utility::getUuidString());