(GH-285) Add Control Margins

[wjk]

I used a four-pixel margin to the controls, as I thought that looked good. In addition, I adjusted some of the thicknesses of the margins to not add extra padding where there already was some applied from the parent control. (This is why you see Thickness="0,4,0,4" in the below diff.) If you disagree on the amount of padding applied, please comment and I will revise my PR.

[RichiCoder1]

LGTM

[gep13]

@wjk are you able to sign the CLA? We are going to need this in order to pull in this suggestion.

Also, any chance you can rebase your changes to include the issue number in the commit messages, as per the contributing.md document?

[wjk]

@gep13: The CLA has been signed. In addition, I will rebase the changes once I have access to my Windows PC in a few hours. Thanks!

[wjk]

@gep13 @RichiCoder1 Any update? I am especially curious why the AppVeyor CI build fails, yet the TeamCity CI build does not. If there are any more changes you want me to make before this is merged, please let me know.

[gep13]

@wjk no, nothing else is required from you here, we just need to work to pull this in. I am tied up with a few other things, and I know @RichiCoder1 is working on some refactoring to the underlying usage of Chocolatey within ChocolateyGUI. Once we are both clear of those things, we will definitely be pulling this in.

[gep13]

@wjk don't worry about the failing AppVeyor build. We do certain things on AppVeyor that we don't on the TeamCity build (mainly because we can) and there are some issues with the tooling that we are using.

[RichiCoder1]

I'll look into getting this merged today! Def shouldn't let this sit :)

[gep13]

@wjk thank you very much for this submission, and please accept my apologies for not getting back to you sooner, things have been a little hectic. Bottom line is, I have made some changes to the develop branch, in order to get the build working again on AppVeyor (it basically broke as a result of some changes that were made). Would it be possible for you to rebase this PR on the latest develop branch, and then I can look to getting this pulled in.

Thanks again!

[wjk]

@gep13 I’m sorry, but how exactly should I do this? I’ve never had to rebase a PR before. 😄

[gep13]

@wjk thanks for getting back to me.

The steps would be as follow...

1. From your fork/clone of this repository, you will need to create a clone to the upstream repository.
2. At the command line, navigate to where the cloned repository is
3. Then do git remote add upstream https://github.com/chocolatey/ChocolateyGUI.git
4. This will add a remote to your repository (the fork) back to the original code
5. Still in the command line, go the following git checkout develop to switch to the develop branch
6. Then do git fetch upstream. This will grab the latest code from this repository, and pull it down to your machine
7. Then do git rebase upstream/develop. This will update your local repository branch to include all the commits that I have done onto develop
8. Then do git push. This will push all the new commits that have been done on the develop branch up to GitHub on your fork/clone
9. Then do git checkout control-padding to switch back to your branch
10. Then do git rebase develop which will update your branch with the latest code from develop, and then apply the changes that you have made on your branch
11. Then do git push -f to push your branch up to your branch on GitHub, which will then automatically update this PR. NOTE: the addition of the -f in this push command, which is required since we have essentially rewritten the history of your local branch, by adding new commits into it

Hope that makes sense, if not, just let me know. Thanks again!

[wjk]

@gep13 Done! Thank you!

[RichiCoder1]

Awesome! Thanks for your contribution :)

[gep13]

Fixes #285