[pitivi/ges: 194/287] preset: Moved to pitivi/

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

commit 616434d3081b12600be7852e9368327c3ba0e5ef
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Wed Jan 11 09:56:00 2012 -0300

    preset: Moved to pitivi/

 pitivi/Makefile.am        |    1 +
 pitivi/{ui => }/preset.py |    0
 pitivi/project.py         |    2 +-
 pitivi/render.py          |    4 ++--
 pitivi/ui/Makefile.am     |    1 -
 5 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index 27c0bfc..5337d41 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -17,6 +17,7 @@ pitivi_PYTHON = \
 	mediafilespreviewer.py	\
 	render.py	\
 	instance.py 	\
+	preset.py		\
 	project.py 	\
 	settings.py 	\
 	medialibrary.py
diff --git a/pitivi/ui/preset.py b/pitivi/preset.py
similarity index 100%
rename from pitivi/ui/preset.py
rename to pitivi/preset.py
diff --git a/pitivi/project.py b/pitivi/project.py
index b4a125e..4b671a4 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -48,7 +48,7 @@ from pitivi.utils.widgets import FractionWidget
 from pitivi.utils.ripple_update_group import RippleUpdateGroup
 from pitivi.utils.ui import model, frame_rates, audio_rates, audio_depths,\
     audio_channels, get_combo_value, set_combo_value
-from pitivi.ui.preset import AudioPresetManager, DuplicatePresetNameException,\
+from pitivi.preset import AudioPresetManager, DuplicatePresetNameException,\
     VideoPresetManager
 
 # FIXME: are we sure the following tables correct?
diff --git a/pitivi/render.py b/pitivi/render.py
index bbda591..055e806 100644
--- a/pitivi/render.py
+++ b/pitivi/render.py
@@ -377,7 +377,7 @@ class EncodingDialog(Loggable):
 
     def __init__(self, app, project, pipeline=None):
 
-        from pitivi.ui.preset import RenderPresetManager
+        from pitivi.preset import RenderPresetManager
 
         Loggable.__init__(self)
 
@@ -643,7 +643,7 @@ class EncodingDialog(Loggable):
 
     def _presetNameEditedCb(self, renderer, path, new_text, mgr):
         """Handle the renaming of a preset."""
-        from pitivi.ui.preset import DuplicatePresetNameException
+        from pitivi.preset import DuplicatePresetNameException
 
         try:
             mgr.renamePreset(path, new_text)
diff --git a/pitivi/ui/Makefile.am b/pitivi/ui/Makefile.am
index cc99b92..cc7f12a 100644
--- a/pitivi/ui/Makefile.am
+++ b/pitivi/ui/Makefile.am
@@ -6,7 +6,6 @@ ui_PYTHON =			\
 	filelisterrordialog.py	\
 	mainwindow.py		\
 	prefs.py		\
-	preset.py		\
 	basetabs.py		\
 	startupwizard.py 	\
 	viewer.py