[pitivi/ges: 197/287] viewer: Move to the root pitivi/ folder
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/ges: 197/287] viewer: Move to the root pitivi/ folder
- Date: Thu, 15 Mar 2012 16:42:24 +0000 (UTC)
commit 2f8e0d000490d566ff1eac9f008c73c91ac75710
Author: Thibault Saunier <thibault saunier collabora com>
Date: Wed Jan 11 10:08:33 2012 -0300
viewer: Move to the root pitivi/ folder
pitivi/Makefile.am | 3 ++-
pitivi/mediafilespreviewer.py | 2 +-
pitivi/ui/Makefile.am | 3 +--
pitivi/ui/mainwindow.py | 2 +-
pitivi/{ui => }/viewer.py | 0
po/POTFILES.in | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index af924d5..cef8539 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -16,12 +16,13 @@ pitivi_PYTHON = \
configure.py \
effects.py \
mediafilespreviewer.py \
+ medialibrary.py \
render.py \
instance.py \
preset.py \
project.py \
settings.py \
- medialibrary.py
+ viewer.py
BUILT_SOURCES=configure.py
diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
index acfec3e..ddabffd 100644
--- a/pitivi/mediafilespreviewer.py
+++ b/pitivi/mediafilespreviewer.py
@@ -15,7 +15,7 @@ from pitivi.utils.misc import uri_is_valid
from pitivi.utils.ui import beautify_length, beautify_stream,\
SPACING
-from pitivi.ui.viewer import ViewerWidget
+from pitivi.viewer import ViewerWidget
DEFAULT_AUDIO_IMAGE = os.path.join(get_pixmap_dir(), "pitivi-sound.png")
diff --git a/pitivi/ui/Makefile.am b/pitivi/ui/Makefile.am
index cf4913e..a3c2193 100644
--- a/pitivi/ui/Makefile.am
+++ b/pitivi/ui/Makefile.am
@@ -6,8 +6,7 @@ ui_PYTHON = \
filelisterrordialog.py \
mainwindow.py \
prefs.py \
- startupwizard.py \
- viewer.py
+ startupwizard.py
clean-local:
rm -rf *.pyc *.pyo
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 1fa12bd..19b411d 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -47,7 +47,7 @@ from pitivi.utils.timeline import Zoomable
from pitivi.timeline.timeline import Timeline
-from pitivi.ui.viewer import PitiviViewer
+from pitivi.viewer import PitiviViewer
from pitivi.tabsmanager import BaseTabs
from pitivi.mediafilespreviewer import PreviewWidget
diff --git a/pitivi/ui/viewer.py b/pitivi/viewer.py
similarity index 100%
rename from pitivi/ui/viewer.py
rename to pitivi/viewer.py
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 91cd6d7..6009b04 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,6 +22,7 @@ pitivi/settings.py
pitivi/medialibrary.py
pitivi/clipproperties.py
pitivi/mediafilespreviewer.py
+pitivi/viewer.py
pitivi/timeline/timeline.py
pitivi/timeline/track.py
@@ -30,7 +31,6 @@ pitivi/timeline/thumbnailer.py
pitivi/ui/filelisterrordialog.py
pitivi/ui/mainwindow.py
pitivi/ui/prefs.py
-pitivi/ui/viewer.py
pitivi/utils/misc.py
pitivi/utils/ui.py
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]