Merge lp://staging/~gaspa/a4/neweditor into lp://staging/a4
Status: | Merged |
---|---|
Merged at revision: | 78 |
Proposed branch: | lp://staging/~gaspa/a4/neweditor |
Merge into: | lp://staging/a4 |
Diff against target: |
492 lines (+255/-64) 5 files modified
a4lib/app.py (+35/-4) a4lib/editor.py (+73/-52) a4lib/player.py (+6/-3) a4lib/presentation.py (+48/-0) data/window_main.glade (+93/-5) |
To merge this branch: | bzr merge lp://staging/~gaspa/a4/neweditor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Colangelo | Approve | ||
Review via email:
|
Description of the change
This branch addresses mainly some additional features to add to our editor.
Visually I added a toolbar with the common tools we'd like to use. Its status is:
* the only completely working button is 'path', as it does the same thing as usual.
* text and rect button works, but they don't handle correctly the position of the region.
* the other buttons still don't work.
I added a FeaturedPresent
Some littler changes:
* replaced show_all with show() in app.py
* cleaned some commented things that hasn't been used since now.
* these two lines:
+ #self.builder.
+ #self.builder.
will handle the fullscreen correctly, they are commented as there's no way to return from fullscreen currently.