feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

JsonWizard: Small code cleanup on summary page

Browse Source 
Use constants for strings, simplify signal handling a bit

Change-Id: I80f2985c8e75e98d5f1638626f21c2d9c2efac9c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 09:53:22 +02:00
parent dff9ceb929
commit de5f22a9ba
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
View File

@@ -47,6 +47,11 @@
using namespace Core; using namespace Core;
static char KEY_SELECTED_PROJECT[] = "SelectedProject";
static char KEY_SELECTED_NODE[] = "SelectedFolderNode";
static char KEY_IS_SUBPROJECT[] = "IsSubproject";
static char KEY_VERSIONCONTROL[] = "VersionControl";
namespace ProjectExplorer { namespace ProjectExplorer {
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -83,19 +88,19 @@ JsonSummaryPage::JsonSummaryPage(QWidget *parent) :
m_wizard(0) m_wizard(0)
{ {
connect(this, &Internal::ProjectWizardPage::projectNodeChanged, connect(this, &Internal::ProjectWizardPage::projectNodeChanged,
this, &JsonSummaryPage::projectNodeHasChanged); this, &JsonSummaryPage::summarySettingsHaveChanged);
connect(this, &Internal::ProjectWizardPage::versionControlChanged, connect(this, &Internal::ProjectWizardPage::versionControlChanged,
this, &JsonSummaryPage::versionControlHasChanged); this, &JsonSummaryPage::summarySettingsHaveChanged);
} }
void JsonSummaryPage::initializePage() void JsonSummaryPage::initializePage()
{ {
m_wizard = qobject_cast<JsonWizard *>(wizard()); m_wizard = qobject_cast<JsonWizard *>(wizard());
m_wizard->setProperty("SelectedProject", QVariant()); m_wizard->setValue(QLatin1String(KEY_SELECTED_PROJECT), QVariant());
m_wizard->setProperty("SelectedFolderNode", QVariant()); m_wizard->setValue(QLatin1String(KEY_SELECTED_NODE), QVariant());
m_wizard->setProperty("IsSubproject", QString()); m_wizard->setValue(QLatin1String(KEY_IS_SUBPROJECT), false);
m_wizard->setProperty("VersionControl", QString()); m_wizard->setValue(QLatin1String(KEY_VERSIONCONTROL), QString());
connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::triggerCommit); connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::triggerCommit);
connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::addToProject); connect(m_wizard, &JsonWizard::filesReady, this, &JsonSummaryPage::addToProject);
@@ -125,6 +130,9 @@ void JsonSummaryPage::initializePage()
isProject ? AddSubProject : AddNewFile); isProject ? AddSubProject : AddNewFile);
initializeVersionControls(); initializeVersionControls();
// Do a new try at initialization, now that we have real values set up:
summarySettingsHaveChanged();
} }
bool JsonSummaryPage::validatePage() bool JsonSummaryPage::validatePage()
@@ -187,17 +195,12 @@ void JsonSummaryPage::addToProject(const JsonWizard::GeneratorFiles &files)
return; return;
} }
void JsonSummaryPage::projectNodeHasChanged() void JsonSummaryPage::summarySettingsHaveChanged()
{
updateProjectData(currentNode());
}
void JsonSummaryPage::versionControlHasChanged()
{ {
IVersionControl *vc = currentVersionControl(); IVersionControl *vc = currentVersionControl();
m_wizard->setProperty("VersionControl", vc ? vc->id().toString() : QLatin1String("")); m_wizard->setValue(QLatin1String(KEY_VERSIONCONTROL), vc ? vc->id().toString() : QString());
updateFileList(); updateProjectData(currentNode());
} }
void JsonSummaryPage::updateFileList() void JsonSummaryPage::updateFileList()
@@ -212,9 +215,9 @@ void JsonSummaryPage::updateProjectData(FolderNode *node)
{ {
Project *project = SessionManager::projectForNode(node); Project *project = SessionManager::projectForNode(node);
m_wizard->setProperty("SelectedProject", QVariant::fromValue(project)); m_wizard->setValue(QLatin1String(KEY_SELECTED_PROJECT), QVariant::fromValue(project));
m_wizard->setProperty("SelectedFolderNode", QVariant::fromValue(node)); m_wizard->setValue(QLatin1String(KEY_SELECTED_NODE), QVariant::fromValue(node));
m_wizard->setProperty("IsSubproject", node ? QLatin1String("yes") : QString()); m_wizard->setValue(QLatin1String(KEY_IS_SUBPROJECT), node ? true : false);
updateFileList(); updateFileList();
} }

3
src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h
View File

@@ -55,8 +55,7 @@ public:
public slots: public slots:
void triggerCommit(const JsonWizard::GeneratorFiles &files); void triggerCommit(const JsonWizard::GeneratorFiles &files);
void addToProject(const JsonWizard::GeneratorFiles &files); void addToProject(const JsonWizard::GeneratorFiles &files);
void projectNodeHasChanged(); void summarySettingsHaveChanged();
void versionControlHasChanged();
private: private:
void updateFileList(); void updateFileList();