GNOME.org
 

[pitivi/ges: 156/287] pitivi: Create a 'utils' directory where we add all the helper classes and functions

commit c7039d0c21eea6f410fe27c98ad683c13af79a28
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Mon Jan 9 11:58:36 2012 -0300

    pitivi: Create a 'utils' directory where we add all the helper classes and functions

 configure.ac                                |    2 +-
 pitivi/Makefile.am                          |    5 ++---
 pitivi/application.py                       |    4 ++--
 pitivi/project.py                           |    4 ++--
 pitivi/ui/clipproperties.py                 |    2 +-
 pitivi/ui/curve.py                          |    2 +-
 pitivi/ui/dynamic.py                        |    2 +-
 pitivi/ui/effectsconfiguration.py           |    2 +-
 pitivi/ui/encodingdialog.py                 |    2 +-
 pitivi/ui/filechooserpreview.py             |    2 +-
 pitivi/ui/mainwindow.py                     |    2 +-
 pitivi/ui/preset.py                         |    2 +-
 pitivi/ui/ruler.py                          |    4 ++--
 pitivi/ui/sourcelist.py                     |    2 +-
 pitivi/ui/startupwizard.py                  |    2 +-
 pitivi/ui/timeline.py                       |    4 ++--
 pitivi/ui/trackobject.py                    |    2 +-
 pitivi/ui/viewer.py                         |    2 +-
 pitivi/{timeline => utils}/Makefile.am      |    5 +++--
 pitivi/{timeline => utils}/__init__.py      |    0
 pitivi/{timeline => utils}/align.py         |    4 ++--
 pitivi/{timeline => utils}/alignalgs.py     |    0
 pitivi/{timeline => utils}/extract.py       |    2 +-
 pitivi/{timeline => utils}/gap.py           |    2 +-
 pitivi/{utils.py => utils/misc.py}          |    0
 pitivi/{timeline => utils}/timeline.py      |    8 ++++----
 pitivi/{timeline => utils}/timeline_undo.py |    2 +-
 po/POTFILES.in                              |    2 +-
 tests/test_binary_search.py                 |    2 +-
 tests/test_integration.py                   |    2 +-
 tests/test_projectmanager.py                |    2 +-
 tests/test_settings.py                      |    6 +++---
 tests/test_still_image.py                   |    4 ++--
 tests/test_timeline_undo.py                 |    6 +++---
 tests/test_utils.py                         |    2 +-
 35 files changed, 48 insertions(+), 48 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a7eb307..a4854c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ pitivi/Makefile
 pitivi/configure.py
 pitivi/ui/Makefile
 pitivi/log/Makefile
-pitivi/timeline/Makefile
+pitivi/utils/Makefile
 pitivi.spec
 po/Makefile.in
 tests/Makefile
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index 3766643..1f03bcc 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = \
 	ui 		\
-	timeline	\
+	utils	\
 	log
 
 pitividir = $(libdir)/pitivi/python/pitivi
@@ -25,8 +25,7 @@ pitivi_PYTHON = \
 	system.py	\
 	threads.py	\
 	thumbnailcache.py \
-	undo.py		\
-	utils.py
+	undo.py
 
 BUILT_SOURCES=configure.py
 
diff --git a/pitivi/application.py b/pitivi/application.py
index 630cb93..0c393e6 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -49,7 +49,7 @@ from pitivi.ui.mainwindow import PitiviMainWindow
 from pitivi.projectmanager import ProjectManager, ProjectLogObserver
 from pitivi.undo import UndoableActionLog, DebugActionLogObserver
 #FIXME GES port disabled it
-#from pitivi.timeline.timeline_undo import TimelineLogObserver
+#from pitivi.utils.timeline_undo import TimelineLogObserver
 from pitivi.sourcelist_undo import SourceListLogObserver
 from pitivi.ui.startupwizard import StartUpWizard
 
@@ -125,7 +125,7 @@ class Pitivi(Loggable, Signallable):
         #self.screencast = False
 
         self.effects = EffectsHandler()
-        self.system = getSystem ()
+        self.system = getSystem()
 
         self.projectManager = ProjectManager(self.effects)
         self._connectToProjectManager(self.projectManager)
diff --git a/pitivi/project.py b/pitivi/project.py
index b4d9fde..22bd4d3 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -26,12 +26,12 @@ Project class
 import ges
 import gst
 
-from pitivi.utils import Seeker
+from pitivi.utils.misc import Seeker
 from pitivi.log.loggable import Loggable
 from pitivi.sourcelist import SourceList
 from pitivi.settings import MultimediaSettings
 from pitivi.signalinterface import Signallable
