Refactored Wot tab

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>

res/ui/wot_form.ui → res/ui/wot_tab.ui

 <?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">

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()

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()

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

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

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 = []

src/cutecoin/wot/qt/view.py → 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))
 

src/cutecoin/wot/qt/form.py → 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)