diff --git a/src/shellfm/windows/Window.py b/src/shellfm/windows/Window.py index 089dc66..5284e08 100644 --- a/src/shellfm/windows/Window.py +++ b/src/shellfm/windows/Window.py @@ -1,4 +1,4 @@ -from .import View +from .view import View class Window: diff --git a/src/shellfm/windows/__init__.py b/src/shellfm/windows/__init__.py index 4d45198..cd9f6ce 100644 --- a/src/shellfm/windows/__init__.py +++ b/src/shellfm/windows/__init__.py @@ -1,6 +1,2 @@ -from .Settings import Settings -from .Launcher import Launcher -from .Path import Path -from .View import View from .Window import Window from .WindowController import WindowController diff --git a/src/shellfm/windows/Path.py b/src/shellfm/windows/view/Path.py similarity index 100% rename from src/shellfm/windows/Path.py rename to src/shellfm/windows/view/Path.py diff --git a/src/shellfm/windows/View.py b/src/shellfm/windows/view/View.py similarity index 98% rename from src/shellfm/windows/View.py rename to src/shellfm/windows/view/View.py index 9ed9b7d..72ffd61 100644 --- a/src/shellfm/windows/View.py +++ b/src/shellfm/windows/view/View.py @@ -9,8 +9,8 @@ from os.path import isdir, isfile, join # Application imports -from . import Path, Settings, Launcher - +from .utils import Settings, Launcher +from . import Path class View(Settings, Launcher, Path): def __init__(self): diff --git a/src/shellfm/windows/view/__init__.py b/src/shellfm/windows/view/__init__.py new file mode 100644 index 0000000..da63bd2 --- /dev/null +++ b/src/shellfm/windows/view/__init__.py @@ -0,0 +1,4 @@ +from .utils import * + +from .Path import Path +from .View import View diff --git a/src/shellfm/windows/Launcher.py b/src/shellfm/windows/view/utils/Launcher.py similarity index 100% rename from src/shellfm/windows/Launcher.py rename to src/shellfm/windows/view/utils/Launcher.py diff --git a/src/shellfm/windows/Settings.py b/src/shellfm/windows/view/utils/Settings.py similarity index 100% rename from src/shellfm/windows/Settings.py rename to src/shellfm/windows/view/utils/Settings.py diff --git a/src/shellfm/windows/view/utils/__init__.py b/src/shellfm/windows/view/utils/__init__.py new file mode 100644 index 0000000..3c05646 --- /dev/null +++ b/src/shellfm/windows/view/utils/__init__.py @@ -0,0 +1,2 @@ +from .Settings import Settings +from .Launcher import Launcher