Photostory

Merge lp://staging/~dwt/photostory/no-pic into lp://staging/~photostory/photostory/trunk

  1. no-pic
  2. Merge into trunk
Proposed by David Turner
Status: Merged
Merged at revision: 11
Proposed branch: lp://staging/~dwt/photostory/no-pic
Merge into: lp://staging/~photostory/photostory/trunk
Diff against target: 160 lines (+39/-27) (has conflicts)
3 files modified
app.py (+37/-19)
data/db (+1/-7)
data/num (+1/-1)
Text conflict in app.py
To merge this branch: bzr merge lp://staging/~dwt/photostory/no-pic
Reviewer Review Type Date Requested Status
Joel Auterson Approve
Josh Brown Approve
Review via email: mp+30912@code.staging.launchpad.net

Description of the change

This branch gets rid of the nopic.png and replaces it with a Label instead (Bug #608370)

Furthermore it extracts a new function setPic() which helps clean up the excessive amounts of "pic.set_from_file" calls.

To post a comment you must log in.
lp://staging/~dwt/photostory/no-pic updated
8. By David <david@david-laptop>

Oops, didn't actually change app.py. It should be correct this time.

9. By David <david@david-laptop>

Made the font color to be the default system font color since if the user is using a dark theme, previously the text would be unreadable.

Revision history for this message
Josh Brown (joshbrown) wrote :

Haven't tested it but the code looks good to me.

review: Approve
lp://staging/~dwt/photostory/no-pic updated
10. By David Turner

The button to take the picture was unselectable after going to a date that had a picture, and would not go back to selectable. Also fixed a bug with taking a picture, and the label would not get replaced by the new image.

Revision history for this message
Joel Auterson (joel-auterson) wrote :

If I take a picture, the label on the now-insensitive button changes to 'Picture taken for this day'. If I change the day to one in the future, it remains the same - please change this. It should change to the original label ('Take today's picture', I think) and be insensitive. :)

review: Needs Fixing
lp://staging/~dwt/photostory/no-pic updated
11. By David Turner

Fixed the 'Take today's picture' button

Revision history for this message
Joel Auterson (joel-auterson) wrote :

If David has indeed fixed the button then this is good to be merged.

Good man.

review: Approve

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

to all changes: