Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved drad&drop files on project manager #5993

Merged
merged 1 commit into from
Aug 1, 2016

Conversation

profelis
Copy link
Contributor

Improved dnd in project manager. Dragged any file from project folder or single project folder autoimport it, otherwise confirm scan all dragger folders.

Regarding #5981, @akien-mga please review.

@profelis
Copy link
Contributor Author

I'm not sure, what to do with multiple_folders vector if user cancel scan, vector keep values, and only next dnd clear previous values

scan_dir->popup_centered_ratio();
}

void ProjectManager::_scan_multiple_folders()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be cleaner/simpler to just pass StringArray p_folders as argument here and drop the member var multiple_folders altogether?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@profelis profelis force-pushed the PR-scan-dragged-folder-2 branch from f0f495b to bee2091 Compare August 1, 2016 20:00
@profelis
Copy link
Contributor Author

profelis commented Aug 1, 2016

Fixed all and squashed in one commit

@@ -1332,8 +1367,13 @@ ProjectManager::ProjectManager() {
multi_run_ask = memnew( ConfirmationDialog );
multi_run_ask->get_ok()->set_text(TTR("Run"));
multi_run_ask->get_ok()->connect("pressed", this, "_run_project_confirm");

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beware of adding trailing spaces ;)

@akien-mga akien-mga added this to the 2.1 milestone Aug 1, 2016
@akien-mga akien-mga merged commit 3eb3752 into godotengine:master Aug 1, 2016
@profelis profelis deleted the PR-scan-dragged-folder-2 branch August 1, 2016 23:16
27thLiz added a commit to 27thLiz/godot that referenced this pull request Aug 5, 2016
akien-mga pushed a commit that referenced this pull request Aug 8, 2016
This has been deprecated by #5993

(cherry picked from commit 0df40cc)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants