From 961d0fe541d220d702473f750352705bd9f43ca5 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 4 Nov 2015 14:14:20 +0100 Subject: [PATCH] ui: clearing data in ProjectSetupScreen after creating new project --- src/app/qt/element/QtDirectoryListBox.cpp | 5 +++++ src/app/qt/element/QtDirectoryListBox.h | 2 ++ src/app/qt/window/QtProjectSetupScreen.cpp | 16 ++++++++++++++++ src/app/qt/window/QtProjectSetupScreen.h | 4 ++++ 4 files changed, 27 insertions(+) diff --git a/src/app/qt/element/QtDirectoryListBox.cpp b/src/app/qt/element/QtDirectoryListBox.cpp index 2bd52511..19be3a21 100644 --- a/src/app/qt/element/QtDirectoryListBox.cpp +++ b/src/app/qt/element/QtDirectoryListBox.cpp @@ -133,6 +133,11 @@ QtDirectoryListBox::QtDirectoryListBox(QWidget *parent) resize(); } +void QtDirectoryListBox::clear() +{ + m_list->clear(); +} + void QtDirectoryListBox::dropEvent(QDropEvent *event) { QFileInfo fileInfo; diff --git a/src/app/qt/element/QtDirectoryListBox.h b/src/app/qt/element/QtDirectoryListBox.h index ca85e431..e91b338c 100644 --- a/src/app/qt/element/QtDirectoryListBox.h +++ b/src/app/qt/element/QtDirectoryListBox.h @@ -48,6 +48,8 @@ class QtDirectoryListBox public: QtDirectoryListBox(QWidget *parent); + void clear(); + std::vector getList(); void setList(const std::vector& list); diff --git a/src/app/qt/window/QtProjectSetupScreen.cpp b/src/app/qt/window/QtProjectSetupScreen.cpp index 36a6b652..1456a5df 100644 --- a/src/app/qt/window/QtProjectSetupScreen.cpp +++ b/src/app/qt/window/QtProjectSetupScreen.cpp @@ -66,6 +66,20 @@ QSize QtProjectSetupScreen::sizeHint() const return QSize(600,600); } +void QtProjectSetupScreen::clear() +{ + m_projectName->setText(""); + m_projectFileLocation->setText(""); + + m_sourcePaths->clear(); + m_includePaths->clear(); + + if (m_frameworkPaths) + { + m_frameworkPaths->clear(); + } +} + void QtProjectSetupScreen::setup() { setupForm(); @@ -184,5 +198,7 @@ void QtProjectSetupScreen::handleUpdateButtonPress() projSettings->save(projectFile); MessageLoadProject(projectFile).dispatch(); + clear(); + emit finished(); } diff --git a/src/app/qt/window/QtProjectSetupScreen.h b/src/app/qt/window/QtProjectSetupScreen.h index a37c6108..5bb44a6e 100644 --- a/src/app/qt/window/QtProjectSetupScreen.h +++ b/src/app/qt/window/QtProjectSetupScreen.h @@ -38,11 +38,15 @@ public: QtProjectSetupScreen(QWidget* parent = 0); QSize sizeHint() const Q_DECL_OVERRIDE; + void clear(); + virtual void setup() override; void loadEmpty(); void loadProjectSettings(); + void projectSetupScreen(); + protected: virtual void populateForm(QFormLayout* layout) override;