[ease/plugins: 273/273] Merge branch 'master' into plugins
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease/plugins: 273/273] Merge branch 'master' into plugins
- Date: Sun, 22 Aug 2010 21:42:40 +0000 (UTC)
commit 76a56c8da58de4a64848f892e26ea40307bce242
Merge: 119085a 1f2a588
Author: Nate Stedman <natesm gmail com>
Date: Sun Aug 22 17:37:58 2010 -0400
Merge branch 'master' into plugins
Conflicts:
Makefile.am
configure.ac
.gitignore | 29 +-
ChangeLog | 10 +-
Makefile.am | 143 +--
NEWS | 20 +
autogen.sh | 2 +-
configure.ac | 76 +-
data/Makefile.am | 71 +-
data/ease-mime.xml | 7 +
data/ease.desktop.in | 5 +-
data/ease.desktop.in.in | 13 +
data/gnome-mime-application-x-ease.svg | 103 ++
data/icons/hicolor/scalable/apps/ease.svg | 103 ++
data/svg-sources/video-play-button-inkscape.svg | 257 ++++
data/svg/handle-black.svg | 74 -
data/svg/handle-white.svg | 74 -
data/svg/video-play-button.svg | 256 ++++
data/theme-defaults.json | 55 +
data/themes/Black/Theme.json | 12 +
data/themes/Blue/Theme.json | 13 +
data/themes/Goddard/Media/default.jpg | Bin 0 -> 132275 bytes
data/themes/Goddard/Theme.json | 30 +
data/themes/Green/Theme.json | 13 +
data/themes/Red/Theme.json | 13 +
data/themes/White/Theme.json | 4 +
data/ui/background.ui | 340 +++++
data/ui/editor-window.ui | 599 +++++++++
data/ui/inspector-element-image.ui | 56 +
data/ui/inspector-element-none.ui | 55 +
data/ui/inspector-element-pdf.ui | 60 +
data/ui/inspector-element-shape.ui | 77 ++
data/ui/inspector-element-text.ui | 124 ++
data/ui/inspector-element-video.ui | 118 ++
data/ui/inspector-slide.ui | 22 +
data/ui/progress-dialog.ui | 76 ++
data/ui/welcome-window.ui | 110 ++
ease-core/Makefile.am | 101 ++
{src => ease-core}/ease-actor.vala | 83 ++-
ease-core/ease-animated-zoom-slider.vala | 65 +
ease-core/ease-archiver.vala | 233 ++++
ease-core/ease-background-widget.vala | 483 +++++++
ease-core/ease-background.vala | 217 +++
.../ease-cairo-actor.vala | 44 +-
.../ease-cairo-element.vala | 11 +-
ease-core/ease-color.vala | 376 ++++++
ease-core/ease-dialog-progress.vala | 133 ++
ease-core/ease-dialogs.vala | 166 +++
ease-core/ease-document.vala | 590 +++++++++
ease-core/ease-element.vala | 271 ++++
{src => ease-core}/ease-enums.vala | 18 +
ease-core/ease-gradient.vala | 284 ++++
{src => ease-core}/ease-html-exporter.vala | 165 ++-
{src => ease-core}/ease-image-actor.vala | 4 +
ease-core/ease-image-element.vala | 127 ++
ease-core/ease-image.vala | 175 +++
ease-core/ease-iterable-models.vala | 74 +
ease-core/ease-media-element.vala | 77 ++
ease-core/ease-pdf-actor.vala | 89 ++
ease-core/ease-pdf-element.vala | 141 ++
ease-core/ease-shape-element.vala | 221 ++++
ease-core/ease-slide.vala | 727 ++++++++++
ease-core/ease-temp.vala | 175 +++
{src => ease-core}/ease-text-actor.vala | 83 +-
ease-core/ease-text-element.vala | 485 +++++++
ease-core/ease-theme.vala | 671 ++++++++++
ease-core/ease-transformations.vala | 52 +
ease-core/ease-transitions.vala | 368 ++++++
ease-core/ease-undo-action.vala | 130 ++
ease-core/ease-undo-actions-element.vala | 145 ++
ease-core/ease-undo-actions-slide.vala | 93 ++
{src => ease-core}/ease-undo-controller.vala | 52 +-
.../ease-undo-item.vala | 40 +-
ease-core/ease-undo-source.vala | 61 +
ease-core/ease-utilities.vala | 318 +++++
ease-core/ease-video-actor.vala | 334 +++++
ease-core/ease-video-element.vala | 288 ++++
{src => ease-core}/ease-zoom-slider.vala | 98 +-
ease/Makefile.am | 52 +
{src => ease}/ease-about-dialog.vala | 30 +-
{src => ease}/ease-close-confirm-dialog.vala | 30 +-
{src => ease}/ease-editor-embed.vala | 459 +++++--
ease/ease-editor-window.vala | 854 ++++++++++++
{src => ease}/ease-handle.vala | 63 +-
ease/ease-inspector-element-pane.vala | 70 +
{src => ease}/ease-inspector-pane.vala | 19 +-
ease/ease-inspector-slide-pane.vala | 59 +
ease/ease-inspector-transition-pane.vala | 459 +++++++
{src => ease}/ease-inspector.vala | 34 +-
ease/ease-main.vala | 370 ++++++
ease/ease-player.vala | 355 +++++
{src => ease}/ease-scrollable-embed.vala | 31 +-
ease/ease-selection-rectangle.vala | 74 +
{src => ease}/ease-slide-actor.vala | 510 ++++++--
ease/ease-slide-button-panel.vala | 236 ++++
ease/ease-slide-sorter.vala | 72 +
ease/ease-welcome-actor.vala | 245 ++++
{src => ease}/ease-welcome-window.vala | 353 +++---
examples/Transitions/Document.json | 1390 +++++++++-----------
examples/build.sh | 5 -
flutter/Makefile.am | 48 +
flutter/flutter.vala | 72 +
m4/introspection.m4 | 94 ++
pkgconfig/ease-core-0.4.pc.in | 11 +
pkgconfig/flutter-0.3.pc.in | 11 +
po/LINGUAS | 1 +
po/POTFILES.in | 126 +-
po/POTFILES.skip | 104 +-
po/de.po | 614 +++++++--
po/es.po | 693 ++++++++---
po/fr.po | 110 +-
po/pt_BR.po | 330 +++--
po/sl.po | 561 +++++----
po/sv.po | 27 +
src/ease-document.vala | 179 ---
src/ease-editor-window.vala | 428 ------
src/ease-element-map.vala | 127 --
src/ease-element.vala | 460 -------
src/ease-image-element.vala | 93 --
src/ease-inspector-window.vala | 74 -
src/ease-json-parser.vala | 266 ----
src/ease-main-toolbar.vala | 87 --
src/ease-open-dialog.vala | 68 -
src/ease-pdf-exporter.vala | 114 --
src/ease-player.vala | 246 ----
src/ease-slide-button-panel.vala | 91 --
src/ease-slide-button.vala | 134 --
src/ease-slide-pane.vala | 60 -
src/ease-slide-set.vala | 116 --
src/ease-slide.vala | 267 ----
src/ease-temp.vala | 220 ---
src/ease-text-element.vala | 298 -----
src/ease-theme.vala | 33 -
src/ease-transition-pane.vala | 282 ----
src/ease-transitions.vala | 369 ------
src/ease-undo-actions.vala | 82 --
src/ease-utilities.vala | 60 -
src/ease-video-actor.vala | 153 ---
src/ease-video-element.vala | 83 --
src/ease-welcome-actor.vala | 142 --
src/main.vala | 243 ----
src/source-base-group.vala | 128 --
src/source-base-view.vala | 78 --
src/source-expandable-group.vala | 65 -
src/source-group.vala | 53 -
src/source-item.vala | 309 -----
src/source-list-example | Bin 268846 -> 0 bytes
src/source-list.vala | 156 ---
src/source-pane-view.vala | 67 -
src/source-view.vala | 49 -
themes/Pink/Media/Background.svg | 11 -
themes/Pink/Theme.json | 67 -
themes/White/Theme.json | 69 -
themes/build.sh | 16 -
vapi/ease-core-0.4.deps | 9 +
vapi/flutter-0.3.deps | 2 +
154 files changed, 17306 insertions(+), 8408 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
