diff --git a/src/sakia/gui/graphs/graph_tab.py b/src/sakia/gui/graphs/graph_tab.py index 4bb7e4547445ff50132df7a29fb5cb66e11c946d..b3bd4fa1bbb55293808e5126d2bb0857fb4d5ec1 100644 --- a/src/sakia/gui/graphs/graph_tab.py +++ b/src/sakia/gui/graphs/graph_tab.py @@ -5,7 +5,7 @@ from PyQt5.QtGui import QCursor from ...tools.exceptions import MembershipNotFoundError from ...tools.decorators import asyncify, once_at_a_time from ...core.registry import BlockchainState -from ..widgets import ContextMenu +from ..widgets.context_menu import ContextMenu class GraphTabWidget(QObject): diff --git a/src/sakia/gui/identities_tab.py b/src/sakia/gui/identities_tab.py index 2a6234665760ba1c9cf8cb231826fffd0d3c6e30..36bca853aaa4d98404e381f765da90692b3fe8e4 100644 --- a/src/sakia/gui/identities_tab.py +++ b/src/sakia/gui/identities_tab.py @@ -14,11 +14,10 @@ from ucoinpy.api import bma from ..models.identities import IdentitiesFilterProxyModel, IdentitiesTableModel from ..gen_resources.identities_tab_uic import Ui_IdentitiesTab -from sakia.gui.widgets.busy import Busy from ..core.registry import Identity, BlockchainState from ..tools.exceptions import NoPeerAvailable from ..tools.decorators import asyncify, once_at_a_time, cancel_once_task -from .widgets import ContextMenu +from .widgets.context_menu import ContextMenu class IdentitiesTabWidget(QObject): diff --git a/src/sakia/gui/transactions_tab.py b/src/sakia/gui/transactions_tab.py index cd70abe59eeda83e917507d276f3927a11479f61..bf2f6e658feff39d80d70fe36518f080a9250cd8 100644 --- a/src/sakia/gui/transactions_tab.py +++ b/src/sakia/gui/transactions_tab.py @@ -9,7 +9,7 @@ from ..gen_resources.transactions_tab_uic import Ui_transactionsTabWidget from ..models.txhistory import HistoryTableModel, TxFilterProxyModel from ..tools.exceptions import NoPeerAvailable from ..tools.decorators import asyncify, once_at_a_time, cancel_once_task -from .widgets import ContextMenu +from .widgets.context_menu import ContextMenu from sakia.gui.widgets import toast diff --git a/src/sakia/gui/views/wot.py b/src/sakia/gui/views/wot.py index b8ed76f58844a68d0a1aaf5226a893f00b2c970c..056962d84469f4000daec002861fac40f9066ad9 100644 --- a/src/sakia/gui/views/wot.py +++ b/src/sakia/gui/views/wot.py @@ -1,9 +1,7 @@ -import networkx -from PyQt5.QtCore import Qt, QPoint, pyqtSignal +from PyQt5.QtCore import Qt from PyQt5.QtGui import QPainter, QWheelEvent -from PyQt5.QtWidgets import QGraphicsView, QGraphicsSceneContextMenuEvent +from PyQt5.QtWidgets import QGraphicsView from .scenes import WotScene -from ..widgets import ContextMenu class WotView(QGraphicsView): diff --git a/src/sakia/gui/widgets/__init__.py b/src/sakia/gui/widgets/__init__.py index a61deb8fec7751b13c975a9a02b2078e02e1d6d2..fbaafe7931df3a52784e976da05ea0f1153b7f59 100644 --- a/src/sakia/gui/widgets/__init__.py +++ b/src/sakia/gui/widgets/__init__.py @@ -1,3 +1,2 @@ from .busy import Busy -from .dialogs import QAsyncMessageBox -from .context_menu import ContextMenu \ No newline at end of file +from .dialogs import QAsyncMessageBox \ No newline at end of file diff --git a/src/sakia/tests/functional/certification/test_certification.py b/src/sakia/tests/functional/certification/test_certification.py index 322cb71c2a78d131391c70e765f9f7df9fc0d510..3e417815ce8b97a136a5709675c84efa7bdc1913 100644 --- a/src/sakia/tests/functional/certification/test_certification.py +++ b/src/sakia/tests/functional/certification/test_certification.py @@ -18,7 +18,6 @@ from sakia.core import Account, Community, Wallet from sakia.core.net import Network, Node from sakia.core.net.api.bma.access import BmaAccess from sakia.tests import QuamashTest -from ucoinpy.api import bma class TestCertificationDialog(unittest.TestCase, QuamashTest): diff --git a/src/sakia/tests/functional/identities_tab/test_identities_table.py b/src/sakia/tests/functional/identities_tab/test_identities_table.py index 72be5f0dfb13e0b9c8166b063d4ba2c57fdd293c..71c5da4cad2e478cbc0c92cdd3c7d9c905408136 100644 --- a/src/sakia/tests/functional/identities_tab/test_identities_table.py +++ b/src/sakia/tests/functional/identities_tab/test_identities_table.py @@ -62,12 +62,12 @@ class TestIdentitiesTable(unittest.TestCase, QuamashTest): future = asyncio.Future() def open_widget(): - identities_tab.show() + identities_tab.widget.show() return future def close_dialog(): - if identities_tab.isVisible(): - identities_tab.close() + if identities_tab.widget.isVisible(): + identities_tab.widget.close() future.set_result(True) async def exec_test():