Fixed import structure

Author: milan338

FreeRGB.py

@@ -0,0 +1,20 @@
+# This file is part of FreeRGB, an app to control lighting devices.
+# Copyright (C) 2020 milan338.
+#
+# FreeRGB is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# FreeRGB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
+
+from src.__main__ import init
+
+if __name__ == "__main__":
+    init()

src/resources.qrc resources.qrc

@@ -14,7 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-# Logger
+# Logging
+has_logged = False
 logger = None
 
 # Store currently hovered button
@@ -37,7 +38,7 @@
 advanced_mode_elements = []
 
 # Import location for effect definitions
-effect_import_path = 'ui.effects.effect'
+effect_import_path = 'src.ui.effects.effect'
 
 # Refresh menus from any package (called as function)
 refreshMenus = None

src/resources_rc.py resources_rc.py

@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
-
 import logging
 
+from src import Globals
+
 from datetime import datetime
 
 from logging.handlers import RotatingFileHandler

src/Globals.py

@@ -14,9 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
+from src import Globals
 
-from rw.JsonIO import JsonIO
+from src.rw.JsonIO import JsonIO
 
 # Store settings
 advanced_mode = None

src/InitLogging.py

@@ -18,23 +18,23 @@
 
 import sys
 
-import Globals
-import Settings
+from src import Globals
+from src import Settings
 
-from InitLogging import InitLogging
+from src.InitLogging import InitLogging
 
-from rw.JsonIO import JsonIO
-from rw.QssRead import QssRead
+from src.rw.JsonIO import JsonIO
+from src.rw.QssRead import QssRead
 
-from ui import getPath
-from ui.GenerateButtons import GenerateButtons
-from ui.effects.Effects import Effects
-from ui.generators.CreateMenuContext import CreateMenuContext
-from ui.generators.CreateMenuEffectEdit import CreateMenuEffectEdit
-from ui.generators.CreateMessageBox import CreateMessageBox
-from ui.views.input.InputDialogue import InputDialogue
-from ui.views.main.Ui_MainWindow import Ui_Form
-from ui.views.monitor.SerialMonitor import SerialMonitor
+from src.ui import getPath
+from src.ui.GenerateButtons import GenerateButtons
+from src.ui.effects.Effects import Effects
+from src.ui.generators.CreateMenuContext import CreateMenuContext
+from src.ui.generators.CreateMenuEffectEdit import CreateMenuEffectEdit
+from src.ui.generators.CreateMessageBox import CreateMessageBox
+from src.ui.views.input.InputDialogue import InputDialogue
+from src.ui.views.main.Ui_MainWindow import Ui_Form
+from src.ui.views.monitor.SerialMonitor import SerialMonitor
 
 from PyQt5.QtGui import QCursor
 from PyQt5.QtWidgets import QWidget, QColorDialog, QMessageBox, QApplication
@@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs):
         # Get application version
         self.version_name = JsonIO('app_Version.json').readEntry('version')
         # Setup logging
-        InitLogging(10)
+        InitLogging(10)  # TODO only start logging once option selected, don't overwrite logs if already logged i.e. set already_logged to true once logged at all during session and prevent making new log while true (remainder of runtime)
         # Allow global access to refresh main menu using JSON
         Globals.refreshMenus = lambda: self.refreshMenus()
         # Initialise settings
@@ -197,7 +197,7 @@ def mousePressEvent(self, event):
         pass
 
 
-if __name__ == '__main__':
+def init():
     # Initialise application
     app = QApplication(sys.argv)
     # Setup main window
@@ -212,3 +212,7 @@ def mousePressEvent(self, event):
     window.show()
     # Run application and provide exit code
     sys.exit(app.exec())
+
+
+if __name__ == '__main__':
+    init()

src/Settings.py

@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
-import Settings
+from src import Globals
+from src import Settings
 
-from ui.views.licenses.LicensesView import LicensesView
+from src.ui.views.licenses.LicensesView import LicensesView
 
 import webbrowser
 

src/__init__.py

@@ -14,13 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
+from src import Globals
 
-from rw.JsonIO import JsonIO
+from src.rw.JsonIO import JsonIO
 
-from ui.views.input.InputDialogue import InputDialogue
-from ui.generators.CreateLargeButton import CreateLargeButton
-from ui.generators.CreateMessageBox import CreateMessageBox
+from src.ui.views.input.InputDialogue import InputDialogue
+from src.ui.generators.CreateLargeButton import CreateLargeButton
+from src.ui.generators.CreateMessageBox import CreateMessageBox
 
 
 class GenerateButtons():

