aboutsummaryrefslogtreecommitdiff
path: root/src/main.py
diff options
context:
space:
mode:
authorBrianna2017-09-02 09:49:35 -0400
committerGitHub2017-09-02 09:49:35 -0400
commit22978a0635e906f8ebfa1de81cdc38fd96aad756 (patch)
tree2dc5e033a4073d433aaa824113467032d35ca3c1 /src/main.py
parent39d6a4e5af94a8aa612a009bbe235715b84e7abc (diff)
parent8411857030d92e448d5c64682f396e677161afbe (diff)
Undo feature
Diffstat (limited to 'src/main.py')
-rw-r--r--src/main.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main.py b/src/main.py
index 3a6fbe7..f767de1 100644
--- a/src/main.py
+++ b/src/main.py
@@ -6,7 +6,7 @@ import logging
from __init__ import wd
-log = logging.getLogger('AVP.Entrypoint')
+log = logging.getLogger('AVP.Main')
def main():
@@ -35,11 +35,9 @@ def main():
log.debug("Finished creating command object")
elif mode == 'GUI':
- from mainwindow import MainWindow
- import atexit
- import signal
+ from gui.mainwindow import MainWindow
- window = uic.loadUi(os.path.join(wd, "mainwindow.ui"))
+ window = uic.loadUi(os.path.join(wd, "gui", "mainwindow.ui"))
# window.adjustSize()
desc = QtWidgets.QDesktopWidget()
dpi = desc.physicalDpiX()
@@ -56,9 +54,6 @@ def main():
log.debug("Finished creating main window")
window.raise_()
- signal.signal(signal.SIGINT, main.cleanUp)
- atexit.register(main.cleanUp)
-
sys.exit(app.exec_())
if __name__ == "__main__":