From e6057e256d3db084dc7be6e023eaaecd56713770 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 13 Aug 2019 11:10:53 +1000
Subject: [PATCH] Merge tuhigui into tuhi.gui

Let's make this a submodule of tuhi so we can share some code.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 meson.build                                 | 7 ++-----
 tuhi-gui.in                                 | 2 +-
 {tuhigui => tuhi/gui}/README.md             | 0
 {tuhigui => tuhi/gui}/__init__.py           | 0
 {tuhigui => tuhi/gui}/application.py        | 0
 {tuhigui => tuhi/gui}/config.py             | 0
 {tuhigui => tuhi/gui}/drawing.py            | 0
 {tuhigui => tuhi/gui}/drawingperspective.py | 0
 {tuhigui => tuhi/gui}/svg.py                | 0
 {tuhigui => tuhi/gui}/tuhi.py               | 0
 {tuhigui => tuhi/gui}/window.py             | 0
 11 files changed, 3 insertions(+), 6 deletions(-)
 rename {tuhigui => tuhi/gui}/README.md (100%)
 rename {tuhigui => tuhi/gui}/__init__.py (100%)
 rename {tuhigui => tuhi/gui}/application.py (100%)
 rename {tuhigui => tuhi/gui}/config.py (100%)
 rename {tuhigui => tuhi/gui}/drawing.py (100%)
 rename {tuhigui => tuhi/gui}/drawingperspective.py (100%)
 rename {tuhigui => tuhi/gui}/svg.py (100%)
 rename {tuhigui => tuhi/gui}/tuhi.py (100%)
 rename {tuhigui => tuhi/gui}/window.py (100%)

diff --git a/meson.build b/meson.build
index 0b2c278..71c3712 100644
--- a/meson.build
+++ b/meson.build
@@ -30,9 +30,6 @@ subdir('data')
 pymod = import('python')
 py3 = pymod.find_installation()
 python_dir = py3.get_install_dir()
-install_subdir('tuhigui',
-               install_dir: python_dir,
-               exclude_directories: ['__pycache__'])
 install_subdir('tuhi',
                install_dir: python_dir,
                exclude_directories: '__pycache__')
@@ -126,8 +123,8 @@ flake8 = find_program('flake8-3', required: false)
 if flake8.found()
    test('flake8', flake8,
         args: ['--ignore=E501,W504',
-               join_paths(meson.source_root(), 'tuhigui/'),
-               join_paths(meson.source_root(), 'tuhi/')])
+               join_paths(meson.source_root(), 'tuhi'),
+               join_paths(meson.source_root(), 'tuhi', 'gui')])
    # the tests need different flake exclusions
    test('flake8-tests', flake8,
         args: ['--ignore=E501,W504,F403,F405',
diff --git a/tuhi-gui.in b/tuhi-gui.in
index 7847e1e..9f2e882 100755
--- a/tuhi-gui.in
+++ b/tuhi-gui.in
@@ -60,7 +60,7 @@ if __name__ == "__main__":
     import gettext
     import locale
     import signal
-    from tuhigui.application import Application
+    from tuhi.gui.application import Application
 
     install_excepthook()
     gtk_style()
diff --git a/tuhigui/README.md b/tuhi/gui/README.md
similarity index 100%
rename from tuhigui/README.md
rename to tuhi/gui/README.md
diff --git a/tuhigui/__init__.py b/tuhi/gui/__init__.py
similarity index 100%
rename from tuhigui/__init__.py
rename to tuhi/gui/__init__.py
diff --git a/tuhigui/application.py b/tuhi/gui/application.py
similarity index 100%
rename from tuhigui/application.py
rename to tuhi/gui/application.py
diff --git a/tuhigui/config.py b/tuhi/gui/config.py
similarity index 100%
rename from tuhigui/config.py
rename to tuhi/gui/config.py
diff --git a/tuhigui/drawing.py b/tuhi/gui/drawing.py
similarity index 100%
rename from tuhigui/drawing.py
rename to tuhi/gui/drawing.py
diff --git a/tuhigui/drawingperspective.py b/tuhi/gui/drawingperspective.py
similarity index 100%
rename from tuhigui/drawingperspective.py
rename to tuhi/gui/drawingperspective.py
diff --git a/tuhigui/svg.py b/tuhi/gui/svg.py
similarity index 100%
rename from tuhigui/svg.py
rename to tuhi/gui/svg.py
diff --git a/tuhigui/tuhi.py b/tuhi/gui/tuhi.py
similarity index 100%
rename from tuhigui/tuhi.py
rename to tuhi/gui/tuhi.py
diff --git a/tuhigui/window.py b/tuhi/gui/window.py
similarity index 100%
rename from tuhigui/window.py
rename to tuhi/gui/window.py