diff --git a/res/ui/community_tab.ui b/res/ui/community_tab.ui
index 8cec0bb4205f3f08363bd05b952b82bce0502b20..9292edc20f3d952449c833b37626ea18dc0fd5f9 100644
--- a/res/ui/community_tab.ui
+++ b/res/ui/community_tab.ui
@@ -15,9 +15,9 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QTabWidget" name="tabs_community">
+ <widget class="QTabWidget" name="tabs_information">
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab_members">
<attribute name="title">
@@ -57,12 +57,6 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab_wot">
- <attribute name="title">
- <string>Wot</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2"/>
- </widget>
</widget>
</item>
</layout>
diff --git a/res/ui/wot_form.ui b/res/ui/wot_tab.ui
similarity index 87%
rename from res/ui/wot_form.ui
rename to res/ui/wot_tab.ui
index ff58cb34a110af213ad4e0e14a7498670a75e0fe..0a7b6565f87f3568c3e7b906fa2842d5e01f1a11 100644
--- a/res/ui/wot_form.ui
+++ b/res/ui/wot_tab.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
+ <class>WotTabWidget</class>
+ <widget class="QWidget" name="WotTabWidget">
<property name="geometry">
<rect>
<x>0</x>
@@ -35,7 +35,7 @@
</widget>
</item>
<item row="1" column="0" colspan="2">
- <widget class="View" name="graphicsView">
+ <widget class="WotView" name="graphicsView">
<property name="viewportUpdateMode">
<enum>QGraphicsView::BoundingRectViewportUpdate</enum>
</property>
@@ -45,9 +45,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>View</class>
+ <class>WotView</class>
<extends>QGraphicsView</extends>
- <header>cutecoin.wot.qt.view.h</header>
+ <header>cutecoin.gui.views.wot</header>
</customwidget>
</customwidgets>
<resources/>
@@ -55,7 +55,7 @@
<connection>
<sender>pushButtonReset</sender>
<signal>clicked()</signal>
- <receiver>Form</receiver>
+ <receiver>WotTabWidget</receiver>
<slot>reset()</slot>
<hints>
<hint type="sourcelabel">
@@ -71,7 +71,7 @@
<connection>
<sender>comboBoxSearch</sender>
<signal>currentIndexChanged(int)</signal>
- <receiver>Form</receiver>
+ <receiver>WotTabWidget</receiver>
<slot>select_node()</slot>
<hints>
<hint type="sourcelabel">
diff --git a/src/cutecoin/gui/community_tab.py b/src/cutecoin/gui/community_tab.py
index e11e6bf8c2848e5f4fdc2b02946f64535d80b334..d949881e7c8e5dddec25566d66a93b2a8e30f888 100644
--- a/src/cutecoin/gui/community_tab.py
+++ b/src/cutecoin/gui/community_tab.py
@@ -9,7 +9,7 @@ from PyQt5.QtWidgets import QWidget, QErrorMessage
from cutecoin.models.members import MembersListModel
from cutecoin.gen_resources.community_tab_uic import Ui_CommunityTabWidget
from cutecoin.gui.add_contact import AddContactDialog
-from cutecoin.wot.qt.form import Form
+from cutecoin.gui.wot_tab import WotTabWidget
class CommunityTabWidget(QWidget, Ui_CommunityTabWidget):
@@ -35,8 +35,7 @@ class CommunityTabWidget(QWidget, Ui_CommunityTabWidget):
self.button_membership.setText("Send membership demand")
self.button_membership.clicked.connect(self.send_membership_demand)
- # create wot widget
- self.verticalLayout_2.addWidget(Form(account, community))
+ self.tabs_information.addTab(WotTabWidget(account, community), "Wot")
def add_member_as_contact(self, index):
members_model = self.list_community_members.model()
diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py
index 99e5f4ff161b80a2e309026c4d13341b0f3a8333..a583b69bdb5c00dadb059ef735663a9b32e3ac5c 100644
--- a/src/cutecoin/gui/mainwindow.py
+++ b/src/cutecoin/gui/mainwindow.py
@@ -25,7 +25,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
Constructor
'''
# Set up the user interface from Designer.
- super(MainWindow, self).__init__()
+ super().__init__()
self.setupUi(self)
self.app = app
self.refresh()
diff --git a/src/cutecoin/gui/process_cfg_account.py b/src/cutecoin/gui/process_cfg_account.py
index 4331a0e1ae712b2a219a00ce3412e95005ed81a6..55f46f02c65ec0dcbe27fa8fd43ab018f62bbf35 100644
--- a/src/cutecoin/gui/process_cfg_account.py
+++ b/src/cutecoin/gui/process_cfg_account.py
@@ -131,7 +131,7 @@ class ProcessConfigureAccount(QDialog, Ui_AccountConfigurationDialog):
Constructor
'''
# Set up the user interface from Designer.
- super(ProcessConfigureAccount, self).__init__()
+ super().__init__()
self.setupUi(self)
self.account = account
self.app = app
diff --git a/src/cutecoin/gui/process_cfg_community.py b/src/cutecoin/gui/process_cfg_community.py
index c9235740068facd7c3cc239ebc16f2a4e4c6876d..1a7163cbef3c2e60300130ae08c8d93f8b586382 100644
--- a/src/cutecoin/gui/process_cfg_community.py
+++ b/src/cutecoin/gui/process_cfg_community.py
@@ -92,7 +92,7 @@ class ProcessConfigureCommunity(QDialog, Ui_CommunityConfigurationDialog):
'''
Constructor
'''
- super(ProcessConfigureCommunity, self).__init__()
+ super().__init__()
self.setupUi(self)
self.community = community
self.account = account
diff --git a/src/cutecoin/gui/transfer.py b/src/cutecoin/gui/transfer.py
index a0b33eb74b4477ba625da505c6a4af182b9b59f3..6f21e59f5f38359400f87a5d426db1a2465ac6e3 100644
--- a/src/cutecoin/gui/transfer.py
+++ b/src/cutecoin/gui/transfer.py
@@ -20,7 +20,7 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog):
'''
Constructor
'''
- super(TransferMoneyDialog, self).__init__()
+ super().__init__()
self.setupUi(self)
self.sender = sender
self.recipient_trusts = []
diff --git a/src/cutecoin/wot/qt/view.py b/src/cutecoin/gui/views/wot.py
similarity index 99%
rename from src/cutecoin/wot/qt/view.py
rename to src/cutecoin/gui/views/wot.py
index 9aa5a4e57edf866102648f6fec752bf4083e97e3..e5f64c9176376a659b9aa8a488f7937b178aaea0 100644
--- a/src/cutecoin/wot/qt/view.py
+++ b/src/cutecoin/gui/views/wot.py
@@ -14,14 +14,14 @@ ARC_STATUS_STRONG = 1
ARC_STATUS_WEAK = 2
-class View(QGraphicsView):
+class WotView(QGraphicsView):
def __init__(self, parent=None):
"""
Create View to display scene
:param parent: [Optional, default=None] Parent widget
"""
- super(View, self).__init__(parent)
+ super(WotView, self).__init__(parent)
self.setScene(Scene(self))
diff --git a/src/cutecoin/wot/qt/form.py b/src/cutecoin/gui/wot_tab.py
similarity index 95%
rename from src/cutecoin/wot/qt/form.py
rename to src/cutecoin/gui/wot_tab.py
index 67c14a4127cc79cd8015ba14caa8a7336a0dad9d..50b4a448647bbf3573d16ed138e49f86d267b6f8 100644
--- a/src/cutecoin/wot/qt/form.py
+++ b/src/cutecoin/gui/wot_tab.py
@@ -4,12 +4,12 @@ import time
import datetime
from PyQt5.QtWidgets import QWidget
-from cutecoin.gen_resources.wot_form_uic import Ui_Form
-from cutecoin.wot.qt.view import NODE_STATUS_HIGHLIGHTED, NODE_STATUS_SELECTED, ARC_STATUS_STRONG, ARC_STATUS_WEAK
+from ..gen_resources.wot_tab_uic import Ui_WotTabWidget
+from cutecoin.gui.views.wot import NODE_STATUS_HIGHLIGHTED, NODE_STATUS_SELECTED, ARC_STATUS_STRONG, ARC_STATUS_WEAK
from ucoinpy.api import bma
-class Form(QWidget, Ui_Form):
+class WotTabWidget(QWidget, Ui_WotTabWidget):
def __init__(self, account, community, parent=None):
"""
@@ -18,7 +18,7 @@ class Form(QWidget, Ui_Form):
:param parent:
:return:
"""
- super(Form, self).__init__(parent)
+ super().__init__(parent)
# construct from qtDesigner
self.setupUi(self)
diff --git a/src/cutecoin/wot/__init__.py b/src/cutecoin/wot/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/cutecoin/wot/qt/__init__.py b/src/cutecoin/wot/qt/__init__.py
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000