[pitivi: 419/420] Merge branch 'ges'
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi: 419/420] Merge branch 'ges'
- Date: Fri, 18 May 2012 15:51:06 +0000 (UTC)
commit e04a3d28c5dbad645bd3fa61b8e17f418d39a7a5
Merge: 1d5b47a ffdee5d
Author: Jean-FranÃois Fortin Tam <nekohayo gmail com>
Date: Fri May 18 11:01:50 2012 -0400
Merge branch 'ges'
Conflicts:
pitivi/elements/singledecodebin.py
.gitignore | 5 +
bin/pitivi-git | 81 +
bin/pitivi.in | 13 +-
configure.ac | 11 +-
data/ui/Makefile.am | 8 +-
data/ui/clipmediaprops.ui | 424 +++
data/ui/mainwindow.xml | 12 +-
data/ui/preferences.ui | 1 +
data/ui/projectsettings.ui | 45 +-
data/ui/{encodingdialog.ui => renderingdialog.ui} | 98 +-
.../{encodingprogress.ui => renderingprogress.ui} | 12 +-
data/ui/startupwizard.ui | 195 +-
docs/HACKING | 20 +
docs/ges_port.notes | 114 +
docs/release | 1 +
help/C/medialibrary.page | 6 +-
help/C/rendering.page | 4 +-
help/C/savescreenshot.page | 23 +
help/Makefile.am | 1 +
pitivi/Makefile.am | 56 +-
pitivi/__init__.py | 4 +
pitivi/action.py | 751 -----
pitivi/actioner.py | 270 --
pitivi/application.py | 205 +-
pitivi/autoaligner.py | 708 ++++
pitivi/check.py | 4 +
pitivi/{ui => }/clipproperties.py | 208 +-
pitivi/configure.py.in | 1 +
pitivi/{elements => dialogs}/.gitignore | 0
pitivi/dialogs/Makefile.am | 13 +
pitivi/{ui => dialogs}/__init__.py | 0
pitivi/dialogs/clipmediaprops.py | 146 +
pitivi/{ui => dialogs}/depsmanager.py | 5 +-
pitivi/{ui => dialogs}/filelisterrordialog.py | 4 +-
pitivi/{ui => dialogs}/prefs.py | 24 +-
pitivi/{ui => dialogs}/startupwizard.py | 55 +-
pitivi/discoverer.py | 729 -----
pitivi/effects.py | 677 ++++-
pitivi/elements/Makefile.am | 13 -
pitivi/elements/__init__.py | 3 -
pitivi/elements/arraysink.py | 77 -
pitivi/elements/extractionsink.py | 94 -
pitivi/elements/mixer.py | 344 --
pitivi/elements/singledecodebin.py | 422 ---
pitivi/elements/thumbnailsink.py | 101 -
pitivi/elements/videofade.py | 101 -
pitivi/encode.py | 441 ---
pitivi/factories/Makefile.am | 12 -
pitivi/factories/base.py | 806 -----
pitivi/factories/file.py | 82 -
pitivi/factories/operation.py | 218 --
pitivi/factories/test.py | 120 -
pitivi/factories/timeline.py | 185 --
pitivi/formatters/Makefile.am | 11 -
pitivi/formatters/__init__.py | 24 -
pitivi/formatters/base.py | 421 ---
pitivi/formatters/etree.py | 892 ------
pitivi/formatters/format.py | 82 -
pitivi/formatters/playlist.py | 97 -
pitivi/log/Makefile.am | 11 -
pitivi/log/loggable.py | 41 -
pitivi/log/termcolor.py | 213 --
pitivi/log/test_log.py | 284 --
pitivi/{ui => }/mainwindow.py | 758 +++--
...ilechooserpreview.py => mediafilespreviewer.py} | 189 +-
pitivi/{ui/sourcelist.py => medialibrary.py} | 655 +++--
pitivi/pipeline.py | 954 ------
pitivi/pitivigstutils.py | 78 -
pitivi/plumber.py | 179 --
pitivi/{ui => }/preset.py | 26 +-
pitivi/project.py | 1004 ++++++-
pitivi/projectmanager.py | 312 --
pitivi/reflect.py | 151 -
pitivi/render.py | 1138 +++++++
pitivi/settings.py | 148 +-
pitivi/signalgroup.py | 85 -
pitivi/sourcelist.py | 189 --
pitivi/sourcelist_undo.py | 82 -
pitivi/stream.py | 584 ----
pitivi/{ui/basetabs.py => tabsmanager.py} | 31 +-
pitivi/thumbnailcache.py | 64 -
pitivi/timeline/Makefile.am | 16 +-
pitivi/timeline/__init__.py | 27 +-
pitivi/timeline/align.py | 391 ---
pitivi/timeline/alignalgs.py | 297 --
pitivi/{ui => timeline}/curve.py | 16 +-
pitivi/timeline/gap.py | 148 -
pitivi/timeline/ruler.py | 310 ++
.../{ui/previewer.py => timeline/thumbnailer.py} | 429 ++-
pitivi/timeline/timeline.py | 3369 ++++++++------------
pitivi/timeline/track.py | 1926 ++++--------
pitivi/ui/.gitignore | 3 -
pitivi/ui/Makefile.am | 43 -
pitivi/ui/alignmentprogress.py | 75 -
pitivi/ui/common.py | 222 --
pitivi/ui/controller.py | 238 --
pitivi/ui/dnd.py | 46 -
pitivi/ui/dynamic.py | 728 -----
pitivi/ui/effectlist.py | 475 ---
pitivi/ui/effectsconfiguration.py | 108 -
pitivi/ui/encodingdialog.py | 752 -----
pitivi/ui/encodingprogress.py | 79 -
pitivi/ui/gstwidget.py | 240 --
pitivi/ui/pathwalker.py | 64 -
pitivi/ui/point.py | 46 -
pitivi/ui/preview.py | 117 -
pitivi/ui/projectsettings.py | 586 ----
pitivi/ui/ruler.py | 351 --
pitivi/ui/timeline.py | 835 -----
pitivi/ui/timelinecanvas.py | 339 --
pitivi/ui/timelinecontrols.py | 88 -
pitivi/ui/track.py | 133 -
pitivi/ui/trackobject.py | 432 ---
pitivi/ui/view.py | 25 -
pitivi/ui/zoominterface.py | 149 -
pitivi/undo/Makefile.am | 12 +
pitivi/undo/__init__.py | 3 +
pitivi/undo/effect.py | 206 ++
pitivi/undo/medialibrary.py | 82 +
.../timeline_undo.py => undo/timeline.py} | 153 +-
pitivi/{ => undo}/undo.py | 57 +-
pitivi/utils.py | 606 ----
pitivi/utils/Makefile.am | 19 +
pitivi/utils/__init__.py | 3 +
pitivi/{timeline => utils}/extract.py | 10 +-
pitivi/{log/log.py => utils/loggable.py} | 333 ++-
pitivi/utils/misc.py | 404 +++
pitivi/utils/pipeline.py | 515 +++
pitivi/{ => utils}/receiver.py | 2 +-
pitivi/{ui => utils}/ripple_update_group.py | 0
pitivi/{signalinterface.py => utils/signal.py} | 87 +-
pitivi/utils/system.py | 308 ++
pitivi/{ => utils}/threads.py | 4 +-
pitivi/utils/timeline.py | 608 ++++
pitivi/utils/ui.py | 479 +++
pitivi/utils/widgets.py | 1047 ++++++
pitivi/{ui => }/viewer.py | 543 ++--
po/POTFILES.in | 56 +-
tests/Makefile.am | 26 +-
tests/common.py | 67 +-
tests/runtests.py | 2 +-
tests/test_action.py | 285 --
tests/test_alpha_passthrough.py | 242 --
tests/test_binary_search.py | 2 +-
tests/test_cache.py | 42 +-
tests/test_common.py | 2 +-
tests/test_discoverer.py | 504 ---
tests/test_encode.py | 130 -
tests/test_etree_formatter.py | 772 -----
tests/test_factories_base.py | 193 --
tests/test_factories_file.py | 250 --
tests/test_factories_operation.py | 54 -
tests/test_gap.py | 220 --
tests/test_integration.py | 14 +-
tests/test_log.py | 288 ++
tests/test_pipeline.py | 321 --
tests/test_pipeline_action.py | 191 --
tests/test_preset.py | 2 +-
tests/test_projectmanager.py | 707 +++--
tests/test_projectsettings.py | 4 +-
tests/test_seeker.py | 85 -
tests/test_settings.py | 6 +-
tests/test_signallable.py | 2 +-
tests/test_sourcelist.py | 101 -
tests/test_still_image.py | 6 +-
tests/test_stream.py | 283 --
tests/test_system.py | 51 +
tests/test_system_gnome.py | 49 +
tests/test_timeline.py | 1929 -----------
tests/test_timeline_factory.py | 321 --
tests/test_timeline_undo.py | 548 ++--
tests/test_track.py | 581 ----
tests/test_transitions.py | 704 ----
tests/test_undo.py | 2 +-
tests/test_utils.py | 2 +-
175 files changed, 13943 insertions(+), 30341 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