-from pitivi.timeline.timeline import Selection
+from pitivi.utils.timeline import Selection
 
 
 class ProjectError(Exception):
diff --git a/pitivi/ui/clipproperties.py b/pitivi/ui/clipproperties.py
index 5cdf220..04a2872 100644
--- a/pitivi/ui/clipproperties.py
+++ b/pitivi/ui/clipproperties.py
@@ -30,7 +30,7 @@ import ges
 
 from gettext import gettext as _
 
-from pitivi.utils import Seeker
+from pitivi.utils.misc import Seeker
 from pitivi.check import soft_deps
 from pitivi.configure import get_ui_dir
 from pitivi.log.loggable import Loggable
diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
index 5304208..06b93f3 100644
--- a/pitivi/ui/curve.py
+++ b/pitivi/ui/curve.py
@@ -33,7 +33,7 @@ from pitivi.ui.view import View
 from pitivi.ui.controller import Controller
 from pitivi.ui.common import LAYER_HEIGHT_EXPANDED, roundedrec
 import pitivi.ui.point as point
-from pitivi.utils import between
+from pitivi.utils.misc import between
 
 
 def intersect(b1, b2):
diff --git a/pitivi/ui/dynamic.py b/pitivi/ui/dynamic.py
index eefa2cd..b5288df 100644
--- a/pitivi/ui/dynamic.py
+++ b/pitivi/ui/dynamic.py
@@ -29,7 +29,7 @@ import re
 import sys
 import gst
 from gettext import gettext as _
-from pitivi.utils import time_to_string
+from pitivi.utils.misc import time_to_string
 from pitivi.ui.common import unpack_color, pack_color_32, pack_color_64
 import pango
 from pitivi.ui.common import SPACING
diff --git a/pitivi/ui/effectsconfiguration.py b/pitivi/ui/effectsconfiguration.py
index 3a6f095..0f3a086 100644
--- a/pitivi/ui/effectsconfiguration.py
+++ b/pitivi/ui/effectsconfiguration.py
@@ -22,7 +22,7 @@ import gst
 import gtk
 import gobject
 
-from pitivi.utils import Seeker
+from pitivi.utils.misc import Seeker
 from pitivi.ui.gstwidget import GstElementSettingsWidget
 from pitivi.ui.dynamic import FractionWidget
 
diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
index 6095ac7..ef42c59 100644
--- a/pitivi/ui/encodingdialog.py
+++ b/pitivi/ui/encodingdialog.py
@@ -33,7 +33,7 @@ import time
 from gettext import gettext as _
 
 from pitivi import configure
-from pitivi.utils import togglePlayback, Seeker, beautify_ETA
+from pitivi.utils.misc import togglePlayback, Seeker, beautify_ETA
 from pitivi.settings import MultimediaSettings
 from pitivi.signalinterface import Signallable
 
diff --git a/pitivi/ui/filechooserpreview.py b/pitivi/ui/filechooserpreview.py
index 868e316..7b1f69b 100644
--- a/pitivi/ui/filechooserpreview.py
+++ b/pitivi/ui/filechooserpreview.py
@@ -7,7 +7,7 @@ import os
 
 from pitivi.log.loggable import Loggable
 from pitivi.ui.common import beautify_stream
-from pitivi.utils import beautify_length, uri_is_valid
+from pitivi.utils.misc import beautify_length, uri_is_valid
 from pitivi.configure import get_pixmap_dir
 from pitivi.settings import GlobalSettings
 from gettext import gettext as _
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index a56ac8f..313a75a 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -39,7 +39,7 @@ from pitivi.log.loggable import Loggable
 from pitivi.settings import GlobalSettings
 from pitivi.sourcelist import SourceListError
 
-from pitivi.utils import show_user_manual
+from pitivi.utils.misc import show_user_manual
 
 from pitivi.ui import dnd
 from pitivi.ui.common import SPACING
diff --git a/pitivi/ui/preset.py b/pitivi/ui/preset.py
index 0a2d31d..5a8f213 100644
--- a/pitivi/ui/preset.py
+++ b/pitivi/ui/preset.py
@@ -28,7 +28,7 @@ import json
 from pitivi.encode import available_muxers, available_video_encoders, \
      available_audio_encoders
 from pitivi.settings import xdg_data_home
-from pitivi.utils import isWritable
+from pitivi.utils.misc import isWritable
 from pitivi.configure import get_renderpresets_dir, \
         get_audiopresets_dir, get_videopresets_dir
 
