diff --git a/GUI/gui.py b/GUI/gui.py index f0ba076..f2f0f41 100644 --- a/GUI/gui.py +++ b/GUI/gui.py @@ -1,7 +1,4 @@ from Tkinter import * -import tkMessageBox - -from utils.sourceloader import SourceLoader class ConfigImporter(): def __init__(self, filename): @@ -34,9 +31,10 @@ class ConfigImporter(): return 'Name, Weight' class GUI(): - def __init__(self, search, config_file='GUI/gui.cfg'): + def __init__(self, search, config_file='GUI/gui.cfg', sourceloader = None): """Boots the window, configuration.""" self.configurator = ConfigImporter(config_file) + self.sourceloader = sourceloader self.finish_with_search = False self.values = {} self.required_variables = ['substance'] @@ -188,8 +186,7 @@ class GUI(): 'list': False, 'search': True} - source_loader = SourceLoader() - self.search(arguments, source_loader) + self.search(arguments, self.sourceloader) def run(self): """Starts the window and the search.""" diff --git a/gui_launcher.py b/gui_launcher.py index 734cb46..bd356bd 100644 --- a/gui_launcher.py +++ b/gui_launcher.py @@ -1,5 +1,7 @@ from fourmi import search from GUI import gui +from utils.sourceloader import SourceLoader -gui_window = gui.GUI(search) + +gui_window = gui.GUI(search, sourceloader=SourceLoader()) gui_window.run() diff --git a/tests/test_gui.py b/tests/test_gui.py index 4a9ddd2..247b7a2 100644 --- a/tests/test_gui.py +++ b/tests/test_gui.py @@ -6,7 +6,6 @@ class TestGUI(unittest.TestCase): def setUp(self): pass - def test_empty_attributes(self): self.test_gui = gui.GUI(None, '../GUI/gui.cfg') self.test_gui.window.after(9, self.test_gui.prepare_search)