GNOME.org
 

[pitivi/ges: 199/287] dialogs: Rename pitivi/ui into pitivi/dialogs

commit 7d35ef2089df72cd3d1fb6275c17ab61a0d0cd71
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Wed Jan 11 10:23:15 2012 -0300

    dialogs: Rename pitivi/ui into pitivi/dialogs
    
    This folder now contains *only* dialog window definition classes
    
    Remove references to old ui/ folder

 configure.ac                                  |    2 +-
 pitivi/Makefile.am                            |    2 +-
 pitivi/application.py                         |    8 ++++----
 pitivi/clipproperties.py                      |   11 ++++++-----
 pitivi/{ui => dialogs}/.gitignore             |    0
 pitivi/{ui => dialogs}/Makefile.am            |    2 +-
 pitivi/{ui => dialogs}/__init__.py            |    0
 pitivi/{ui => dialogs}/depsmanager.py         |    5 ++---
 pitivi/{ui => dialogs}/filelisterrordialog.py |    0
 pitivi/{ui => dialogs}/prefs.py               |    0
 pitivi/{ui => dialogs}/startupwizard.py       |    4 ++--
 pitivi/mainwindow.py                          |    2 +-
 pitivi/medialibrary.py                        |    5 ++---
 pitivi/preset.py                              |    2 +-
 pitivi/settings.py                            |    2 +-
 pitivi/timeline/curve.py                      |    2 +-
 pitivi/timeline/ruler.py                      |    2 +-
 pitivi/timeline/thumbnailer.py                |    2 +-
 pitivi/timeline/timeline.py                   |    8 ++++----
 pitivi/timeline/track.py                      |    2 +-
 pitivi/undo/timeline.py                       |    2 +-
 pitivi/utils/system.py                        |    2 +-
 po/POTFILES.in                                |    4 ++--
 tests/test_preset.py                          |    2 +-
 tests/test_projectsettings.py                 |    4 ++--
 25 files changed, 37 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 728949c..ed0a977 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,7 @@ common/m4/Makefile
 help/Makefile
 pitivi/Makefile
 pitivi/configure.py
-pitivi/ui/Makefile
+pitivi/dialogs/Makefile
 pitivi/undo/Makefile
 pitivi/utils/Makefile
 pitivi/timeline/Makefile
diff --git a/pitivi/Makefile.am b/pitivi/Makefile.am
index da771f3..eac296c 100644
--- a/pitivi/Makefile.am
+++ b/pitivi/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = \
-	ui 		\
+	dialogs 		\
 	utils	\
 	timeline	\
 	undo
diff --git a/pitivi/application.py b/pitivi/application.py
index 0090a29..68b0599 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -42,17 +42,17 @@ from pitivi.configure import APPNAME
 from pitivi.settings import GlobalSettings
 from pitivi.utils.threads import ThreadMaster
 from pitivi.mainwindow import PitiviMainWindow
+from pitivi.project import ProjectManager, ProjectLogObserver
+from pitivi.undo.medialibrary import MediaLibraryLogObserver
+from pitivi.undo.undo import UndoableActionLog, DebugActionLogObserver
+from pitivi.dialogs.startupwizard import StartUpWizard
 
 from pitivi.utils.signal import Signallable
 from pitivi.utils.system import getSystem
 from pitivi.utils.loggable import Loggable
 import pitivi.utils.loggable as log
-from pitivi.project import ProjectManager, ProjectLogObserver
-from pitivi.undo.undo import UndoableActionLog, DebugActionLogObserver
 #FIXME GES port disabled it
 #from pitivi.undo.timeline import TimelineLogObserver
-from pitivi.undo.medialibrary import MediaLibraryLogObserver
-from pitivi.ui.startupwizard import StartUpWizard
 
 # FIXME : Speedup loading time
 # Currently we load everything in one go
diff --git a/pitivi/clipproperties.py b/pitivi/clipproperties.py
index 67c0c33..48f24e9 100644
--- a/pitivi/clipproperties.py
+++ b/pitivi/clipproperties.py
@@ -29,19 +29,20 @@ import ges
 
 from gettext import gettext as _
 
