{"action":"closed","number":39,"pull_request":{"url":"https://api.github.com/repos/zaps166/QMPlay2/pulls/39","id":76406939,"html_url":"https://github.com/zaps166/QMPlay2/pull/39","diff_url":"https://github.com/zaps166/QMPlay2/pull/39.diff","patch_url":"https://github.com/zaps166/QMPlay2/pull/39.patch","issue_url":"https://api.github.com/repos/zaps166/QMPlay2/issues/39","number":39,"state":"closed","locked":false,"title":"Settings Ui OSDSettings","user":{"login":"arthurzam","id":1664927,"avatar_url":"https://avatars.githubusercontent.com/u/1664927?v=3","gravatar_id":"","url":"https://api.github.com/users/arthurzam","html_url":"https://github.com/arthurzam","followers_url":"https://api.github.com/users/arthurzam/followers","following_url":"https://api.github.com/users/arthurzam/following{/other_user}","gists_url":"https://api.github.com/users/arthurzam/gists{/gist_id}","starred_url":"https://api.github.com/users/arthurzam/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arthurzam/subscriptions","organizations_url":"https://api.github.com/users/arthurzam/orgs","repos_url":"https://api.github.com/users/arthurzam/repos","events_url":"https://api.github.com/users/arthurzam/events{/privacy}","received_events_url":"https://api.github.com/users/arthurzam/received_events","type":"User","site_admin":false},"body":"The next PR about issue #13 :)\r\n\r\nThis PR includes `OSDSettings` ui file (it was quite big and now it is a little better). As Page 4 & 5 use this widget, I created a little \"hack\" that enables those pages to add widgets after the widget and still look good (direct access to the VBox).\r\n\r\nAfter some inspection, I think that Page 3 & 5 & 6 should not be converted to ui file (the UI code is too simple). Page 4 is around creating a simple GroupBox and appending it to OSDSettings, therefore I don't think it is worth moving to ui file.\r\n\r\nI do see a difference in margin, spacing between yours QGridLayout and mine approach. In my opinion (which might be wrong for most people) my approach is better because this extra spacing makes reading the settings a lot easier, and the auto resize after window resize is a lot cleaner.\r\n\r\nThe [last commit](https://github.com/zaps166/QMPlay2/commit/2dca495fc0b4ac4262d031b582839c7d68a00a7e) is a small change to remove pointers that are used only during initialization. I think it would be a good idea to do it, saving a little space. It would be much better to also remove more unused pointers, but there would be a need to change the names, like changing `page6->layout` to `page6_layout`. But for this change I prefer to hear your decision.\r\n\r\nThe last point: conflict between the branches. There is currently a conflict between master and settings-ui. I checked how to fix this conflict (by doing `git checkout settings-ui` -> `git rebase master`) is to remove all the master changes and remain the settings-ui changes. Also I think that we should do a periodical rebase to master. This rebase will need a `git push -f` but this branch is an internal dev branch therefore it won't be a problem if history changes for this branch.","created_at":"2016-07-06T10:00:14Z","updated_at":"2016-07-06T20:53:20Z","closed_at":"2016-07-06T20:53:20Z","merged_at":"2016-07-06T20:53:20Z","merge_commit_sha":"a0cdd0fa408f1000802ec578473b77b58647ca9c","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/zaps166/QMPlay2/pulls/39/commits","review_comments_url":"https://api.github.com/repos/zaps166/QMPlay2/pulls/39/comments","review_comment_url":"https://api.github.com/repos/zaps166/QMPlay2/pulls/comments{/number}","comments_url":"https://api.github.com/repos/zaps166/QMPlay2/issues/39/comments","statuses_url":"https://api.github.com/repos/zaps166/QMPlay2/statuses/2dca495fc0b4ac4262d031b582839c7d68a00a7e","head":{"label":"arthurzam:ui","ref":"ui","sha":"2dca495fc0b4ac4262d031b582839c7d68a00a7e","user":{"login":"arthurzam","id":1664927,"avatar_url":"https://avatars.githubusercontent.com/u/1664927?v=3","gravatar_id":"","url":"https://api.github.com/users/arthurzam","html_url":"https://github.com/arthurzam","followers_url":"https://api.github.com/users/arthurzam/followers","following_url":"https://api.github.com/users/arthurzam/following{/other_user}","gists_url":"https://api.github.com/users/arthurzam/gists{/gist_id}","starred_url":"https://api.github.com/users/arthurzam/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arthurzam/subscriptions","organizations_url":"https://api.github.com/users/arthurzam/orgs","repos_url":"https://api.github.com/users/arthurzam/repos","events_url":"https://api.github.com/users/arthurzam/events{/privacy}","received_events_url":"https://api.github.com/users/arthurzam/received_events","type":"User","site_admin":false},"repo":{"id":60910512,"name":"QMPlay2","full_name":"arthurzam/QMPlay2","owner":{"login":"arthurzam","id":1664927,"avatar_url":"https://avatars.githubusercontent.com/u/1664927?v=3","gravatar_id":"","url":"https://api.github.com/users/arthurzam","html_url":"https://github.com/arthurzam","followers_url":"https://api.github.com/users/arthurzam/followers","following_url":"https://api.github.com/users/arthurzam/following{/other_user}","gists_url":"https://api.github.com/users/arthurzam/gists{/gist_id}","starred_url":"https://api.github.com/users/arthurzam/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arthurzam/subscriptions","organizations_url":"https://api.github.com/users/arthurzam/orgs","repos_url":"https://api.github.com/users/arthurzam/repos","events_url":"https://api.github.com/users/arthurzam/events{/privacy}","received_events_url":"https://api.github.com/users/arthurzam/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/arthurzam/QMPlay2","description":"QMPlay2 is a video and audio player which can play most formats and codecs.","fork":true,"url":"https://api.github.com/repos/arthurzam/QMPlay2","forks_url":"https://api.github.com/repos/arthurzam/QMPlay2/forks","keys_url":"https://api.github.com/repos/arthurzam/QMPlay2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/arthurzam/QMPlay2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/arthurzam/QMPlay2/teams","hooks_url":"https://api.github.com/repos/arthurzam/QMPlay2/hooks","issue_events_url":"https://api.github.com/repos/arthurzam/QMPlay2/issues/events{/number}","events_url":"https://api.github.com/repos/arthurzam/QMPlay2/events","assignees_url":"https://api.github.com/repos/arthurzam/QMPlay2/assignees{/user}","branches_url":"https://api.github.com/repos/arthurzam/QMPlay2/branches{/branch}","tags_url":"https://api.github.com/repos/arthurzam/QMPlay2/tags","blobs_url":"https://api.github.com/repos/arthurzam/QMPlay2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/arthurzam/QMPlay2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/arthurzam/QMPlay2/git/refs{/sha}","trees_url":"https://api.github.com/repos/arthurzam/QMPlay2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/arthurzam/QMPlay2/statuses/{sha}","languages_url":"https://api.github.com/repos/arthurzam/QMPlay2/languages","stargazers_url":"https://api.github.com/repos/arthurzam/QMPlay2/stargazers","contributors_url":"https://api.github.com/repos/arthurzam/QMPlay2/contributors","subscribers_url":"https://api.github.com/repos/arthurzam/QMPlay2/subscribers","subscription_url":"https://api.github.com/repos/arthurzam/QMPlay2/subscription","commits_url":"https://api.github.com/repos/arthurzam/QMPlay2/commits{/sha}","git_commits_url":"https://api.github.com/repos/arthurzam/QMPlay2/git/commits{/sha}","comments_url":"https://api.github.com/repos/arthurzam/QMPlay2/comments{/number}","issue_comment_url":"https://api.github.com/repos/arthurzam/QMPlay2/issues/comments{/number}","contents_url":"https://api.github.com/repos/arthurzam/QMPlay2/contents/{+path}","compare_url":"https://api.github.com/repos/arthurzam/QMPlay2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/arthurzam/QMPlay2/merges","archive_url":"https://api.github.com/repos/arthurzam/QMPlay2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/arthurzam/QMPlay2/downloads","issues_url":"https://api.github.com/repos/arthurzam/QMPlay2/issues{/number}","pulls_url":"https://api.github.com/repos/arthurzam/QMPlay2/pulls{/number}","milestones_url":"https://api.github.com/repos/arthurzam/QMPlay2/milestones{/number}","notifications_url":"https://api.github.com/repos/arthurzam/QMPlay2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/arthurzam/QMPlay2/labels{/name}","releases_url":"https://api.github.com/repos/arthurzam/QMPlay2/releases{/id}","deployments_url":"https://api.github.com/repos/arthurzam/QMPlay2/deployments","created_at":"2016-06-11T14:18:59Z","updated_at":"2016-06-11T14:19:01Z","pushed_at":"2016-07-06T09:43:53Z","git_url":"git://github.com/arthurzam/QMPlay2.git","ssh_url":"git@github.com:arthurzam/QMPlay2.git","clone_url":"https://github.com/arthurzam/QMPlay2.git","svn_url":"https://github.com/arthurzam/QMPlay2","homepage":"http://zaps166.sourceforge.net/?app=QMPlay2","size":4437,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"zaps166:settings-ui","ref":"settings-ui","sha":"168fb2034587b7835f6c030afa06cc6b3013c5f4","user":{"login":"zaps166","id":6239090,"avatar_url":"https://avatars.githubusercontent.com/u/6239090?v=3","gravatar_id":"","url":"https://api.github.com/users/zaps166","html_url":"https://github.com/zaps166","followers_url":"https://api.github.com/users/zaps166/followers","following_url":"https://api.github.com/users/zaps166/following{/other_user}","gists_url":"https://api.github.com/users/zaps166/gists{/gist_id}","starred_url":"https://api.github.com/users/zaps166/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zaps166/subscriptions","organizations_url":"https://api.github.com/users/zaps166/orgs","repos_url":"https://api.github.com/users/zaps166/repos","events_url":"https://api.github.com/users/zaps166/events{/privacy}","received_events_url":"https://api.github.com/users/zaps166/received_events","type":"User","site_admin":false},"repo":{"id":24413103,"name":"QMPlay2","full_name":"zaps166/QMPlay2","owner":{"login":"zaps166","id":6239090,"avatar_url":"https://avatars.githubusercontent.com/u/6239090?v=3","gravatar_id":"","url":"https://api.github.com/users/zaps166","html_url":"https://github.com/zaps166","followers_url":"https://api.github.com/users/zaps166/followers","following_url":"https://api.github.com/users/zaps166/following{/other_user}","gists_url":"https://api.github.com/users/zaps166/gists{/gist_id}","starred_url":"https://api.github.com/users/zaps166/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zaps166/subscriptions","organizations_url":"https://api.github.com/users/zaps166/orgs","repos_url":"https://api.github.com/users/zaps166/repos","events_url":"https://api.github.com/users/zaps166/events{/privacy}","received_events_url":"https://api.github.com/users/zaps166/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/zaps166/QMPlay2","description":"QMPlay2 is a video and audio player which can play most formats and codecs.","fork":false,"url":"https://api.github.com/repos/zaps166/QMPlay2","forks_url":"https://api.github.com/repos/zaps166/QMPlay2/forks","keys_url":"https://api.github.com/repos/zaps166/QMPlay2/keys{/key_id}","collaborators_url":"https://api.github.com/repos/zaps166/QMPlay2/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/zaps166/QMPlay2/teams","hooks_url":"https://api.github.com/repos/zaps166/QMPlay2/hooks","issue_events_url":"https://api.github.com/repos/zaps166/QMPlay2/issues/events{/number}","events_url":"https://api.github.com/repos/zaps166/QMPlay2/events","assignees_url":"https://api.github.com/repos/zaps166/QMPlay2/assignees{/user}","branches_url":"https://api.github.com/repos/zaps166/QMPlay2/branches{/branch}","tags_url":"https://api.github.com/repos/zaps166/QMPlay2/tags","blobs_url":"https://api.github.com/repos/zaps166/QMPlay2/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/zaps166/QMPlay2/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/zaps166/QMPlay2/git/refs{/sha}","trees_url":"https://api.github.com/repos/zaps166/QMPlay2/git/trees{/sha}","statuses_url":"https://api.github.com/repos/zaps166/QMPlay2/statuses/{sha}","languages_url":"https://api.github.com/repos/zaps166/QMPlay2/languages","stargazers_url":"https://api.github.com/repos/zaps166/QMPlay2/stargazers","contributors_url":"https://api.github.com/repos/zaps166/QMPlay2/contributors","subscribers_url":"https://api.github.com/repos/zaps166/QMPlay2/subscribers","subscription_url":"https://api.github.com/repos/zaps166/QMPlay2/subscription","commits_url":"https://api.github.com/repos/zaps166/QMPlay2/commits{/sha}","git_commits_url":"https://api.github.com/repos/zaps166/QMPlay2/git/commits{/sha}","comments_url":"https://api.github.com/repos/zaps166/QMPlay2/comments{/number}","issue_comment_url":"https://api.github.com/repos/zaps166/QMPlay2/issues/comments{/number}","contents_url":"https://api.github.com/repos/zaps166/QMPlay2/contents/{+path}","compare_url":"https://api.github.com/repos/zaps166/QMPlay2/compare/{base}...{head}","merges_url":"https://api.github.com/repos/zaps166/QMPlay2/merges","archive_url":"https://api.github.com/repos/zaps166/QMPlay2/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/zaps166/QMPlay2/downloads","issues_url":"https://api.github.com/repos/zaps166/QMPlay2/issues{/number}","pulls_url":"https://api.github.com/repos/zaps166/QMPlay2/pulls{/number}","milestones_url":"https://api.github.com/repos/zaps166/QMPlay2/milestones{/number}","notifications_url":"https://api.github.com/repos/zaps166/QMPlay2/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/zaps166/QMPlay2/labels{/name}","releases_url":"https://api.github.com/repos/zaps166/QMPlay2/releases{/id}","deployments_url":"https://api.github.com/repos/zaps166/QMPlay2/deployments","created_at":"2014-09-24T11:56:50Z","updated_at":"2016-06-23T09:15:48Z","pushed_at":"2016-07-06T20:53:21Z","git_url":"git://github.com/zaps166/QMPlay2.git","ssh_url":"git@github.com:zaps166/QMPlay2.git","clone_url":"https://github.com/zaps166/QMPlay2.git","svn_url":"https://github.com/zaps166/QMPlay2","homepage":"http://zaps166.sourceforge.net/?app=QMPlay2","size":4632,"stargazers_count":18,"watchers_count":18,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":7,"mirror_url":null,"open_issues_count":4,"forks":7,"open_issues":4,"watchers":18,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/zaps166/QMPlay2/pulls/39"},"html":{"href":"https://github.com/zaps166/QMPlay2/pull/39"},"issue":{"href":"https://api.github.com/repos/zaps166/QMPlay2/issues/39"},"comments":{"href":"https://api.github.com/repos/zaps166/QMPlay2/issues/39/comments"},"review_comments":{"href":"https://api.github.com/repos/zaps166/QMPlay2/pulls/39/comments"},"review_comment":{"href":"https://api.github.com/repos/zaps166/QMPlay2/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/zaps166/QMPlay2/pulls/39/commits"},"statuses":{"href":"https://api.github.com/repos/zaps166/QMPlay2/statuses/2dca495fc0b4ac4262d031b582839c7d68a00a7e"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"zaps166","id":6239090,"avatar_url":"https://avatars.githubusercontent.com/u/6239090?v=3","gravatar_id":"","url":"https://api.github.com/users/zaps166","html_url":"https://github.com/zaps166","followers_url":"https://api.github.com/users/zaps166/followers","following_url":"https://api.github.com/users/zaps166/following{/other_user}","gists_url":"https://api.github.com/users/zaps166/gists{/gist_id}","starred_url":"https://api.github.com/users/zaps166/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zaps166/subscriptions","organizations_url":"https://api.github.com/users/zaps166/orgs","repos_url":"https://api.github.com/users/zaps166/repos","events_url":"https://api.github.com/users/zaps166/events{/privacy}","received_events_url":"https://api.github.com/users/zaps166/received_events","type":"User","site_admin":false},"comments":1,"review_comments":0,"commits":3,"additions":256,"deletions":134,"changed_files":7}}
{"actor":{"display_login":"zaps166"}}