diff --git a/setup.py b/setup.py index c19b45b44dd84c33dff6837abf7eb3ed20da75f6..d8fe0e3b78b169ae71158c730e92e688d2d48960 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))) print(sys.path) -includes = ["sip", "re", "json", "logging", "hashlib", "os", "urllib", "ucoinpy", "requests", "cutecoin.core"] +includes = ["sip", "re", "json", "logging", "hashlib", "os", "urllib", "ucoinpy", "requests"] excludes = [] packages = ["libnacl", "pylibscrypt"] @@ -34,7 +34,7 @@ if sys.platform == "win32": file_type=".exe" target = Executable( - script = "src/cutecoin/__init__.py", + script = "src/cutecoin/main.py", targetName="cutecoin"+file_type, base = base, compress = False, diff --git a/src/cutecoin/__init__.py b/src/cutecoin/__init__.py index 573fb38922e75c5ec46ae632c9afbfb8e22a67c1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/src/cutecoin/__init__.py +++ b/src/cutecoin/__init__.py @@ -1,18 +0,0 @@ -''' -Created on 1 févr. 2014 - -@author: inso -''' -import sys -from PyQt5.QtWidgets import QApplication, QDialog -from cutecoin.gui.mainWindow import MainWindow -from cutecoin.core.app import Application - - -if __name__ == '__main__': - cutecoin = QApplication(sys.argv) - app = Application(sys.argv) - window = MainWindow(app) - window.show() - sys.exit(cutecoin.exec_()) - pass diff --git a/bin/cutecoin b/src/cutecoin/main.py similarity index 69% rename from bin/cutecoin rename to src/cutecoin/main.py index e8fa6c9da337427a4c9d4efa5c03bf256cfd6990..873445e939c9f104be1a447546a9a0440eeac766 100755 --- a/bin/cutecoin +++ b/src/cutecoin/main.py @@ -1,6 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - """ Created on 1 févr. 2014 @@ -9,8 +6,7 @@ Created on 1 févr. 2014 import signal import sys import os -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../lib'))) -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../src'))) + from PyQt5.QtWidgets import QApplication, QDialog from cutecoin.gui.mainWindow import MainWindow from cutecoin.core.app import Application