From bd3f6d39e79740cbda87763da96da4b9e3a7b8c1 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 1 Jun 2020 23:30:58 +0200 Subject: [PATCH] Moved dochighlight up one level --- nw/gui/__init__.py | 2 -- nw/gui/{tools => }/dochighlight.py | 0 nw/gui/elements/doceditor.py | 2 +- nw/gui/tools/__init__.py | 7 ------- 4 files changed, 1 insertion(+), 10 deletions(-) rename nw/gui/{tools => }/dochighlight.py (100%) delete mode 100644 nw/gui/tools/__init__.py diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py index 06c862eb..b417ac6b 100644 --- a/nw/gui/__init__.py +++ b/nw/gui/__init__.py @@ -29,7 +29,6 @@ from nw.gui.elements.searchbar import GuiSearchBar from nw.gui.elements.viewdetails import GuiDocViewDetails # Tools -from nw.gui.tools.dochighlight import GuiDocHighlighter __all__ = [ "GuiBuildNovel", @@ -54,5 +53,4 @@ __all__ = [ "GuiProjectOutline", "GuiSearchBar", "GuiDocViewDetails", - "GuiDocHighlighter", ] diff --git a/nw/gui/tools/dochighlight.py b/nw/gui/dochighlight.py similarity index 100% rename from nw/gui/tools/dochighlight.py rename to nw/gui/dochighlight.py diff --git a/nw/gui/elements/doceditor.py b/nw/gui/elements/doceditor.py index 9d9f7fa2..3a03369d 100644 --- a/nw/gui/elements/doceditor.py +++ b/nw/gui/elements/doceditor.py @@ -41,7 +41,7 @@ from PyQt5.QtGui import ( ) from nw.core import NWDoc -from nw.gui.tools import GuiDocHighlighter +from nw.gui.dochighlight import GuiDocHighlighter from nw.gui.elements.doctitlebar import GuiDocTitleBar from nw.core import NWSpellSimple, countWords from nw.constants import nwUnicode, nwDocAction diff --git a/nw/gui/tools/__init__.py b/nw/gui/tools/__init__.py deleted file mode 100644 index e064e251..00000000 --- a/nw/gui/tools/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# -*- coding: utf-8 -*- - -from nw.gui.tools.dochighlight import GuiDocHighlighter - -__all__ = [ - "GuiDocHighlighter", -]