[pitivi/ges: 182/287] timeline: Create a timeline/ folder containing timeline drawing related classes

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit e597337184c1fa6f8a7f06810bca7f10e15ad6be
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Tue Jan 10 15:58:43 2012 -0300

    timeline: Create a timeline/ folder containing timeline drawing related classes

 configure.ac                                |    1 +
 pitivi/Makefile.am                          |    1 +
 pitivi/timeline/Makefile.am                 |   14 +++++++++++++
 pitivi/timeline/__init__.py                 |   28 +++++++++++++++++++++++++++
 pitivi/{ui => timeline}/curve.py            |    0
 pitivi/{ui => timeline}/ruler.py            |    0
 pitivi/{ui => timeline}/timeline.py         |    0
 pitivi/{ui => timeline}/timelinecanvas.py   |    7 +++--
 pitivi/{ui => timeline}/timelinecontrols.py |    0
 pitivi/{ui => timeline}/track.py            |    2 +-
 pitivi/{ui => timeline}/trackobject.py      |    0
 pitivi/ui/Makefile.am                       |    7 ------
 pitivi/ui/mainwindow.py                     |    3 +-
 po/POTFILES.in                              |   12 ++++++----
 14 files changed, 58 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 81fa597..728949c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,7 @@ pitivi/configure.py
 pitivi/ui/Makefile
 pitivi/undo/Makefile
 pitivi/utils/Makefile
+pitivi/timeline/Makefile
 pitivi.spec
 po/Makefile.in
 tests/Makefile
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index 90633ec..9d3cd86 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = \
 	ui 		\
 	utils	\
+	timeline	\
 	undo
 
 pitividir = $(libdir)/pitivi/python/pitivi
diff --git a/pitivi/timeline/Makefile.am b/pitivi/timeline/Makefile.am
new file mode 100644
index 0000000..51c97a7
--- /dev/null
+++ b/pitivi/timeline/Makefile.am
@@ -0,0 +1,14 @@
+timelinedir = $(libdir)/pitivi/python/pitivi/timeline
+
+timeline_PYTHON =			\
+	__init__.py		\
+	timelinecanvas.py	\
+	timelinecontrols.py	\
+	timeline.py		\
+	trackobject.py		\
+	track.py	\
+	curve.py	\
+	ruler.py
+
+clean-local:
+	rm -rf *.pyc *.pyo
diff --git a/pitivi/timeline/__init__.py b/pitivi/timeline/__init__.py
new file mode 100644
index 0000000..7c823b7
--- /dev/null
+++ b/pitivi/timeline/__init__.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+#
+#       __init__.py
+#
+# Copyright (C) 2012 Thibault Saunier <thibaul saunier collabora com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+
+"""
+Timeline related classes
+"""
diff --git a/pitivi/ui/curve.py b/pitivi/timeline/curve.py
similarity index 100%
rename from pitivi/ui/curve.py
rename to pitivi/timeline/curve.py
diff --git a/pitivi/ui/ruler.py b/pitivi/timeline/ruler.py
similarity index 100%
rename from pitivi/ui/ruler.py
rename to pitivi/timeline/ruler.py
diff --git a/pitivi/ui/timeline.py b/pitivi/timeline/timeline.py
similarity index 100%
rename from pitivi/ui/timeline.py
rename to pitivi/timeline/timeline.py
diff --git a/pitivi/ui/timelinecanvas.py b/pitivi/timeline/timelinecanvas.py
similarity index 98%
rename from pitivi/ui/timelinecanvas.py
rename to pitivi/timeline/timelinecanvas.py
index b4b966a..c028647 100644
--- a/pitivi/ui/timelinecanvas.py
+++ b/pitivi/timeline/timelinecanvas.py
@@ -25,10 +25,11 @@ from gettext import gettext as _
 
 from pitivi.settings import GlobalSettings
 
-from pitivi.ui.track import Track
-from pitivi.ui.trackobject import TrackObject
+from pitivi.timeline.track import Track
+from pitivi.timeline.trackobject import TrackObject
+
 from pitivi.ui.prefs import PreferencesDialog
