From b0b5b6c79e524c4183fe50a2c919325a8d0b410f Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Sun, 7 Oct 2018 14:54:51 -0700
Subject: [PATCH] Move ShareMode and ReceiveMode into Mode module

---
 onionshare_gui/{ => mode}/receive_mode/__init__.py     | 2 +-
 onionshare_gui/{ => mode}/receive_mode/info.py         | 0
 onionshare_gui/{ => mode}/receive_mode/uploads.py      | 2 +-
 onionshare_gui/{ => mode}/share_mode/__init__.py       | 4 ++--
 onionshare_gui/{ => mode}/share_mode/downloads.py      | 0
 onionshare_gui/{ => mode}/share_mode/file_selection.py | 2 +-
 onionshare_gui/{ => mode}/share_mode/info.py           | 0
 onionshare_gui/{ => mode}/share_mode/threads.py        | 0
 onionshare_gui/onionshare_gui.py                       | 4 ++--
 setup.py                                               | 5 +++--
 10 files changed, 10 insertions(+), 9 deletions(-)
 rename onionshare_gui/{ => mode}/receive_mode/__init__.py (99%)
 rename onionshare_gui/{ => mode}/receive_mode/info.py (100%)
 rename onionshare_gui/{ => mode}/receive_mode/uploads.py (99%)
 rename onionshare_gui/{ => mode}/share_mode/__init__.py (99%)
 rename onionshare_gui/{ => mode}/share_mode/downloads.py (100%)
 rename onionshare_gui/{ => mode}/share_mode/file_selection.py (99%)
 rename onionshare_gui/{ => mode}/share_mode/info.py (100%)
 rename onionshare_gui/{ => mode}/share_mode/threads.py (100%)

diff --git a/onionshare_gui/receive_mode/__init__.py b/onionshare_gui/mode/receive_mode/__init__.py
similarity index 99%
rename from onionshare_gui/receive_mode/__init__.py
rename to onionshare_gui/mode/receive_mode/__init__.py
index 6430382b..96c76dbf 100644
--- a/onionshare_gui/receive_mode/__init__.py
+++ b/onionshare_gui/mode/receive_mode/__init__.py
@@ -24,7 +24,7 @@ from onionshare.web import Web
 
 from .uploads import Uploads
 from .info import ReceiveModeInfo
-from ..mode import Mode
+from .. import Mode
 
 class ReceiveMode(Mode):
     """
diff --git a/onionshare_gui/receive_mode/info.py b/onionshare_gui/mode/receive_mode/info.py
similarity index 100%
rename from onionshare_gui/receive_mode/info.py
rename to onionshare_gui/mode/receive_mode/info.py
diff --git a/onionshare_gui/receive_mode/uploads.py b/onionshare_gui/mode/receive_mode/uploads.py
similarity index 99%
rename from onionshare_gui/receive_mode/uploads.py
rename to onionshare_gui/mode/receive_mode/uploads.py
index f08b35cc..c445be47 100644
--- a/onionshare_gui/receive_mode/uploads.py
+++ b/onionshare_gui/mode/receive_mode/uploads.py
@@ -24,7 +24,7 @@ from datetime import datetime
 from PyQt5 import QtCore, QtWidgets, QtGui
 
 from onionshare import strings
-from ..widgets import Alert
+from ...widgets import Alert
 
 
 class File(QtWidgets.QWidget):
diff --git a/onionshare_gui/share_mode/__init__.py b/onionshare_gui/mode/share_mode/__init__.py
similarity index 99%
rename from onionshare_gui/share_mode/__init__.py
rename to onionshare_gui/mode/share_mode/__init__.py
index c44e8beb..c301037b 100644
--- a/onionshare_gui/share_mode/__init__.py
+++ b/onionshare_gui/mode/share_mode/__init__.py
@@ -29,8 +29,8 @@ from .file_selection import FileSelection
 from .downloads import Downloads
 from .threads import CompressThread
 from .info import ShareModeInfo
-from ..mode import Mode
-from ..widgets import Alert
+from .. import Mode
+from ...widgets import Alert
 
 class ShareMode(Mode):
     """
diff --git a/onionshare_gui/share_mode/downloads.py b/onionshare_gui/mode/share_mode/downloads.py
similarity index 100%
rename from onionshare_gui/share_mode/downloads.py
rename to onionshare_gui/mode/share_mode/downloads.py
diff --git a/onionshare_gui/share_mode/file_selection.py b/onionshare_gui/mode/share_mode/file_selection.py
similarity index 99%
rename from onionshare_gui/share_mode/file_selection.py
rename to onionshare_gui/mode/share_mode/file_selection.py
index 628ad5ef..d59df234 100644
--- a/onionshare_gui/share_mode/file_selection.py
+++ b/onionshare_gui/mode/share_mode/file_selection.py
@@ -22,7 +22,7 @@ from PyQt5 import QtCore, QtWidgets, QtGui
 
 from onionshare import strings
 
-from ..widgets import Alert, AddFileDialog
+from ...widgets import Alert, AddFileDialog
 
 class DropHereLabel(QtWidgets.QLabel):
     """
diff --git a/onionshare_gui/share_mode/info.py b/onionshare_gui/mode/share_mode/info.py
similarity index 100%
rename from onionshare_gui/share_mode/info.py
rename to onionshare_gui/mode/share_mode/info.py
diff --git a/onionshare_gui/share_mode/threads.py b/onionshare_gui/mode/share_mode/threads.py
similarity index 100%
rename from onionshare_gui/share_mode/threads.py
rename to onionshare_gui/mode/share_mode/threads.py
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index ced53ede..6a7eb63a 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -23,8 +23,8 @@ from PyQt5 import QtCore, QtWidgets, QtGui
 from onionshare import strings
 from onionshare.web import Web
 
-from .share_mode import ShareMode
-from .receive_mode import ReceiveMode
+from .mode.share_mode import ShareMode
+from .mode.receive_mode import ReceiveMode
 
 from .tor_connection_dialog import TorConnectionDialog
 from .settings_dialog import SettingsDialog
diff --git a/setup.py b/setup.py
index 94213f7c..86b71f82 100644
--- a/setup.py
+++ b/setup.py
@@ -69,8 +69,9 @@ setup(
         'onionshare',
         'onionshare.web',
         'onionshare_gui',
-        'onionshare_gui.share_mode',
-        'onionshare_gui.receive_mode'
+        'onionshare_gui.mode',
+        'onionshare_gui.mode.share_mode',
+        'onionshare_gui.mode.receive_mode'
     ],
     include_package_data=True,
     scripts=['install/scripts/onionshare', 'install/scripts/onionshare-gui'],