-from pitivi.utils.playback import Seeker
 from pitivi.check import soft_deps
 from pitivi.configure import get_ui_dir
 
+from pitivi.dialogs.depsmanager import DepsManager
+
+from pitivi.utils.playback import Seeker
 from pitivi.utils.ui import EFFECT_TUPLE
 from pitivi.utils.loggable import Loggable
-from pitivi.effects import AUDIO_EFFECT, VIDEO_EFFECT, HIDDEN_EFFECTS, \
-    EffectsPropertiesManager
-
-from pitivi.ui.depsmanager import DepsManager
 from pitivi.utils.ui import PADDING, SPACING
 from pitivi.utils.widgets import GstElementSettingsWidget
 
+from pitivi.effects import AUDIO_EFFECT, VIDEO_EFFECT, HIDDEN_EFFECTS, \
+    EffectsPropertiesManager
+
 (COL_ACTIVATED,
  COL_TYPE,
  COL_NAME_TEXT,
diff --git a/pitivi/ui/.gitignore b/pitivi/dialogs/.gitignore
similarity index 100%
rename from pitivi/ui/.gitignore
rename to pitivi/dialogs/.gitignore
diff --git a/pitivi/ui/Makefile.am b/pitivi/dialogs/Makefile.am
similarity index 75%
rename from pitivi/ui/Makefile.am
rename to pitivi/dialogs/Makefile.am
index 99044f7..71cba14 100644
--- a/pitivi/ui/Makefile.am
+++ b/pitivi/dialogs/Makefile.am
@@ -1,4 +1,4 @@
-uidir = $(libdir)/pitivi/python/pitivi/ui
+uidir = $(libdir)/pitivi/python/pitivi/dialogs
 
 ui_PYTHON =			\
 	__init__.py		\
diff --git a/pitivi/ui/__init__.py b/pitivi/dialogs/__init__.py
similarity index 100%
rename from pitivi/ui/__init__.py
rename to pitivi/dialogs/__init__.py
diff --git a/pitivi/ui/depsmanager.py b/pitivi/dialogs/depsmanager.py
similarity index 97%
rename from pitivi/ui/depsmanager.py
rename to pitivi/dialogs/depsmanager.py
index 9f7c03b..0c39c7a 100644
--- a/pitivi/ui/depsmanager.py
+++ b/pitivi/dialogs/depsmanager.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/depsmanager.py
+#       pitivi/dialogs/depsmanager.py
 #
 # Copyright (c) 2011 Jean-FranÃois Fortin Tam <nekohayo gmail com>
 #
@@ -22,7 +22,6 @@
 
 import gtk
 import os
-from gettext import gettext as _
 
 from pitivi.configure import get_ui_dir
 from pitivi.check import soft_deps
@@ -52,7 +51,7 @@ class DepsManager(object):
         self.hide()
         """
         # FIXME: this is not implemented properly. Here is some partially working code:
-        
+
         self.session_bus = dbus.SessionBus()
         self.dbus_path = "/org/freedesktop/PackageKit"
         self.dbus_name = "org.freedesktop.PackageKit"
diff --git a/pitivi/ui/filelisterrordialog.py b/pitivi/dialogs/filelisterrordialog.py
similarity index 100%
rename from pitivi/ui/filelisterrordialog.py
rename to pitivi/dialogs/filelisterrordialog.py
diff --git a/pitivi/ui/prefs.py b/pitivi/dialogs/prefs.py
similarity index 100%
rename from pitivi/ui/prefs.py
rename to pitivi/dialogs/prefs.py
diff --git a/pitivi/ui/startupwizard.py b/pitivi/dialogs/startupwizard.py
similarity index 98%
rename from pitivi/ui/startupwizard.py
rename to pitivi/dialogs/startupwizard.py
index d27ec39..7e3ff77 100644
--- a/pitivi/ui/startupwizard.py
+++ b/pitivi/dialogs/startupwizard.py
@@ -1,6 +1,6 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/startupwizard.py
+#       pitivi/dialogs/startupwizard.py
 #
 # Copyright (c) 2010 Mathieu Duponchelle <seeed laposte net>
 #
@@ -25,7 +25,7 @@ import gtk
 from gettext import gettext as _
 
 from pitivi.configure import get_ui_dir
-from pitivi.ui.depsmanager import DepsManager
+from pitivi.dialogs.depsmanager import DepsManager
 from pitivi.check import soft_deps
 from pitivi.utils.misc import show_user_manual
 
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 19b411d..99d35ae 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -662,7 +662,7 @@ class PitiviMainWindow(gtk.Window, Loggable):
 
     def _prefsCb(self, unused_action):
         if not self.prefsdialog:
-            from pitivi.ui.prefs import PreferencesDialog
+            from pitivi.dialogs.prefs import PreferencesDialog
             self.prefsdialog = PreferencesDialog(self.app)
             self.prefsdialog.dialog.set_transient_for(self)
         self.prefsdialog.run()
diff --git a/pitivi/medialibrary.py b/pitivi/medialibrary.py
index 8eed44d..0fcb0f0 100644
--- a/pitivi/medialibrary.py
+++ b/pitivi/medialibrary.py
@@ -38,15 +38,14 @@ from hashlib import md5
 
 from pitivi.configure import get_pixmap_dir
 from pitivi.settings import GlobalSettings
+from pitivi.mediafilespreviewer import PreviewWidget
+from pitivi.dialogs.filelisterrordialog import FileListErrorDialog
 
 from pitivi.utils.ui import beautify_length
 from pitivi.utils.misc import PathWalker, quote_uri
 from pitivi.utils.signal import SignalGroup, Signallable
 from pitivi.utils.loggable import Loggable
-
 import pitivi.utils.ui as dnd
-from pitivi.mediafilespreviewer import PreviewWidget
-from pitivi.ui.filelisterrordialog import FileListErrorDialog
 from pitivi.utils.ui import beautify_info, info_name, \
     SPACING, PADDING
 
diff --git a/pitivi/preset.py b/pitivi/preset.py
index 11b43ec..12e9d35 100644
--- a/pitivi/preset.py
+++ b/pitivi/preset.py
@@ -1,6 +1,6 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/preset.py
+#       pitivi/preset.py
 #
 # Copyright (c) 2010, Brandon Lewis <brandon_lewis berkeley edu>
 #
diff --git a/pitivi/settings.py b/pitivi/settings.py
index f29713e..b7ec9ac 100644
--- a/pitivi/settings.py
+++ b/pitivi/settings.py
@@ -259,7 +259,7 @@ class GlobalSettings(Signallable):
         the config file is read. Only options registered before the config
         file is read will be loaded.
 
-        see pitivi/ui/mainwindow.py, pitivi/ui/medialibrary.py for examples of
+        see pitivi/mainwindow.py, pitivi/ui/medialibrary.py for examples of
         usage.
 
         @param attrname: the attribute of this class which represents the option
diff --git a/pitivi/timeline/curve.py b/pitivi/timeline/curve.py
index d160532..201a426 100644
--- a/pitivi/timeline/curve.py
+++ b/pitivi/timeline/curve.py
@@ -1,6 +1,6 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/curve.py
+#       pitivi/timeline/curve.py
 #
 # Copyright (c) 2006, Edward Hervey <bilboed bilboed com>
 #
diff --git a/pitivi/timeline/ruler.py b/pitivi/timeline/ruler.py
index 1ac12f6..092338e 100644
--- a/pitivi/timeline/ruler.py
+++ b/pitivi/timeline/ruler.py
@@ -1,6 +1,6 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/ruler.py
+#       pitivi/timeline/ruler.py
 #
 # Copyright (c) 2006, Edward Hervey <bilboed bilboed com>
 #
diff --git a/pitivi/timeline/thumbnailer.py b/pitivi/timeline/thumbnailer.py
index 9cd3b44..4592b6b 100644
--- a/pitivi/timeline/thumbnailer.py
+++ b/pitivi/timeline/thumbnailer.py
@@ -44,7 +44,7 @@ from pitivi.utils.timeline import Zoomable
 from pitivi.utils.signal import Signallable
 from pitivi.utils.loggable import Loggable
 
-from pitivi.ui.prefs import PreferencesDialog
+from pitivi.dialogs.prefs import PreferencesDialog
 
 GlobalSettings.addConfigSection("thumbnailing")
 GlobalSettings.addConfigOption("thumbnailSpacingHint",
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 0d9f6e0..de54b28 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -1,6 +1,6 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/timeline.py
+#       pitivi/timeline/timeline.py
 #
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2009, Brandon Lewis <brandon_lewis berkeley edu>
@@ -43,9 +43,9 @@ from curve import KW_LABEL_Y_OVERFLOW
 from track import TrackControls, TRACK_CONTROL_WIDTH, Track, TrackObject
 from pitivi.utils.timeline import Controller, MoveContext, SELECT, Zoomable
 
-from pitivi.ui.depsmanager import DepsManager
-from pitivi.ui.filelisterrordialog import FileListErrorDialog
-from pitivi.ui.prefs import PreferencesDialog
+from pitivi.dialogs.depsmanager import DepsManager
+from pitivi.dialogs.filelisterrordialog import FileListErrorDialog
+from pitivi.dialogs.prefs import PreferencesDialog
 
 from pitivi.utils.receiver import receiver, handler
 from pitivi.utils.loggable import Loggable
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index 938dd91..7fba6f8 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -32,7 +32,7 @@ import pitivi.configure as configure
 
 from gettext import gettext as _
 
-from pitivi.ui.prefs import PreferencesDialog
+from pitivi.dialogs.prefs import PreferencesDialog
 
 from pitivi.utils.loggable import Loggable
 from pitivi.utils.receiver import receiver, handler
diff --git a/pitivi/undo/timeline.py b/pitivi/undo/timeline.py
index 076f998..84a179e 100644
--- a/pitivi/undo/timeline.py
+++ b/pitivi/undo/timeline.py
@@ -25,7 +25,7 @@ from pitivi.utils.signal import Signallable
 from pitivi.undo.undo import PropertyChangeTracker
 from pitivi.undo.undo import UndoableAction
 
-from pitivi.ui.effectsconfiguration import PROPS_TO_IGNORE
+from pitivi.effects import PROPS_TO_IGNORE
 from pitivi.undo.effects import EffectGstElementPropertyChangeTracker
 
 
diff --git a/pitivi/utils/system.py b/pitivi/utils/system.py
index 7c21979..97fd5c7 100644
--- a/pitivi/utils/system.py
+++ b/pitivi/utils/system.py
@@ -1,6 +1,6 @@
 # PiTiVi , Non-linear video editor
 #
-#       pitivi/ui/system.py
+#       pitivi/utils/system.py
 #
 # Copyright (c) 2010, Stephen Griffiths <scgmk5 gmail com>
 #
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 960b401..f455e96 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,8 +29,8 @@ pitivi/timeline/timeline.py
 pitivi/timeline/track.py
 pitivi/timeline/thumbnailer.py
 
-pitivi/ui/filelisterrordialog.py
-pitivi/ui/prefs.py
+pitivi/dialogs/filelisterrordialog.py
+pitivi/dialogs/prefs.py
 
 pitivi/utils/misc.py
 pitivi/utils/ui.py
diff --git a/tests/test_preset.py b/tests/test_preset.py
index aec9546..afabceb 100644
--- a/tests/test_preset.py
+++ b/tests/test_preset.py
@@ -29,7 +29,7 @@ import tempfile
 from unittest import TestCase
 
 from pitivi.configure import get_audiopresets_dir
-from pitivi.ui.preset import DuplicatePresetNameException, \
+from pitivi.preset import DuplicatePresetNameException, \
     PresetManager, \
     AudioPresetManager
 
diff --git a/tests/test_projectsettings.py b/tests/test_projectsettings.py
index 3a9edce..8d75a95 100644
--- a/tests/test_projectsettings.py
+++ b/tests/test_projectsettings.py
@@ -21,8 +21,8 @@
 
 from unittest import TestCase
 
-from pitivi.ui.preset import PresetManager
-from pitivi.ui.project import ProjectSettingsDialog
+from pitivi.preset import PresetManager
+from pitivi.project import ProjectSettingsDialog
 
 
 class TestProjectSettingsDialog(TestCase):
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]