-from pitivi.ui.curve import KW_LABEL_Y_OVERFLOW
+from pitivi.timeline.curve import KW_LABEL_Y_OVERFLOW
 
 from pitivi.utils.loggable import Loggable
 from pitivi.utils.receiver import receiver, handler
diff --git a/pitivi/ui/timelinecontrols.py b/pitivi/timeline/timelinecontrols.py
similarity index 100%
rename from pitivi/ui/timelinecontrols.py
rename to pitivi/timeline/timelinecontrols.py
diff --git a/pitivi/ui/track.py b/pitivi/timeline/track.py
similarity index 99%
rename from pitivi/ui/track.py
rename to pitivi/timeline/track.py
index b5198e0..bdf33ed 100644
--- a/pitivi/ui/track.py
+++ b/pitivi/timeline/track.py
@@ -30,7 +30,7 @@ from pitivi.utils.receiver import receiver, handler
 from pitivi.utils.ui import LAYER_HEIGHT_EXPANDED,\
         LAYER_HEIGHT_COLLAPSED, LAYER_SPACING
 
-from pitivi.ui.trackobject import TrackObject
+from pitivi.timeline.trackobject import TrackObject
 
 
 class Transition(goocanvas.Rect, Zoomable):
diff --git a/pitivi/ui/trackobject.py b/pitivi/timeline/trackobject.py
similarity index 100%
rename from pitivi/ui/trackobject.py
rename to pitivi/timeline/trackobject.py
diff --git a/pitivi/ui/Makefile.am b/pitivi/ui/Makefile.am
index 0a403ce..fbf4100 100644
--- a/pitivi/ui/Makefile.am
+++ b/pitivi/ui/Makefile.am
@@ -3,7 +3,6 @@ uidir = $(libdir)/pitivi/python/pitivi/ui
 ui_PYTHON =			\
 	__init__.py		\
 	alignmentprogress.py    \
-	curve.py		\
 	depsmanager.py	\
 	filelisterrordialog.py	\
 	mainwindow.py		\
@@ -13,13 +12,7 @@ ui_PYTHON =			\
 	preview.py		\
 	projectsettings.py	\
 	basetabs.py		\
-	ruler.py		\
 	startupwizard.py 	\
-	timelinecanvas.py	\
-	timelinecontrols.py	\
-	timeline.py		\
-	trackobject.py		\
-	track.py		\
 	viewer.py		\
 	clipproperties.py	\
 	filechooserpreview.py
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 5d24d70..002f9b9 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -45,7 +45,8 @@ from pitivi.utils.ui import SPACING, info_name, FILESOURCE_TUPLE, URI_TUPLE, \
          TYPE_URI_LIST, TYPE_PITIVI_FILESOURCE
 from pitivi.utils.timeline import Zoomable
 
-from pitivi.ui.timeline import Timeline
+from pitivi.timeline.timeline import Timeline
+
 from pitivi.ui.basetabs import BaseTabs
 from pitivi.ui.viewer import PitiviViewer
 from pitivi.ui.clipproperties import ClipProperties
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c09d260..ca00d2f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -20,6 +20,12 @@ pitivi/projectmanager.py
 pitivi/project.py
 pitivi/settings.py
 pitivi/medialibrary.py
+
+pitivi/timeline/timelinecanvas.py
+pitivi/timeline/timelinecontrols.py
+pitivi/timeline/timeline.py
+pitivi/timeline/trackobject.py
+
 pitivi/ui/basetabs.py
 pitivi/ui/clipproperties.py
 pitivi/ui/filechooserpreview.py
@@ -28,12 +34,8 @@ pitivi/ui/mainwindow.py
 pitivi/ui/prefs.py
 pitivi/ui/previewer.py
 pitivi/ui/projectsettings.py
-pitivi/ui/startupwizard.py
-pitivi/ui/timelinecanvas.py
-pitivi/ui/timelinecontrols.py
-pitivi/ui/timeline.py
-pitivi/ui/trackobject.py
 pitivi/ui/viewer.py
+
 pitivi/utils/misc.py
 pitivi/utils/ui.py
 pitivi/utils/widgets.py