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

Popup Component and dlgEnter Implementation #5878

Merged
merged 11 commits into from
Aug 30, 2020

Conversation

Patowhiz
Copy link
Contributor

@Patowhiz Patowhiz commented Jul 2, 2020

Fixes #5596 . Fixes #5876.

@africanmathsinitiative/developers this is ready for review.

This issue implements the popup component and also demonstrates through dlgEnter how other dialogs can use it. It's a continuation of PR #5877(which should be merged first) which has an empty class that represents the popup component.

Once merged, the other dialogs that currently have code that is implemented in this component, can be amended to use it.

@rdstern as discussed in issue #5596 the only thing waiting in the dialog are the samples and their tooltips. I will add them as soon as I get your feedback.

@lloyddewit
Copy link
Contributor

@Ivanluv Please could you review this? thanks

@lloyddewit
Copy link
Contributor

@Ivanluv Did you get a chance to look at this? thanks

@Ivanluv
Copy link
Contributor

Ivanluv commented Jul 27, 2020

@lloyddewit am looking at this now

@Ivanluv
Copy link
Contributor

Ivanluv commented Jul 27, 2020

@lloyddewit the code looks fine from my review

@lloyddewit
Copy link
Contributor

@Ivanluv Thank you for the peer review!

@rdstern Above, @Patowhiz requested '@rdstern as discussed in issue #5596 the only thing waiting in the dialog are the samples and their tooltips. I will add them as soon as I get your feedback.`. If you are able to provide these then I can do the final review and merge, thanks

Copy link
Collaborator

@rdstern rdstern left a comment

Choose a reason for hiding this comment

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

This is a good addition. It is incomplete as we know, but could have been merged. Except that the popup does work. However, the examples that are given do not move into the Data field - which incidentally should be better lined up and also have a colon. I suggest that is needed, before merging. It would do no harm to merge if needed for other pull requests, But otherwise it needs more work.

@Patowhiz
Copy link
Contributor Author

Patowhiz commented Aug 7, 2020

@rdstern

However, the examples that are given do not move into the Data field

This is is now fixed, was a bug in checking for selection.

which incidentally should be better lined up and also have a colon
I don't understand what you mean by should have colon and lined, in the popup? Below is the image of the current design during runtime.

dlgEnterNew

@rdstern
Copy link
Collaborator

rdstern commented Aug 7, 2020

Just that the label "Data" should move up slightly and become "Data:"

@Patowhiz
Copy link
Contributor Author

Patowhiz commented Aug 7, 2020

@rdstern that's now fixed. You can test the changes and @lloyddewit can do the review

@lloyddewit
Copy link
Contributor

@rdstern Please could you review? thanks

Copy link
Collaborator

@rdstern rdstern left a comment

Choose a reason for hiding this comment

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

@Patowhiz this would be ok to approve. But as you don't mind doing extra work now, I suggest you do 2 more steps on these changes before handing it over to @Wycklife . He is doing his exams just now.
In #5596 item a) was to swap the order of the new button and the the checkbox.
Then - more important - is to replace the examples you have, with ones I have provided, and add the tooltips.

You could stop there and we'll merge.

rdstern
rdstern previously approved these changes Aug 21, 2020
Copy link
Collaborator

@rdstern rdstern left a comment

Choose a reason for hiding this comment

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

I support this being merged now. Then further changes can be done by @Wycklife

Copy link
Contributor

@lloyddewit lloyddewit left a comment

Choose a reason for hiding this comment

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

@Patowhiz Thank you, I found the code structured and readable. Thank you also for the helpful commenting. I think this is particularly important for the new popup class because this will be used by others.
I think this class will be even easier for others to use if the non-XML comments (for public methods and data members) are converted to XML comments.
if you can do this then we can merge. Thanks

instat/clsPopup.vb Outdated Show resolved Hide resolved
'
' You should have received a copy of the GNU General Public License
' along with this program. If not, see <http://www.gnu.org/licenses/>.
Public Class clsPopup
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add XML comment for class (see RCodeStructure for example)

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

instat/dlgEnter.vb Show resolved Hide resolved
Co-authored-by: lloyddewit <[email protected]>
@lloyddewit
Copy link
Contributor

@rdstern Only the comments changed since your previous approval. Please could you approve again? thanks

Copy link
Collaborator

@rdstern rdstern left a comment

Choose a reason for hiding this comment

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

I can't see any difference. This will still be completed by @Wycklife later

@lloyddewit lloyddewit merged commit b5fabac into IDEMSInternational:master Aug 30, 2020
@Patowhiz Patowhiz deleted the UcrPopupAndDlgEnter branch April 12, 2021 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Popup Component Add examples to the Prepare > Generate > Enter dialogue
5 participants