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

src: replaced gui wording with view wording

Browse Source 
Changed gui wording in lib and app to view wording, since MVC views do not necessarily deal with GUIs. And moved files
so structure is similar in lib and app.
This commit is contained in:
Eberhard Graether
2014-07-21 14:48:02 +02:00
parent bf563f92f3
commit 0074db86e8
33 changed files with 199 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/CMakeLists.txt
+4 -5
View File
@@ -37,11 +37,10 @@ add_files(
qt/view/QtMainView.h
qt/view/QtSearchView.cpp
qt/view/QtSearchView.h
qt/QtGuiFactory.cpp
qt/QtGuiFactory.h
qt/QtWidgetWrapper.cpp
qt/QtWidgetWrapper.h
qt/view/QtViewFactory.cpp
qt/view/QtViewFactory.h
qt/view/QtViewWidgetWrapper.cpp
qt/view/QtViewWidgetWrapper.h
main.cpp
)
src/app/main.cpp
+3 -3
View File
@@ -4,8 +4,8 @@
#include "Application.h"
#include "includes.h" // defines 'void setup()'
#include "qt/QtGuiFactory.h"
#include "qt/utility/utilityQt.h"
#include "qt/view/QtViewFactory.h"
#include "utility/logging/ConsoleLogger.h"
#include "utility/logging/LogManager.h"
@@ -21,11 +21,11 @@ int main(int argc, char *argv[])
setup();
QApplication qtApp(argc, argv);
QtGuiFactory guiFactory;
init();
std::shared_ptr<Application> app = Application::create(&guiFactory);
QtViewFactory viewFactory;
std::shared_ptr<Application> app = Application::create(&viewFactory);
app->loadProject("data/ProjectSettings.xml");
return qtApp.exec();
src/app/qt/QtGuiFactory.cpp
-34
View File
@@ -1,34 +0,0 @@
#include "qt/QtGuiFactory.h"
#include "qt/view/QtCodeView.h"
#include "qt/view/QtGraphView.h"
#include "qt/view/QtMainView.h"
#include "qt/view/QtSearchView.h"
QtGuiFactory::QtGuiFactory()
{
}
QtGuiFactory::~QtGuiFactory()
{
}
std::shared_ptr<MainView> QtGuiFactory::createMainView() const
{
return std::make_shared<QtMainView>();
}
std::shared_ptr<CodeView> QtGuiFactory::createCodeView(ViewLayout* viewLayout) const
{
return View::create<QtCodeView>(viewLayout);
}
std::shared_ptr<GraphView> QtGuiFactory::createGraphView(ViewLayout* viewLayout) const
{
return View::create<QtGraphView>(viewLayout);
}
std::shared_ptr<SearchView> QtGuiFactory::createSearchView(ViewLayout* viewLayout) const
{
return View::create<QtSearchView>(viewLayout);
}
src/app/qt/QtWidgetWrapper.cpp
-37
View File
@@ -1,37 +0,0 @@
#include "qt/QtWidgetWrapper.h"
#include "component/view/View.h"
#include "utility/logging/logging.h"
QWidget* QtWidgetWrapper::getWidgetOfView(View* view)
{
QtWidgetWrapper* widgetWrapper = dynamic_cast<QtWidgetWrapper*>(view->getWidgetWrapper());
if (!widgetWrapper)
{
LOG_ERROR("Trying to get the qt widget of non qt view.");
return nullptr;
}
if (!widgetWrapper->getWidget())
{
LOG_ERROR("The QtWidgetWrapper is not holdling a QWidget.");
return nullptr;
}
return widgetWrapper->getWidget();
}
QtWidgetWrapper::QtWidgetWrapper(std::shared_ptr<QWidget> widget)
: m_widget(widget)
{
}
QtWidgetWrapper::~QtWidgetWrapper()
{
}
QWidget* QtWidgetWrapper::getWidget()
{
return m_widget.get();
}
src/app/qt/QtWidgetWrapper.h
-26
View File
@@ -1,26 +0,0 @@
#ifndef QT_WIDGET_WRAPPER_H
#define QT_WIDGET_WRAPPER_H
#include <memory>
#include <QtWidgets/qwidget.h>
#include "gui/GuiWidgetWrapper.h"
class View;
class QtWidgetWrapper: public GuiWidgetWrapper
{
public:
static QWidget* getWidgetOfView(View* view);
QtWidgetWrapper(std::shared_ptr<QWidget> widget);
virtual ~QtWidgetWrapper();
QWidget* getWidget();
private:
std::shared_ptr<QWidget> m_widget;
};
#endif // QT_WIDGET_WRAPPER_H
src/app/qt/element/QtMainWindow.cpp
+2 -2
View File
@@ -8,7 +8,7 @@
#include <QSettings>
#include "component/view/View.h"
#include "qt/QtWidgetWrapper.h"
#include "qt/view/QtViewWidgetWrapper.h"
#include "utility/logging/logging.h"
#include "utility/messaging/type/MessageFind.h"
#include "utility/messaging/type/MessageLoadProject.h"
@@ -77,7 +77,7 @@ void QtMainWindow::find()
void QtMainWindow::addView(View* view)
{
QDockWidget* dock = new QDockWidget(tr(view->getName().c_str()), this);
dock->setWidget(QtWidgetWrapper::getWidgetOfView(view));
dock->setWidget(QtViewWidgetWrapper::getWidgetOfView(view));
addDockWidget(Qt::TopDockWidgetArea, dock);
m_dockWidgets.push_back(std::make_pair(view, dock));
}
src/app/qt/view/QtCodeView.cpp
+5 -5
View File
@@ -6,8 +6,8 @@
#include "data/location/TokenLocationFile.h"
#include "qt/element/QtCodeFile.h"
#include "qt/QtWidgetWrapper.h"
#include "qt/utility/utilityQt.h"
#include "qt/view/QtViewWidgetWrapper.h"
#include "utility/FileSystem.h"
#include "utility/messaging/type/MessageActivateToken.h"
#include "utility/text/TextAccess.h"
@@ -25,12 +25,12 @@ QtCodeView::~QtCodeView()
void QtCodeView::createWidgetWrapper()
{
setWidgetWrapper(std::make_shared<QtWidgetWrapper>(std::make_shared<QScrollArea>()));
setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(std::make_shared<QScrollArea>()));
}
void QtCodeView::initGui()
void QtCodeView::initView()
{
QWidget* widget = QtWidgetWrapper::getWidgetOfView(this);
QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
widget->setStyleSheet(TextAccess::createFromFile("data/gui/code_view/code_view.css")->getText().c_str());
widget->setObjectName("code_view");
@@ -79,7 +79,7 @@ void QtCodeView::doAddCodeSnippet(const CodeSnippetParams params)
if (!file)
{
QWidget* widget = QtWidgetWrapper::getWidgetOfView(this);
QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
std::shared_ptr<QtCodeFile> filePtr = std::make_shared<QtCodeFile>(this, fileName, widget);
m_files.push_back(filePtr);
src/app/qt/view/QtCodeView.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
// View implementation
virtual void createWidgetWrapper();
virtual void initGui();
virtual void initView();
// CodeView implementation
virtual void addCodeSnippet(const CodeSnippetParams params);
src/app/qt/view/QtGraphView.cpp
+5 -5
View File
@@ -5,8 +5,8 @@
#include <QGraphicsScene>
#include <QGraphicsView>
#include "qt/QtWidgetWrapper.h"
#include "qt/utility/utilityQt.h"
#include "qt/view/QtViewWidgetWrapper.h"
#include "qt/view/graphElements/QtGraphEdge.h"
#include "qt/view/graphElements/QtGraphNode.h"
#include "qt/view/graphElements/QtGraphNodeMouseMovable.h"
@@ -30,12 +30,12 @@ QtGraphView::~QtGraphView()
void QtGraphView::createWidgetWrapper()
{
setWidgetWrapper(std::make_shared<QtWidgetWrapper>(std::make_shared<QFrame>()));
setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(std::make_shared<QFrame>()));
}
void QtGraphView::initGui()
void QtGraphView::initView()
{
QWidget* widget = QtWidgetWrapper::getWidgetOfView(this);
QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
utility::setWidgetBackgroundColor(widget, Colori(100, 20, 200, 255));
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
@@ -63,7 +63,7 @@ void QtGraphView::clear()
QGraphicsView* QtGraphView::getView()
{
QWidget* widget = QtWidgetWrapper::getWidgetOfView(this);
QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
QObjectList children = widget->children();
src/app/qt/view/QtGraphView.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
// View implementation
virtual void createWidgetWrapper();
virtual void initGui();
virtual void initView();
virtual void rebuildGraph(const std::vector<DummyNode>& nodes, const std::vector<DummyEdge>& edges);
src/app/qt/view/QtSearchView.cpp
+4 -4
View File
@@ -5,8 +5,8 @@
#include "component/controller/SearchController.h"
#include "qt/element/QtButton.h"
#include "qt/element/QtEditBox.h"
#include "qt/QtWidgetWrapper.h"
#include "qt/utility/utilityQt.h"
#include "qt/view/QtViewWidgetWrapper.h"
#include "utility/text/TextAccess.h"
QtSearchView::QtSearchView(ViewLayout* viewLayout)
@@ -23,12 +23,12 @@ QtSearchView::~QtSearchView()
void QtSearchView::createWidgetWrapper()
{
setWidgetWrapper(std::make_shared<QtWidgetWrapper>(std::make_shared<QFrame>()));
setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(std::make_shared<QFrame>()));
}
void QtSearchView::initGui()
void QtSearchView::initView()
{
QWidget* widget = QtWidgetWrapper::getWidgetOfView(this);
QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
widget->setObjectName("search_view");
widget->setStyleSheet(TextAccess::createFromFile("data/gui/search_view/search_view.css")->getText().c_str());
src/app/qt/view/QtSearchView.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
// View implementation
virtual void createWidgetWrapper();
virtual void initGui();
virtual void initView();
// SearchView implementation
virtual void setText(const std::string& s);
src/app/qt/view/QtViewFactory.cpp
+34
View File
@@ -0,0 +1,34 @@
#include "qt/view/QtViewFactory.h"
#include "qt/view/QtCodeView.h"
#include "qt/view/QtGraphView.h"
#include "qt/view/QtMainView.h"
#include "qt/view/QtSearchView.h"
QtViewFactory::QtViewFactory()
{
}
QtViewFactory::~QtViewFactory()
{
}
std::shared_ptr<MainView> QtViewFactory::createMainView() const
{
return std::make_shared<QtMainView>();
}
std::shared_ptr<CodeView> QtViewFactory::createCodeView(ViewLayout* viewLayout) const
{
return View::create<QtCodeView>(viewLayout);
}
std::shared_ptr<GraphView> QtViewFactory::createGraphView(ViewLayout* viewLayout) const
{
return View::create<QtGraphView>(viewLayout);
}
std::shared_ptr<SearchView> QtViewFactory::createSearchView(ViewLayout* viewLayout) const
{
return View::create<QtSearchView>(viewLayout);
}
src/app/qt/QtGuiFactory.h → src/app/qt/view/QtViewFactory.h
+7 -7
View File
@@ -1,13 +1,13 @@
#ifndef QT_GUI_FACTORY_H
#define QT_GUI_FACTORY_H
#ifndef QT_VIEW_FACTORY_H
#define QT_VIEW_FACTORY_H
#include "gui/GuiFactory.h"
#include "component/view/ViewFactory.h"
class QtGuiFactory: public GuiFactory
class QtViewFactory: public ViewFactory
{
public:
QtGuiFactory();
virtual ~QtGuiFactory();
QtViewFactory();
virtual ~QtViewFactory();
virtual std::shared_ptr<MainView> createMainView() const;
virtual std::shared_ptr<CodeView> createCodeView(ViewLayout* viewLayout) const;
@@ -15,4 +15,4 @@ public:
virtual std::shared_ptr<SearchView> createSearchView(ViewLayout* viewLayout) const;
};
#endif // QT_GUI_FACTORY_H
#endif // QT_VIEW_FACTORY_H
src/app/qt/view/QtViewWidgetWrapper.cpp
+37
View File
@@ -0,0 +1,37 @@
#include "qt/view/QtViewWidgetWrapper.h"
#include "component/view/View.h"
#include "utility/logging/logging.h"
QWidget* QtViewWidgetWrapper::getWidgetOfView(View* view)
{
QtViewWidgetWrapper* widgetWrapper = dynamic_cast<QtViewWidgetWrapper*>(view->getWidgetWrapper());
if (!widgetWrapper)
{
LOG_ERROR("Trying to get the qt widget of non qt view.");
return nullptr;
}
if (!widgetWrapper->getWidget())
{
LOG_ERROR("The QtViewWidgetWrapper is not holdling a QWidget.");
return nullptr;
}
return widgetWrapper->getWidget();
}
QtViewWidgetWrapper::QtViewWidgetWrapper(std::shared_ptr<QWidget> widget)
: m_widget(widget)
{
}
QtViewWidgetWrapper::~QtViewWidgetWrapper()
{
}
QWidget* QtViewWidgetWrapper::getWidget()
{
return m_widget.get();
}
src/app/qt/view/QtViewWidgetWrapper.h
+26
View File
@@ -0,0 +1,26 @@
#ifndef QT_VIEW_WIDGET_WRAPPER_H
#define QT_VIEW_WIDGET_WRAPPER_H
#include <memory>
#include <QWidget>
#include "component/view/ViewWidgetWrapper.h"
class View;
class QtViewWidgetWrapper: public ViewWidgetWrapper
{
public:
static QWidget* getWidgetOfView(View* view);
QtViewWidgetWrapper(std::shared_ptr<QWidget> widget);
virtual ~QtViewWidgetWrapper();
QWidget* getWidget();
private:
std::shared_ptr<QWidget> m_widget;
};
#endif // QT_VIEW_WIDGET_WRAPPER_H