Organized the source files

a5anka · Mar 17, 2012 · 638dcb4 · 638dcb4
1 parent 828e472
commit 638dcb4
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 8 deletions.
diff --git a/icon.png → data/icon.png b/icon.png → data/icon.png
diff --git a/lyrics-downloader.py b/lyrics-downloader.py
@@ -2,7 +2,7 @@
 
 from gi.repository import GObject, Peas, GdkPixbuf, Gtk, Notify # pylint: disable-msg=E0611
 
-from sidebar import LyricsSidebar
+from view.sidebar import LyricsSidebar
 
 class LyricsPlugin (GObject.Object, Peas.Activatable):
     __gtype_name__ = 'LyricsPlugin'

diff --git a/model/__init__.py b/model/__init__.py
diff --git a/chart_lyrics_model.py → model/chart_lyrics_model.py b/chart_lyrics_model.py → model/chart_lyrics_model.py
diff --git a/lyrdb_model.py → model/lyrdb_model.py b/lyrdb_model.py → model/lyrdb_model.py
diff --git a/lyrics-downloader.ui → ui/lyrics-downloader.ui b/lyrics-downloader.ui → ui/lyrics-downloader.ui
diff --git a/sidebar.ui → ui/sidebar.ui b/sidebar.ui → ui/sidebar.ui
diff --git a/view/__init__.py b/view/__init__.py
diff --git a/dialog_box.py → view/dialog_box.py b/dialog_box.py → view/dialog_box.py
@@ -4,10 +4,13 @@
 from gi.repository import Totem # pylint: disable-msg=E0611
 
 from tag_identifier import identify_mp3
-from chart_lyrics_model import ChartLyricsModel
-from lyrdb_model import LyrdbModel
-from search_thread import SearchThread
-from download_thread import DownloadThread
+
+from model.chart_lyrics_model import ChartLyricsModel
+from model.lyrdb_model import LyrdbModel
+
+from workers.search_thread import SearchThread
+from workers.download_thread import DownloadThread
+
 
 class DialogBox (object):
 
@@ -45,7 +48,7 @@ def _build_dialog(self):
 
         """
         builder = Totem.plugin_load_interface ("lyrics-downloader",
-                                               "lyrics-downloader.ui", True,
+                                               "ui/lyrics-downloader.ui", True,
                                                self._totem.get_main_window (),
                                                self)
         self._dialog = builder.get_object ('lyrics_dialog')

diff --git a/sidebar.py → view/sidebar.py b/sidebar.py → view/sidebar.py
@@ -3,7 +3,7 @@
 from gi.repository import GObject, Peas, GdkPixbuf, Gtk, Notify # pylint: disable-msg=E0611
 from gi.repository import Totem, Gio # pylint: disable-msg=E0611
 
-from dialog_box import DialogBox
+from view.dialog_box import DialogBox
 
 class LyricsSidebar(object):
 
@@ -14,7 +14,7 @@ def __init__(self, totem):
 
         # Add sidebar GUI
         builder = Totem.plugin_load_interface ("lyrics-downloader",   #
-                                               "sidebar.ui", 
+                                               "ui/sidebar.ui", 
                                                True,
                                                self._totem.get_main_window (),
                                                self)

diff --git a/workers/__init__.py b/workers/__init__.py
diff --git a/download_thread.py → workers/download_thread.py b/download_thread.py → workers/download_thread.py
diff --git a/search_thread.py → workers/search_thread.py b/search_thread.py → workers/search_thread.py