diff --git a/pitivi/ui/ruler.py b/pitivi/ui/ruler.py
index 48cc772..0f8145a 100644
--- a/pitivi/ui/ruler.py
+++ b/pitivi/ui/ruler.py
@@ -27,11 +27,11 @@ import gobject
 import gtk
 import gst
 
-from pitivi.utils import Seeker
+from pitivi.utils.misc import Seeker
 
 from pitivi.ui.zoominterface import Zoomable
 from pitivi.log.loggable import Loggable
-from pitivi.utils import time_to_string
+from pitivi.utils.misc import time_to_string
 
 
 class ScaleRuler(gtk.DrawingArea, Zoomable, Loggable):
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index 4aa880f..7fd570c 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -36,7 +36,7 @@ import pitivi.ui.dnd as dnd
 from pitivi.configure import get_pixmap_dir
 from pitivi.signalgroup import SignalGroup
 from pitivi.settings import GlobalSettings
-from pitivi.utils import beautify_length
+from pitivi.utils.misc import beautify_length
 
 from pitivi.ui.pathwalker import PathWalker, quote_uri
 from pitivi.ui.filelisterrordialog import FileListErrorDialog
diff --git a/pitivi/ui/startupwizard.py b/pitivi/ui/startupwizard.py
index a37a2a7..d27ec39 100644
--- a/pitivi/ui/startupwizard.py
+++ b/pitivi/ui/startupwizard.py
@@ -27,7 +27,7 @@ from gettext import gettext as _
 from pitivi.configure import get_ui_dir
 from pitivi.ui.depsmanager import DepsManager
 from pitivi.check import soft_deps
-from pitivi.utils import show_user_manual
+from pitivi.utils.misc import show_user_manual
 
 from urllib import unquote
 
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 24a3d00..45ee0a4 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -39,7 +39,7 @@ from pitivi.log.loggable import Loggable
 from timelinecanvas import TimelineCanvas
 from timelinecontrols import TimelineControls
 from pitivi.effects import AUDIO_EFFECT, VIDEO_EFFECT
-from pitivi.timeline.timeline import MoveContext, SELECT
+from pitivi.utils.timeline import MoveContext, SELECT
 
 from pitivi.ui.common import SPACING
 from pitivi.ui.depsmanager import DepsManager
@@ -48,7 +48,7 @@ from pitivi.ui.alignmentprogress import AlignmentProgressDialog
 from pitivi.ui.common import TRACK_SPACING, LAYER_HEIGHT_EXPANDED, LAYER_SPACING
 
 # FIXME GES Port regression
-# from pitivi.timeline.align import AutoAligner
+# from pitivi.utils.align import AutoAligner
 
 DND_EFFECT_LIST = [[dnd.VIDEO_EFFECT_TUPLE[0], dnd.EFFECT_TUPLE[0]],\
                   [dnd.AUDIO_EFFECT_TUPLE[0], dnd.EFFECT_TUPLE[0]]]
diff --git a/pitivi/ui/trackobject.py b/pitivi/ui/trackobject.py
index 63ea29f..4506d09 100644
--- a/pitivi/ui/trackobject.py
+++ b/pitivi/ui/trackobject.py
@@ -19,7 +19,7 @@ from pitivi.settings import GlobalSettings
 from pitivi.receiver import receiver, handler
 from pitivi.ui.prefs import PreferencesDialog
 from pitivi.signalinterface import Signallable
-from pitivi.timeline.timeline import SELECT, SELECT_ADD, UNSELECT, \
+from pitivi.utils.timeline import SELECT, SELECT_ADD, UNSELECT, \
     SELECT_BETWEEN, MoveContext, TrimStartContext, TrimEndContext
 
 
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index dc74475..afb273d 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -29,7 +29,7 @@ from gettext import gettext as _
 
 from pitivi.log.loggable import Loggable
 from pitivi.settings import GlobalSettings
-from pitivi.utils import togglePlayback
+from pitivi.utils.misc import togglePlayback
 from pitivi.ui.common import SPACING, hex_to_rgb
 from pitivi.ui.dynamic import TimeWidget
 
diff --git a/pitivi/timeline/Makefile.am b/pitivi/utils/Makefile.am
similarity index 66%
rename from pitivi/timeline/Makefile.am
rename to pitivi/utils/Makefile.am
index 078bdc1..c94d5ac 100644
--- a/pitivi/timeline/Makefile.am
+++ b/pitivi/utils/Makefile.am
@@ -1,12 +1,13 @@
-timelinedir = $(libdir)/pitivi/python/pitivi/timeline
+utilsdir = $(libdir)/pitivi/python/pitivi/utils
 
