[ease: 57/57] Merge branch 'themes'
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease: 57/57] Merge branch 'themes'
- Date: Fri, 23 Jul 2010 23:52:53 +0000 (UTC)
commit a801f4d063f2b89ced219ef597f7436146c61be2
Merge: 450b7ea 208073d
Author: Nate Stedman <natesm gmail com>
Date: Fri Jul 23 19:52:15 2010 -0400
Merge branch 'themes'
.gitignore | 7 +
Makefile.am | 4 +-
data/Makefile.am | 8 +-
data/theme-defaults.json | 49 +++
data/ui/editor-window.ui | 4 +
data/ui/welcome-window.ui | 110 ++++++
examples/Transitions/Document.json | 756 +++++++++++++++---------------------
src/ease-document.vala | 72 +++-
src/ease-editor-embed.vala | 46 ++-
src/ease-editor-window.vala | 90 ++++-
src/ease-element.vala | 20 +-
src/ease-handle.vala | 10 +-
src/ease-json-parser.vala | 61 +---
src/ease-pdf-exporter.vala | 43 +--
src/ease-scrollable-embed.vala | 4 +-
src/ease-slide-actor.vala | 5 +-
src/ease-slide-button-panel.vala | 204 +++++++++--
src/ease-slide-button.vala | 134 -------
src/ease-slide-set.vala | 25 +-
src/ease-slide.vala | 69 ++++
src/ease-temp.vala | 135 +++++--
src/ease-text-actor.vala | 27 ++-
src/ease-text-element.vala | 107 +++---
src/ease-theme.vala | 512 ++++++++++++++++++++++++-
src/ease-transition-pane.vala | 6 +
src/ease-undo-action.vala | 108 +++++
src/ease-undo-actions.vala | 82 ----
src/ease-utilities.vala | 107 +++++-
src/ease-welcome-actor.vala | 205 +++++++---
src/ease-welcome-window.vala | 326 ++++++++--------
themes/Black/Theme.json | 12 +
themes/Pink/Media/Background.svg | 11 -
themes/Pink/Theme.json | 67 ----
themes/White/Theme.json | 69 +----
34 files changed, 2167 insertions(+), 1328 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]