do some refactoring `screens` -> `screen`

5 files changed, 26 insertions, 27 deletions

diff --git a/MANIFEST b/MANIFEST
index 6114659..1c8c1eb 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -21,12 +21,12 @@ atoidejouer/ui/panel/__init__.py
 atoidejouer/ui/panel/edit.py
 atoidejouer/ui/panel/notebook.py
 atoidejouer/ui/panel/sound.py
-atoidejouer/ui/screens/__init__.py
-atoidejouer/ui/screens/activity.py
-atoidejouer/ui/screens/edit.py
-atoidejouer/ui/screens/help.py
-atoidejouer/ui/screens/splash.py
-atoidejouer/ui/screens/story.py
+atoidejouer/ui/screen/__init__.py
+atoidejouer/ui/screen/activity.py
+atoidejouer/ui/screen/edit.py
+atoidejouer/ui/screen/help.py
+atoidejouer/ui/screen/splash.py
+atoidejouer/ui/screen/story.py
 activity/activity.info
 activity/activity-atoidejouer.svg
 lib/__init__.py
diff --git a/activity.py b/activity.py
index ae2fb79..ff7331c 100644
--- a/activity.py
+++ b/activity.py
@@ -14,7 +14,7 @@ from sugar.activity import activity
 
 # atoidejouer import
 from atoidejouer.db import story
-from atoidejouer.ui import screens, toolbar
+from atoidejouer.ui import screen, toolbar
 from atoidejouer.tools import config, storage
 
 # get application logger
@@ -199,7 +199,7 @@ class AToiDeJouerActivity(activity.Activity):
         # already exist
         if self._current == 'edit':
             if self._splash is None:
-                self._splash = screens.Splash(toolbar)
+                self._splash = screen.Splash(toolbar)
             else:
                 self._splash._show()
             # ...
@@ -222,25 +222,25 @@ class AToiDeJouerActivity(activity.Activity):
                 self._thread.set_time()
             if self._current == 'help':
                 del self._screens[self._current]
-                self._screens[self._current] = screens.ScreenHelp(self)
+                self._screens[self._current] = screen.ScreenHelp(self)
             else:
                 pass
             # exit
             return
         # ..
         elif self._current == 'activity':
-            _scr = screens.ScreenActivity(self)
+            _scr = screen.ScreenActivity(self)
             # update screens dict
             self._screens[self._current] = _scr
             # ..
             return
         # screen factory
         elif self._current == 'edit':
-            _scr = screens.ScreenEdit(toolbar)
+            _scr = screen.ScreenEdit(toolbar)
         elif self._current == 'story':
-            _scr = screens.ScreenStory(toolbar, set_canvas=True)
+            _scr = screen.ScreenStory(toolbar, set_canvas=True)
         elif self._current == 'help':
-            _scr = screens.ScreenHelp(self)
+            _scr = screen.ScreenHelp(self)
         else:
             # ??
             return
diff --git a/atoidejouer/ui/screen/__init__.py b/atoidejouer/ui/screen/__init__.py
index 0df38d5..c0aa1bb 100644
--- a/atoidejouer/ui/screen/__init__.py
+++ b/atoidejouer/ui/screen/__init__.py
@@ -1,5 +1,5 @@
-from atoidejouer.ui.screens.splash      import Splash
-from atoidejouer.ui.screens.activity    import ScreenActivity
-from atoidejouer.ui.screens.story       import ScreenStory
-from atoidejouer.ui.screens.edit        import ScreenEdit
-from atoidejouer.ui.screens.help        import ScreenHelp
+from atoidejouer.ui.screen.splash      import Splash
+from atoidejouer.ui.screen.activity    import ScreenActivity
+from atoidejouer.ui.screen.story       import ScreenStory
+from atoidejouer.ui.screen.edit        import ScreenEdit
+from atoidejouer.ui.screen.help        import ScreenHelp
diff --git a/atoidejouer/ui/screen/edit.py b/atoidejouer/ui/screen/edit.py
index fa63bb7..fab6bbb 100644
--- a/atoidejouer/ui/screen/edit.py
+++ b/atoidejouer/ui/screen/edit.py
@@ -11,8 +11,7 @@ from sugar.graphics.objectchooser import ObjectChooser
 
 # atoidejouer import
 from atoidejouer.tools import config, storage, ui
-from atoidejouer.ui.panel import PanelNotebook, PanelSound
-from atoidejouer.ui.screens import ScreenStory
+from atoidejouer.ui import panel, screen
 
 # get application logger
 logger = logging.getLogger('atoidejouer')
@@ -41,16 +40,16 @@ class ScreenEdit(gtk.HBox):
         self._show()
 
     def add_scene(self, vbox):
-        self.scene = ScreenStory(self.toolbar,
+        self.scene = screen.ScreenStory(self.toolbar,
                 height_offset=148, width_offset=360)
         vbox.pack_start(self.scene, expand=True, fill=True)
 
     def add_panel_sound(self, vbox):
-        self.panel_sound = PanelSound(self)
+        self.panel_sound = panel.PanelSound(self)
         vbox.pack_start(self.panel_sound, expand=False, fill=False)
 
     def add_panel_edit(self):
-        self.panel_edit = PanelNotebook(self) # PanelEdit(self)
+        self.panel_edit = panel.PanelNotebook(self) # PanelEdit(self)
         self.pack_start(self.panel_edit, expand=False, fill=False)
 
     def refresh(self, key=None):
diff --git a/atoidejouer/ui/toolbar.py b/atoidejouer/ui/toolbar.py
index fe33ef8..c283c57 100644
--- a/atoidejouer/ui/toolbar.py
+++ b/atoidejouer/ui/toolbar.py
@@ -17,7 +17,7 @@ from sugar.graphics.toolbutton import ToolButton
 # atoidejouer import
 from atoidejouer.db import story
 from atoidejouer.tools import config, storage
-from atoidejouer.ui import screens
+from atoidejouer.ui import screen
 
 # get application logger
 logger = logging.getLogger('atoidejouer')
@@ -58,7 +58,7 @@ def _show_browser(toolbar, cls):
     _screen = toolbar.activity.get_screen(_screen_name)\
             if toolbar.activity.has_screen(_screen_name)\
             else cls(toolbar)
-    # update activity screens
+    # update activity screen
     toolbar.activity.set_current_screen(_screen_name, _screen)
     # do show
     _screen._show()
@@ -81,10 +81,10 @@ def _show_browser(toolbar, cls):
 def _cb_add(widget, toolbar):
     # browser screen factory
     if toolbar.name == 'edit':
-        _show_browser(toolbar, screens.ScreenBrowserGraphics)
+        _show_browser(toolbar, screen.ScreenBrowserGraphics)
     # ..
     elif toolbar.name == 'sounds':
-        _show_browser(toolbar, screens.ScreenBrowserSounds)
+        _show_browser(toolbar, screen.ScreenBrowserSounds)
     # ??
     else:
         # ERROR