-timeline_PYTHON = 	\
+utils_PYTHON = 	\
 	__init__.py	    \
 	align.py        \
 	alignalgs.py    \
 	extract.py      \
 	timeline.py     \
 	gap.py     \
+	misc.py     \
 	timeline_undo.py
 
 clean-local:
diff --git a/pitivi/timeline/__init__.py b/pitivi/utils/__init__.py
similarity index 100%
rename from pitivi/timeline/__init__.py
rename to pitivi/utils/__init__.py
diff --git a/pitivi/timeline/align.py b/pitivi/utils/align.py
similarity index 99%
rename from pitivi/timeline/align.py
rename to pitivi/utils/align.py
index b9bfe9f..9102b6a 100644
--- a/pitivi/timeline/align.py
+++ b/pitivi/utils/align.py
@@ -32,9 +32,9 @@ except ImportError:
 
 import gobject
 import gst
-from pitivi.utils import beautify_ETA, call_false
+from pitivi.utils.misc import beautify_ETA, call_false
 from pitivi.log.loggable import Loggable
-from pitivi.timeline.alignalgs import rigidalign
+from pitivi.utils.alignalgs import rigidalign
 
 
 def getAudioTrack(timeline_object):
diff --git a/pitivi/timeline/alignalgs.py b/pitivi/utils/alignalgs.py
similarity index 100%
rename from pitivi/timeline/alignalgs.py
rename to pitivi/utils/alignalgs.py
diff --git a/pitivi/timeline/extract.py b/pitivi/utils/extract.py
similarity index 99%
rename from pitivi/timeline/extract.py
rename to pitivi/utils/extract.py
index da9873b..cd01b79 100644
--- a/pitivi/timeline/extract.py
+++ b/pitivi/utils/extract.py
@@ -31,7 +31,7 @@ from collections import deque
 from pitivi.elements.singledecodebin import SingleDecodeBin
 from pitivi.elements.extractionsink import ExtractionSink
 from pitivi.log.loggable import Loggable
-from pitivi.utils import pipeline
+from pitivi.utils.misc import pipeline
 
 
 class Extractee:
diff --git a/pitivi/timeline/gap.py b/pitivi/utils/gap.py
similarity index 99%
rename from pitivi/timeline/gap.py
rename to pitivi/utils/gap.py
index 215c888..16fd2f8 100644
--- a/pitivi/timeline/gap.py
+++ b/pitivi/utils/gap.py
@@ -21,7 +21,7 @@
 
 import ges
 
-from pitivi.utils import infinity
+from pitivi.utils.misc import infinity
 
 
 class Gap(object):
diff --git a/pitivi/utils.py b/pitivi/utils/misc.py
similarity index 100%
rename from pitivi/utils.py
rename to pitivi/utils/misc.py
diff --git a/pitivi/timeline/timeline.py b/pitivi/utils/timeline.py
similarity index 99%
rename from pitivi/timeline/timeline.py
rename to pitivi/utils/timeline.py
index 5a5449c..7a0c015 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/utils/timeline.py
@@ -24,12 +24,12 @@ import ges
 
 from gst import SECOND
 
-from pitivi.utils import infinity
+from pitivi.utils.misc import infinity
 from pitivi.log.loggable import Loggable
 from pitivi.signalinterface import Signallable
-from pitivi.timeline.gap import Gap, SmallestGapsFinder, invalid_gap
+from pitivi.utils.gap import Gap, SmallestGapsFinder, invalid_gap
 
-#from pitivi.timeline.align import AutoAligner
+#from pitivi.utils.align import AutoAligner
 
 # Selection modes
 SELECT = 0
@@ -117,7 +117,7 @@ class EditingContext(object):
         interactive editing, such as objects in the current selection.
         @type other: a set() of L{TimelineObject}s or L{TrackObject}s
 
