From ebbbc39093a2ad96c85b3d1616fee2c6499582ed Mon Sep 17 00:00:00 2001 From: Inso <insomniak.fr@gmail.com> Date: Tue, 23 Dec 2014 22:57:20 +0100 Subject: [PATCH] Revert "Cutecoin 0.5 arrives !" This reverts commit 2617284d419af62e5a2b91b643bc1bd327447f6a. --- src/cutecoin/main.py => bin/cutecoin | 6 +++++- setup.py | 4 ++-- src/cutecoin/__init__.py | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) rename src/cutecoin/main.py => bin/cutecoin (69%) diff --git a/src/cutecoin/main.py b/bin/cutecoin similarity index 69% rename from src/cutecoin/main.py rename to bin/cutecoin index 873445e9..e8fa6c9d 100755 --- a/src/cutecoin/main.py +++ b/bin/cutecoin @@ -1,3 +1,6 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + """ Created on 1 févr. 2014 @@ -6,7 +9,8 @@ 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 diff --git a/setup.py b/setup.py index d8fe0e3b..c19b45b4 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"] +includes = ["sip", "re", "json", "logging", "hashlib", "os", "urllib", "ucoinpy", "requests", "cutecoin.core"] excludes = [] packages = ["libnacl", "pylibscrypt"] @@ -34,7 +34,7 @@ if sys.platform == "win32": file_type=".exe" target = Executable( - script = "src/cutecoin/main.py", + script = "src/cutecoin/__init__.py", targetName="cutecoin"+file_type, base = base, compress = False, diff --git a/src/cutecoin/__init__.py b/src/cutecoin/__init__.py index e69de29b..573fb389 100644 --- a/src/cutecoin/__init__.py +++ b/src/cutecoin/__init__.py @@ -0,0 +1,18 @@ +''' +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 -- GitLab