Checkbox

Merge lp://staging/~brendan-donegan/checkbox/story757_submit_to_hexr_checkbox into lp://staging/checkbox

  1. story757_submit_to_hexr_checkbox
  2. Merge into trunk
Proposed by Brendan Donegan
Status: Merged
Approved by: Daniel Manrique
Approved revision: 2075
Merged at revision: 2073
Proposed branch: lp://staging/~brendan-donegan/checkbox/story757_submit_to_hexr_checkbox
Merge into: lp://staging/checkbox
Diff against target: 740 lines (+106/-49)
34 files modified
checkbox/user_interface.py (+2/-2)
checkbox_cli/cli_interface.py (+2/-2)
checkbox_gtk/gtk_interface.py (+2/-2)
checkbox_qt/qt_interface.py (+3/-3)
checkbox_urwid/urwid_interface.py (+2/-2)
debian/changelog (+9/-1)
debian/po/ast.po (+2/-1)
debian/po/cs.po (+2/-1)
debian/po/de.po (+3/-3)
debian/po/en_AU.po (+2/-1)
debian/po/en_GB.po (+2/-1)
debian/po/es.po (+4/-5)
debian/po/fr.po (+2/-1)
debian/po/gl.po (+2/-1)
debian/po/he.po (+2/-1)
debian/po/hu.po (+2/-1)
debian/po/id.po (+2/-1)
debian/po/it.po (+2/-1)
debian/po/ja.po (+2/-1)
debian/po/nl.po (+2/-1)
debian/po/oc.po (+2/-1)
debian/po/pl.po (+2/-1)
debian/po/pt_BR.po (+2/-1)
debian/po/ro.po (+2/-1)
debian/po/ru.po (+2/-1)
debian/po/tr.po (+2/-1)
debian/po/uk.po (+2/-1)
debian/po/zh_CN.po (+2/-1)
debian/po/zh_TW.po (+2/-1)
plugins/launchpad_prompt.py (+2/-1)
plugins/launchpad_report.py (+2/-1)
qt/frontend/qtfront.cpp (+11/-1)
qt/frontend/qtfront.h (+2/-1)
qt/frontend/qtfront.ui (+20/-4)
To merge this branch: bzr merge lp://staging/~brendan-donegan/checkbox/story757_submit_to_hexr_checkbox
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Brendan Donegan (community) Needs Resubmitting
Review via email: mp+160306@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Adds a hidden checkbox to the submission screen, which can be revealed by calling the showEntry function in the right way.

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Ready for review now. I believe the code is harmless to merge now, as it will not 'trigger' unless show_entry is called in the right way from the plugin code.

Revision history for this message
Daniel Manrique (roadmr) wrote :

232 - <number>0</number>
233 + <number>2</number>

I remember qt designer doing this thing on its own and it then having some consequence I can't recall. If you're not sure this change applies to what you want to do, I'd suggest manually editing the QML file and reverting it.

Everything else looks fine from here.

review: Needs Fixing
lp://staging/~brendan-donegan/checkbox/story757_submit_to_hexr_checkbox updated
2075. By Brendan Donegan

Revert unintended change in UI file

Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

Dang QtCreator - nice catch, reverted.

review: Needs Resubmitting
Revision history for this message
Daniel Manrique (roadmr) wrote :

A bunch of translation files made it into this merge request :( why?

I reviewed them and they look OK, so I'll merge anyway, but I'd still like to know where they came from :(

review: Approve
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

I honestly have no idea. Probably we shouldn't have merged this until that was checked out. Anyway, hope it doesn't break anything.

Revision history for this message
Daniel Manrique (roadmr) wrote :

I tested merging locally and other than the appearance of the files, things seemed OK.

Tarmac is sick so I merged this manually for now...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches