diff --git a/src/cutecoin/gui/certification.py b/src/cutecoin/gui/certification.py index 1e904d94a0d87f2d2ae818d8beaf2c18b3597865..79551a91bf36eb26a88a2d6495f2d6177ebdbe19 100644 --- a/src/cutecoin/gui/certification.py +++ b/src/cutecoin/gui/certification.py @@ -3,15 +3,18 @@ Created on 24 dec. 2014 @author: inso """ -from PyQt5.QtWidgets import QDialog, QMessageBox, QDialogButtonBox, QApplication -from PyQt5.QtCore import Qt, pyqtSlot +import asyncio +import logging + +from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QApplication + +from PyQt5.QtCore import Qt + from ..gen_resources.certification_uic import Ui_CertificationDialog -from . import toast -from .dialogs import QAsyncMessageBox +from cutecoin.gui.widgets import toast +from cutecoin.gui.widgets.dialogs import QAsyncMessageBox from ..tools.decorators import asyncify from ..tools.exceptions import NoPeerAvailable -import asyncio -import logging class CertificationDialog(QDialog, Ui_CertificationDialog): diff --git a/src/cutecoin/gui/community_tile.py b/src/cutecoin/gui/community_tile.py index 7a382388a72a0655127bd9807e42b148a232fb36..473c453a2d442fd262115a167f11c11f5a1f924d 100644 --- a/src/cutecoin/gui/community_tile.py +++ b/src/cutecoin/gui/community_tile.py @@ -2,15 +2,16 @@ @author: inso """ -from PyQt5.QtWidgets import QFrame, QLabel, QVBoxLayout, QLayout, QPushButton -from PyQt5.QtGui import QPalette -from PyQt5.QtCore import QEvent, QSize, pyqtSignal -from ..tools.decorators import asyncify -from ..tools.exceptions import NoPeerAvailable import asyncio import enum + +from PyQt5.QtWidgets import QFrame, QLabel, QVBoxLayout, QLayout +from PyQt5.QtCore import QSize, pyqtSignal from ucoinpy.documents.block import Block -from .busy import Busy + +from ..tools.decorators import asyncify +from ..tools.exceptions import NoPeerAvailable +from cutecoin.gui.widgets.busy import Busy @enum.unique diff --git a/src/cutecoin/gui/community_view.py b/src/cutecoin/gui/community_view.py index 52aeb7994847f676723dd594d9126470e6928b8b..1fc083dace7ba6ace2e0cbe258c6951b024899f8 100644 --- a/src/cutecoin/gui/community_view.py +++ b/src/cutecoin/gui/community_view.py @@ -4,21 +4,21 @@ Created on 2 févr. 2014 @author: inso """ -import time import logging +import asyncio + from PyQt5.QtWidgets import QWidget, QMessageBox, QDialog, QPushButton, QTabBar, QAction from PyQt5.QtCore import pyqtSlot, QDateTime, QLocale, QEvent + from PyQt5.QtGui import QIcon -from ..core.net.api import bma as bma from .wot_tab import WotTabWidget from .identities_tab import IdentitiesTabWidget from .transactions_tab import TransactionsTabWidget from .network_tab import NetworkTabWidget from .informations_tab import InformationsTabWidget -from .dialogs import QAsyncMessageBox -from . import toast -import asyncio +from cutecoin.gui.widgets.dialogs import QAsyncMessageBox +from cutecoin.gui.widgets import toast from ..tools.exceptions import MembershipNotFoundError, LookupFailureError, NoPeerAvailable from ..tools.decorators import asyncify, once_at_a_time, cancel_once_task from ..gen_resources.community_view_uic import Ui_CommunityWidget diff --git a/src/cutecoin/gui/identities_tab.py b/src/cutecoin/gui/identities_tab.py index 7ad87101d0c8f6efa66c56fab0127f2a27b2354c..a32b669279f40919a97eaf357c7569a7dc3ac720 100644 --- a/src/cutecoin/gui/identities_tab.py +++ b/src/cutecoin/gui/identities_tab.py @@ -4,20 +4,21 @@ Created on 2 févr. 2014 @author: inso """ -import logging +import asyncio + from PyQt5.QtCore import Qt, pyqtSignal, QEvent -from PyQt5.QtGui import QIcon, QCursor -from PyQt5.QtWidgets import QWidget, QMessageBox, QAction, QMenu, QDialog, \ +from PyQt5.QtGui import QCursor +from PyQt5.QtWidgets import QWidget, QAction, QMenu, QDialog, \ QAbstractItemView +from ucoinpy.api import bma + from ..models.identities import IdentitiesFilterProxyModel, IdentitiesTableModel from ..gen_resources.identities_tab_uic import Ui_IdentitiesTab from .contact import ConfigureContactDialog from .member import MemberDialog from .transfer import TransferMoneyDialog -from .busy import Busy +from cutecoin.gui.widgets.busy import Busy from .certification import CertificationDialog -import asyncio -from ucoinpy.api import bma from ..core.registry import Identity from ..tools.exceptions import NoPeerAvailable from ..tools.decorators import asyncify, once_at_a_time, cancel_once_task diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py index a9e704aad86039c39027124826f394cc3f66f0cd..b8a3f02e901fb7c9fa9107d9ea755b67ec99d0ae 100644 --- a/src/cutecoin/gui/mainwindow.py +++ b/src/cutecoin/gui/mainwindow.py @@ -3,15 +3,16 @@ Created on 1 févr. 2014 @author: inso """ -from ..gen_resources.mainwindow_uic import Ui_MainWindow -from ..gen_resources.about_uic import Ui_AboutPopup +import asyncio +import logging -from PyQt5.QtWidgets import QMainWindow, QAction, QFileDialog, QProgressBar, \ - QMessageBox, QLabel, QComboBox, QDialog, QApplication -from PyQt5.QtCore import QSignalMapper, pyqtSlot, QLocale, QEvent, \ - pyqtSlot, pyqtSignal, QDate, QDateTime, QTimer, QUrl, Qt, QCoreApplication -from PyQt5.QtGui import QIcon, QDesktopServices +from PyQt5.QtWidgets import QMainWindow, QAction, QFileDialog, QMessageBox, QLabel, QComboBox, QDialog, QApplication +from PyQt5.QtCore import QLocale, QEvent, \ + pyqtSlot, QDateTime, QTimer, Qt +from PyQt5.QtGui import QIcon +from ..gen_resources.mainwindow_uic import Ui_MainWindow +from ..gen_resources.about_uic import Ui_AboutPopup from .process_cfg_account import ProcessConfigureAccount from .transfer import TransferMoneyDialog from .community_view import CommunityWidget @@ -26,10 +27,7 @@ from ..core import money from ..core.community import Community from ..tools.decorators import asyncify from ..__init__ import __version__ -from . import toast - -import asyncio -import logging +from cutecoin.gui.widgets import toast class MainWindow(QMainWindow, Ui_MainWindow): diff --git a/src/cutecoin/gui/preferences.py b/src/cutecoin/gui/preferences.py index 87705f3f7c9a1e613a75edc88b2a03a9821c8ee8..3b099d4659cd6f00af67dc2eb96f3da7bf6e5b0e 100644 --- a/src/cutecoin/gui/preferences.py +++ b/src/cutecoin/gui/preferences.py @@ -5,14 +5,10 @@ Created on 11 mai 2015 """ from PyQt5.QtCore import QCoreApplication - -from ..core import money -from . import toast from PyQt5.QtWidgets import QDialog -from PyQt5.QtGui import QIcon +from ..core import money from ..gen_resources.preferences_uic import Ui_PreferencesDialog -import icons_rc class PreferencesDialog(QDialog, Ui_PreferencesDialog): diff --git a/src/cutecoin/gui/process_cfg_community.py b/src/cutecoin/gui/process_cfg_community.py index ff22ff4a1bdc9ac4cd1c90f869a745621b3583bf..98836443110a9dc40b3257fbd5d1a018b26c49da 100644 --- a/src/cutecoin/gui/process_cfg_community.py +++ b/src/cutecoin/gui/process_cfg_community.py @@ -14,10 +14,8 @@ from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject from ..gen_resources.community_cfg_uic import Ui_CommunityConfigurationDialog from ..models.peering import PeeringTreeModel from ..core import Community -from ..core.registry.identity import BlockchainState from ..core.net import Node -from ..tools.decorators import asyncify -from . import toast +from cutecoin.gui.widgets import toast class Step(QObject): diff --git a/src/cutecoin/gui/transactions_tab.py b/src/cutecoin/gui/transactions_tab.py index 3fac8946fcfa9a75233e667857da5d685fd6ad1e..0dcc94a808c389d96dba2ff701d8d0ab82085ccd 100644 --- a/src/cutecoin/gui/transactions_tab.py +++ b/src/cutecoin/gui/transactions_tab.py @@ -1,24 +1,25 @@ +import logging +import asyncio + from PyQt5.QtWidgets import QWidget, QAbstractItemView, QHeaderView, QDialog, \ QMenu, QAction, QApplication, QMessageBox from PyQt5.QtCore import Qt, QDateTime, QTime, QModelIndex, pyqtSignal, pyqtSlot, QEvent + from PyQt5.QtGui import QCursor + from ..gen_resources.transactions_tab_uic import Ui_transactionsTabWidget from ..models.txhistory import HistoryTableModel, TxFilterProxyModel from ..core.transfer import Transfer from .contact import ConfigureContactDialog from .member import MemberDialog -from .transfer import TransferMoneyDialog from .certification import CertificationDialog from ..core.wallet import Wallet from ..core.registry import Identity from ..tools.exceptions import NoPeerAvailable from ..tools.decorators import asyncify, once_at_a_time, cancel_once_task from .transfer import TransferMoneyDialog -from . import toast -from .busy import Busy - -import logging -import asyncio +from cutecoin.gui.widgets import toast +from cutecoin.gui.widgets.busy import Busy class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget): diff --git a/src/cutecoin/gui/transfer.py b/src/cutecoin/gui/transfer.py index b7eebf07767122e941636d695baf34241cbd4698..e6819758fd9e3436ee4e34823ec0a28b9be7a98c 100644 --- a/src/cutecoin/gui/transfer.py +++ b/src/cutecoin/gui/transfer.py @@ -3,15 +3,17 @@ Created on 2 févr. 2014 @author: inso """ +import asyncio + from PyQt5.QtWidgets import QDialog, QApplication -from PyQt5.QtCore import QRegExp, Qt, QLocale, pyqtSlot +from PyQt5.QtCore import QRegExp, Qt + from PyQt5.QtGui import QRegExpValidator from ..gen_resources.transfer_uic import Ui_TransferMoneyDialog -from . import toast -from .dialogs import QAsyncMessageBox, QMessageBox +from cutecoin.gui.widgets import toast +from cutecoin.gui.widgets.dialogs import QAsyncMessageBox, QMessageBox from ..tools.decorators import asyncify -import asyncio class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog): diff --git a/src/cutecoin/gui/widgets/__init__.py b/src/cutecoin/gui/widgets/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..39ab2a0b56350baad834cb7fb0cfecb8223e1fcd --- /dev/null +++ b/src/cutecoin/gui/widgets/__init__.py @@ -0,0 +1 @@ +__author__ = 'inso' diff --git a/src/cutecoin/gui/busy.py b/src/cutecoin/gui/widgets/busy.py similarity index 100% rename from src/cutecoin/gui/busy.py rename to src/cutecoin/gui/widgets/busy.py diff --git a/src/cutecoin/gui/dialogs.py b/src/cutecoin/gui/widgets/dialogs.py similarity index 100% rename from src/cutecoin/gui/dialogs.py rename to src/cutecoin/gui/widgets/dialogs.py diff --git a/src/cutecoin/gui/toast.py b/src/cutecoin/gui/widgets/toast.py similarity index 97% rename from src/cutecoin/gui/toast.py rename to src/cutecoin/gui/widgets/toast.py index 505e4a9eb332e3afce17096919bab4f0cdf8590f..f5ea31f571b05f7ab9a64309184fd88b2802de69 100644 --- a/src/cutecoin/gui/toast.py +++ b/src/cutecoin/gui/widgets/toast.py @@ -8,7 +8,7 @@ import logging from PyQt5.QtCore import Qt, QThread from PyQt5.QtWidgets import QMainWindow, QApplication from PyQt5.QtGui import QImage, QPixmap -from ..gen_resources.toast_uic import Ui_Toast +from cutecoin.gen_resources.toast_uic import Ui_Toast window = None # global diff --git a/src/cutecoin/gui/wot_tab.py b/src/cutecoin/gui/wot_tab.py index d01f74ac543be831d259d1050be5b02a5a6bb51e..af49378eebb4b1ad0a31beec113b151ef28a620c 100644 --- a/src/cutecoin/gui/wot_tab.py +++ b/src/cutecoin/gui/wot_tab.py @@ -2,12 +2,13 @@ import logging import asyncio + from PyQt5.QtWidgets import QWidget, QComboBox, QDialog from PyQt5.QtCore import pyqtSlot, QEvent, QLocale, QDateTime, pyqtSignal +from ucoinpy.api import bma from ..tools.exceptions import MembershipNotFoundError from ..tools.decorators import asyncify, once_at_a_time, cancel_once_task -from ucoinpy.api import bma from ..core.graph import Graph from ..core.registry import BlockchainState from .member import MemberDialog @@ -15,9 +16,8 @@ from .certification import CertificationDialog from .transfer import TransferMoneyDialog from .contact import ConfigureContactDialog from ..gen_resources.wot_tab_uic import Ui_WotTabWidget -from cutecoin.gui.views.wot import NODE_STATUS_HIGHLIGHTED, NODE_STATUS_SELECTED, NODE_STATUS_OUT, ARC_STATUS_STRONG, \ - ARC_STATUS_WEAK -from .busy import Busy +from cutecoin.gui.views.wot import NODE_STATUS_HIGHLIGHTED, NODE_STATUS_SELECTED, NODE_STATUS_OUT +from cutecoin.gui.widgets.busy import Busy class WotTabWidget(QWidget, Ui_WotTabWidget):