Moving functions.py to UI

deluge/ui/gtkui/functions.py

@@ -52,9 +52,6 @@ import pygtk
 pygtk.require('2.0')
 import gtk, gtk.glade
 
-from addtorrentdialog import AddTorrentDialog
-from deluge.ui.ui import UI
-
 # Get the logger
 log = logging.getLogger("deluge")
 
@@ -69,10 +66,10 @@ def get_core():
     log.debug("Got core proxy object..")
     return core
     
-def add_torrent_file():
+def add_torrent_file(torrent_files):
-    """Opens a file chooser dialog and adds any files selected to the core"""
+    """Adds torrent files to the core
-    at_dialog = AddTorrentDialog()
+        Expects a list of torrent files
-    torrent_files = at_dialog.run()
+    """
     if torrent_files is None:
         log.debug("No torrent files selected..")
         return

deluge/ui/gtkui/menubar.py

@@ -38,7 +38,7 @@ pygtk.require('2.0')
 import gtk, gtk.glade
 import pkg_resources
 
-import functions
+import ui.functions
 
 # Get the logger
 log = logging.getLogger("deluge")
@@ -101,7 +101,8 @@ class MenuBar:
     ## File Menu ##
     def on_menuitem_addtorrent_activate(self, data=None):
         log.debug("on_menuitem_addtorrent_activate")
-        functions.add_torrent_file()
+        from addtorrentdialog import AddTorrentDialog
+        functions.add_torrent_file(AddTorrentDialog().run())
         
     def on_menuitem_addurl_activate(self, data=None):
         log.debug("on_menuitem_addurl_activate")

deluge/ui/gtkui/signals.py

@@ -50,7 +50,7 @@ import pygtk
 pygtk.require('2.0')
 import gtk, gtk.glade
 
-import functions
+import ui.functions
 from deluge.config import Config
 
 # Get the logger

deluge/ui/gtkui/toolbar.py

@@ -37,8 +37,6 @@ import pygtk
 pygtk.require('2.0')
 import gtk, gtk.glade
 
-import functions
-
 # Get the logger
 log = logging.getLogger("deluge")
 

deluge/ui/gtkui/torrentview.py

@@ -40,7 +40,7 @@ import gobject
 import gettext
 
 import columns
-import functions
+import ui.functions
 
 # Get the logger
 log = logging.getLogger("deluge")