OpenLP

Merge lp://qastaging/~suutari-olli/openlp/ui-messages-part-1-latest-commit into lp://qastaging/openlp

  1. ui-messages-part-1-latest-commit
  2. Merge into trunk
Proposed by Azaziah
Status: Work in progress
Proposed branch: lp://qastaging/~suutari-olli/openlp/ui-messages-part-1-latest-commit
Merge into: lp://qastaging/openlp
Diff against target: 167 lines (+30/-25)
6 files modified
openlp/core/ui/advancedtab.py (+2/-2)
openlp/core/ui/exceptiondialog.py (+1/-1)
openlp/core/ui/exceptionform.py (+11/-6)
openlp/core/ui/mainwindow.py (+13/-13)
openlp/plugins/media/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~suutari-olli/openlp/ui-messages-part-1-latest-commit
Reviewer Review Type Date Requested Status
Tim Bentley Pending
Review via email: mp+302698@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-08-11.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Please stop changing remotes as I am deleting it.

I know it is not of your making but I needed to read the code a few times to work out what it was doing! Can we have it a bit more logical please.

Needs tests !

review: Needs Fixing
Revision history for this message
Azaziah (suutari-olli) wrote : Posted in a previous version of this proposal

"- This is the latest commit of the ui-messages-part-1
  branch which was merged recently,

for some reason the latest commit which included
the most recent fixes was not merged."

Please stop changing remotes as I am deleting it.

// I removed the changes to remotes in the last commit of the merged branch, but...

I know it is not of your making but I needed to read the code a few times to work out what it was doing! Can we have it a bit more logical please.

// I simplified it.

Needs tests !

//
This was supposed to be merged already in the ui-messages-part-1 branch,
but due to some weird error it was not.

I am unwilling write a new test just to get this last commit merged.

If I must write a new test I'm going to turn this into ui-messages-part-2
and change a lot of other things as well.

Unmerged revisions

2657. By Azaziah

- Simplified the expection desc. counter.
- Removed changes to remotes.

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.