src/__main__.py

@@ -14,11 +14,11 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
-
 from os import listdir, path
 
-from rw.JsonIO import JsonIO
+from src import Globals
+
+from src.rw.JsonIO import JsonIO
 
 
 class Effects():

src/ui/ButtonActions.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
+from src import Globals
 
 
 class SolidColour():

src/ui/GenerateButtons.py

@@ -14,13 +14,13 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
+from src import Globals
 
-from rw.JsonIO import JsonIO
+from src.rw.JsonIO import JsonIO
 
-from ui.ButtonActions import ButtonActions
-from ui.widgets.HoverButton import HoverButton
-from ui.widgets.ToggleSwitch import ToggleSwitch
+from src.ui.ButtonActions import ButtonActions
+from src.ui.widgets.HoverButton import HoverButton
+from src.ui.widgets.ToggleSwitch import ToggleSwitch
 
 from PyQt5.QtCore import Qt, QCoreApplication, QSize, QRect
 from PyQt5.QtGui import QCursor

src/ui/effects/Effects.py

@@ -14,9 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
+from src import Globals
 
-from ui.generators.CreateMenuPopup import CreateMenuPopup
+from src.ui.generators.CreateMenuPopup import CreateMenuPopup
 
 
 class CreateMenuContext(CreateMenuPopup):

src/ui/effects/effect/SolidColour.py

@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
+from src import Globals
 
-from ui.GenerateButtons import GenerateButtons
-from ui.generators.CreateMenuPopup import CreateMenuPopup
+from src.ui.GenerateButtons import GenerateButtons
+from src.ui.generators.CreateMenuPopup import CreateMenuPopup
 
 
 class CreateMenuEffectEdit(CreateMenuPopup):

src/ui/generators/CreateLargeButton.py

@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-from ui import getPath
+from src.ui import getPath
 
 from PyQt5.QtWidgets import QMenu, QAction
 

src/ui/generators/CreateMenuContext.py

@@ -14,10 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
-import Settings
+from src import Globals
+from src import Settings
 
-from rw.JsonIO import JsonIO
+from src.rw.JsonIO import JsonIO
 
 from PyQt5.QtWidgets import QMessageBox
 

src/ui/generators/CreateMenuEffectEdit.py

@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-import Globals
+from src import Globals
 
-from ui.generators.CreateMenuContext import CreateMenuContext
-from ui.views.input.Ui_InputDialogue import Ui_Form
+from src.ui.generators.CreateMenuContext import CreateMenuContext
+from src.ui.views.input.Ui_InputDialogue import Ui_Form
 
-from rw.JsonIO import JsonIO
+from src.rw.JsonIO import JsonIO
 
 from PyQt5.QtWidgets import QWidget
 from PyQt5.QtGui import QCursor

src/ui/generators/CreateMenuPopup.py

@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with FreeRGB.  If not, see <https://www.gnu.org/licenses/>.
 
-from ui import getPath
-from ui.views.licenses.Ui_LicensesView import Ui_Form
+from src.ui import getPath
+from src.ui.views.licenses.Ui_LicensesView import Ui_Form
 
 from PyQt5.QtWidgets import QWidget, QSpacerItem, QSizePolicy
 from PyQt5.QtCore import Qt
@@ -37,7 +37,7 @@ def __init__(self, *args, **kwargs):
 
     def addLicenses(self):
         # Imports done here to prevent circular imports
-        from ui.GenerateButtons import GenerateButtons
+        from src.ui.GenerateButtons import GenerateButtons
         GenerateButtons('licenses.json', 'licenses').generateGenericButtons(
             self.ui.license_button_layout, self.ui.license_scroll_region, 'primary', spacer=True)
         # Additional spacer below buttons for better separation between border and bottom button

src/ui/generators/CreateMessageBox.py

@@ -20,8 +20,8 @@
 
 from datetime import datetime
 
-from ui.widgets.ToggleSwitch import ToggleSwitch
-from ui.views.monitor.Ui_SerialMonitor import Ui_Form
+from src.ui.widgets.ToggleSwitch import ToggleSwitch
+from src.ui.views.monitor.Ui_SerialMonitor import Ui_Form
 
 from PyQt5.QtWidgets import QWidget
 from PyQt5.QtCore import Qt