Move ShareMode and ReceiveMode into Mode module

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):
     """

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):

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):
     """

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):
     """

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

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'],