diff --git a/gooey/gui/styling.py b/gooey/gui/util/styling.py similarity index 100% rename from gooey/gui/styling.py rename to gooey/gui/util/styling.py diff --git a/gooey/gui/widgets/calender_dialog.py b/gooey/gui/widgets/calender_dialog.py index b255778..751f7c2 100644 --- a/gooey/gui/widgets/calender_dialog.py +++ b/gooey/gui/widgets/calender_dialog.py @@ -1,7 +1,8 @@ __author__ = 'Chris' import wx -from gooey.gui import styling + +from gooey.gui.util import styling class CalendarDlg(wx.Dialog): diff --git a/gooey/gui/widgets/choosers.py b/gooey/gui/widgets/choosers.py index 4c54aa9..23b44f8 100644 --- a/gooey/gui/widgets/choosers.py +++ b/gooey/gui/widgets/choosers.py @@ -2,7 +2,7 @@ __author__ = 'Chris' import wx -from gooey.gui import styling +from gooey.gui.util import styling from gooey.gui.widgets.calender_dialog import CalendarDlg diff --git a/gooey/gui/widgets/components.py b/gooey/gui/widgets/components.py index bfc7aa9..31064b7 100644 --- a/gooey/gui/widgets/components.py +++ b/gooey/gui/widgets/components.py @@ -1,7 +1,7 @@ import wx -from gooey.gui import styling + +from gooey.gui.util import styling from gooey.gui.widgets import widget_pack -from collections import namedtuple class BaseGuiComponent(object): diff --git a/gooey/gui/windows/advanced_config.py b/gooey/gui/windows/advanced_config.py index 9260c3a..618eece 100644 --- a/gooey/gui/windows/advanced_config.py +++ b/gooey/gui/windows/advanced_config.py @@ -4,17 +4,17 @@ Managed the internal layout for configuration options @author: Chris """ -import wx import itertools from itertools import chain + +import wx from wx.lib.scrolledpanel import ScrolledPanel -from gooey.gui import styling +from gooey.gui.util import styling from gooey.gui.lang import i18n from gooey.gui import component_builder from gooey.gui.option_reader import OptionReader - PADDING = 10 diff --git a/gooey/gui/windows/base_window.py b/gooey/gui/windows/base_window.py index fe2e316..e2313ea 100644 --- a/gooey/gui/windows/base_window.py +++ b/gooey/gui/windows/base_window.py @@ -3,9 +3,6 @@ Created on Jan 19, 2014 @author: Chris ''' -import os -import sys - import wx from wx.lib.pubsub import pub @@ -13,9 +10,9 @@ from gooey.gui.controller import Controller from gooey.gui.lang import i18n from gooey.gui.windows.advanced_config import AdvancedConfigPanel from gooey.gui.windows.runtime_display_panel import RuntimeDisplay -from gooey.gui import styling, image_repository +from gooey.gui import image_repository +from gooey.gui.util import styling from gooey.gui.windows import footer, header, layouts -from gooey.gui.windows.sidebar import Sidebar class BaseWindow(wx.Frame): diff --git a/gooey/gui/windows/header.py b/gooey/gui/windows/header.py index 4b9da09..3f88e2c 100644 --- a/gooey/gui/windows/header.py +++ b/gooey/gui/windows/header.py @@ -7,7 +7,7 @@ Created on Dec 23, 2013 import wx from gooey.gui import imageutil, image_repository -from gooey.gui import styling +from gooey.gui.util import styling from gooey.gui.lang import i18n diff --git a/gooey/gui/windows/layouts.py b/gooey/gui/windows/layouts.py index acbd9a7..98b6aba 100644 --- a/gooey/gui/windows/layouts.py +++ b/gooey/gui/windows/layouts.py @@ -1,10 +1,8 @@ - import wx from gooey.gui.windows.advanced_config import AdvancedConfigPanel from gooey.gui.windows.sidebar import Sidebar - -from gooey.gui import styling +from gooey.gui.util import styling basic_config = { 'required': [{ diff --git a/gooey/gui/windows/sidebar.py b/gooey/gui/windows/sidebar.py index 0dc85d4..c33a0f2 100644 --- a/gooey/gui/windows/sidebar.py +++ b/gooey/gui/windows/sidebar.py @@ -1,8 +1,8 @@ - import wx from wx.lib.pubsub import pub -from gooey.gui import styling +from gooey.gui.util import styling + class Sidebar(wx.Panel):