-        @returns: An instance of L{pitivi.timeline.timeline.TimelineEditContex}
+        @returns: An instance of L{pitivi.utils.timeline.TimelineEditContex}
         """
 
         # make sure focus is not in secondary object list
diff --git a/pitivi/timeline/timeline_undo.py b/pitivi/utils/timeline_undo.py
similarity index 99%
rename from pitivi/timeline/timeline_undo.py
rename to pitivi/utils/timeline_undo.py
index 85a3c81..750aaec 100644
--- a/pitivi/timeline/timeline_undo.py
+++ b/pitivi/utils/timeline_undo.py
@@ -22,7 +22,7 @@
 import gobject
 
 from pitivi.signalinterface import Signallable
-from pitivi.utils import PropertyChangeTracker
+from pitivi.utils.misc import PropertyChangeTracker
 from pitivi.undo import UndoableAction
 
 from pitivi.ui.effectsconfiguration import PROPS_TO_IGNORE
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ccdb9fe..e80afa9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -41,4 +41,4 @@ pitivi/ui/timelinecontrols.py
 pitivi/ui/timeline.py
 pitivi/ui/trackobject.py
 pitivi/ui/viewer.py
-pitivi/utils.py
+pitivi/utils/misc.py
diff --git a/tests/test_binary_search.py b/tests/test_binary_search.py
index bf78870..73a3922 100644
--- a/tests/test_binary_search.py
+++ b/tests/test_binary_search.py
@@ -1,7 +1,7 @@
 import unittest
 import pitivi
 from pitivi.application import Pitivi
-from pitivi.utils import binary_search
+from pitivi.utils.misc import binary_search
 from common import TestCase
 
 
diff --git a/tests/test_integration.py b/tests/test_integration.py
index af5aa85..9f505f2 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -25,7 +25,7 @@ QA scenarios """
 import unittest
 TestCase = unittest.TestCase
 from pitivi.application import InteractivePitivi
-from pitivi.timeline.timeline import MoveContext, TrimStartContext,\
+from pitivi.utils.timeline import MoveContext, TrimStartContext,\
     TrimEndContext
 from pitivi.signalinterface import Signallable
 from pitivi.stream import AudioStream, VideoStream
diff --git a/tests/test_projectmanager.py b/tests/test_projectmanager.py
index 852723a..489f4a6 100644
--- a/tests/test_projectmanager.py
+++ b/tests/test_projectmanager.py
@@ -33,7 +33,7 @@
         #FormatterError, FormatterLoadError
 #import os
 #import gst
-#from pitivi.utils import uri_is_reachable
+#from pitivi.utils.misc import uri_is_reachable
 #import time
 
 
diff --git a/tests/test_settings.py b/tests/test_settings.py
index b808bff..2a13630 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,12 +1,12 @@
 import unittest
-from pitivi.settings import ExportSettings
+from pitivi.settings import MultimediaSettings
 
 
 class TestExportSettings(unittest.TestCase):
-    """Test the settings.ExportSettings class."""
+    """Test the settings.MultimediaSettings class."""
 
     def setUp(self):
-        self.settings = ExportSettings()
+        self.settings = MultimediaSettings()
 
     def testMasterAttributes(self):
         self._testMasterAttribute('muxer', dependant_attr='containersettings')
diff --git a/tests/test_still_image.py b/tests/test_still_image.py
index 908c634..eefff9c 100644
--- a/tests/test_still_image.py
+++ b/tests/test_still_image.py
@@ -29,8 +29,8 @@ import common
 
 from pitivi.factories.file import PictureFileSourceFactory
 from pitivi.factories.timeline import TimelineSourceFactory
-from pitivi.timeline.track import Track, SourceTrackObject
-from pitivi.timeline.timeline import Timeline
+from pitivi.utils.track import Track, SourceTrackObject
+from pitivi.utils.timeline import Timeline
 from pitivi.encode import RenderSinkFactory, RenderFactory
 from pitivi.action import RenderAction
 from pitivi.settings import StreamEncodeSettings, RenderSettings
diff --git a/tests/test_timeline_undo.py b/tests/test_timeline_undo.py
index e3f3c7d..9cf7556 100644
--- a/tests/test_timeline_undo.py
+++ b/tests/test_timeline_undo.py
@@ -31,11 +31,11 @@
 #import gst
 
 #from pitivi.pipeline import Pipeline
-#from pitivi.timeline.timeline import Timeline, TimelineObject, SELECT_ADD
-#from pitivi.timeline.track import Track, SourceTrackObject, TrackEffect
+#from pitivi.utils.timeline import Timeline, TimelineObject, SELECT_ADD
+#from pitivi.utils.track import Track, SourceTrackObject, TrackEffect
 #from pitivi.factories.test import VideoTestSourceFactory, TestEffectFactory
 #from pitivi.stream import VideoStream
-#from pitivi.timeline.timeline_undo import TimelineLogObserver, \
+#from pitivi.utils.timeline_undo import TimelineLogObserver, \
         #TimelineObjectAdded, TimelineObjectRemoved, \
         #TimelineObjectPropertyChanged, TrackEffectAdded
 #from pitivi.undo import UndoableActionLog
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 0e989ce..e434f90 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -23,7 +23,7 @@
 from unittest import TestCase
 
 import gst
-from pitivi.utils import beautify_length
+from pitivi.utils.misc import beautify_length
 
 second = gst.SECOND
 minute = second * 60
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]