Merge lp://staging/~quickly-committers/quickly/gtk3-projects into lp://staging/quickly
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Merged at revision: | 645 |
| Proposed branch: | lp://staging/~quickly-committers/quickly/gtk3-projects |
| Merge into: | lp://staging/quickly |
| Diff against target: |
1834 lines (+265/-696) 38 files modified
data/templates/ubuntu-application/create.py (+13/-1) data/templates/ubuntu-application/help/code/JottyWindow.py (+1/-1) data/templates/ubuntu-application/help/tutorial.xml (+1/-1) data/templates/ubuntu-application/project_root/.bzrignore (+1/-0) data/templates/ubuntu-application/project_root/data/glib-2.0/schemas/net.launchpad.project_name.gschema.xml (+10/-0) data/templates/ubuntu-application/project_root/data/ui/Aboutcamel_case_nameDialog.ui (+11/-13) data/templates/ubuntu-application/project_root/data/ui/Preferencescamel_case_nameDialog.ui (+68/-49) data/templates/ubuntu-application/project_root/data/ui/camel_case_nameWindow.ui (+1/-2) data/templates/ubuntu-application/project_root/python/Preferencescamel_case_nameDialog.py (+9/-25) data/templates/ubuntu-application/project_root/python/__init__.py (+3/-16) data/templates/ubuntu-application/project_root/python/camel_case_nameWindow.py (+1/-1) data/templates/ubuntu-application/project_root/python_lib/AboutDialog.py (+2/-2) data/templates/ubuntu-application/project_root/python_lib/Builder.py (+29/-14) data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py (+3/-84) data/templates/ubuntu-application/project_root/python_lib/Window.py (+8/-10) data/templates/ubuntu-application/project_root/python_lib/__init__.py (+0/-1) data/templates/ubuntu-application/project_root/python_lib/helpers.py (+3/-4) data/templates/ubuntu-application/project_root/python_lib/preferences.py (+0/-100) data/templates/ubuntu-application/project_root/tests/test_example.py (+1/-1) data/templates/ubuntu-application/run.py (+13/-1) data/templates/ubuntu-application/store/data/ui/dialog_camel_case_nameDialog.ui (+13/-9) data/templates/ubuntu-application/store/data/ui/dialog_python_name_dialog.xml (+1/-1) data/templates/ubuntu-application/store/dialog.py (+1/-1) data/templates/ubuntu-application/store/python/dialog_camel_case_nameDialog.py (+5/-5) data/templates/ubuntu-application/store/python/indicator.py (+7/-8) data/templates/ubuntu-application/test/apport/apport.sh (+12/-5) data/templates/ubuntu-application/test/builder/builder.py (+2/-2) data/templates/ubuntu-application/test/configure.sh (+2/-3) data/templates/ubuntu-application/test/filelist.sh (+5/-2) data/templates/ubuntu-application/test/metadata.sh (+2/-4) data/templates/ubuntu-application/test/preferences.py (+0/-151) data/templates/ubuntu-application/upgrade.py (+4/-2) data/templates/ubuntu-flash-game/internal/apportutils.py (+0/-143) data/templates/ubuntu-flash-game/project_root/bin/project_name (+8/-7) quickly/quicklyconfig.py (+1/-1) quickly/test/pylint.sh (+1/-1) setup.py (+1/-1) ubuntudevbar.py (+22/-24) |
| To merge this branch: | bzr merge lp://staging/~quickly-committers/quickly/gtk3-projects |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Didier Roche-Tolomelli | Approve | ||
|
Review via email:
|
|||
Description of the change
Woo! Gtk3/PyGI/GSettings all wrapped into one branch (because they can't be done separately).
Lots of changes. I dropped desktopcouch for gsettings (as discussed in mailing list). Rest of changes are pretty expected.
Tests all pass now (with latest python-
To post a comment you must log in.
Revision history for this message
| Michael Terry (mterry) wrote | # |
Revision history for this message
| Didier Roche-Tolomelli (didrocks) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Excellent work Michael! It's even frustrating that I have nothing to say about it as your much as your work there rocks!
Just a small questions though, in the test apport file:
1154 -quickly upgrade 0.3 0.4
1155 +quickly upgrade 0.3
at multiple time, do you need that and why?
However, I get a lot of error in the testsuite here. Seems to be more a setup issue than anything and not really have the time to run it. So if you confirm that all the tests are passing, please, feel free to merge :)