Merge branch 'dev' into dev

res/test_plugin/plugin/__init__.py

-from PyQt5.QtWidgets import QMessageBox
-
-
-def display_messagebox():
-    QMessageBox.about(None, "About", "Sakia")
\ No newline at end of file

src/sakia/gui/main_window/toolbar/view.py

@@ -6,7 +6,7 @@ from .toolbar_uic import Ui_SakiaToolbar
 from .about_uic import Ui_AboutPopup
 from .about_money_uic import Ui_AboutMoney
 from .about_wot_uic import Ui_AboutWot
-from sakia.helpers import timestamp_to_dhms
+from sakia.helpers import timestamp_to_dhms, dpi_ratio
 
 
 class ToolbarView(QFrame, Ui_SakiaToolbar):
@@ -34,23 +34,38 @@ class ToolbarView(QFrame, Ui_SakiaToolbar):
         self.action_plugins = QAction(self.tr("Plugins manager"), tool_menu)
         tool_menu.addAction(self.action_plugins)
 
-        self.action_about_money = QAction(self.tr("About Money"), tool_menu)
-        tool_menu.addAction(self.action_about_money)
+        tool_menu.addSeparator()
 
-        self.action_about_referentials = QAction(self.tr("About Referentials"), tool_menu)
-        tool_menu.addAction(self.action_about_referentials)
+        about_menu = QMenu(self.tr("About"), tool_menu)
+        tool_menu.addMenu(about_menu)
 
-        self.action_about_wot = QAction(self.tr("About Web of Trust"), tool_menu)
-        tool_menu.addAction(self.action_about_wot)
+        self.action_about_money = QAction(self.tr("About Money"), about_menu)
+        about_menu.addAction(self.action_about_money)
 
-        self.action_about = QAction(self.tr("About Sakia"), tool_menu)
-        tool_menu.addAction(self.action_about)
+        self.action_about_referentials = QAction(self.tr("About Referentials"), about_menu)
+        about_menu.addAction(self.action_about_referentials)
+
+        self.action_about_wot = QAction(self.tr("About Web of Trust"), about_menu)
+        about_menu.addAction(self.action_about_wot)
+
+        self.action_about = QAction(self.tr("About Sakia"), about_menu)
+        about_menu.addAction(self.action_about)
 
         self.action_exit = QAction(self.tr("Exit"), tool_menu)
         tool_menu.addAction(self.action_exit)
 
         self.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Minimum)
         self.setMaximumHeight(60)
+        self.button_network.setIconSize(self.button_network.iconSize()*dpi_ratio())
+        self.button_contacts.setIconSize(self.button_contacts.iconSize()*dpi_ratio())
+        self.button_identity.setIconSize(self.button_identity.iconSize()*dpi_ratio())
+        self.button_explore.setIconSize(self.button_explore.iconSize()*dpi_ratio())
+        self.toolbutton_menu.setIconSize(self.toolbutton_menu.iconSize()*dpi_ratio())
+        self.button_network.setFixedHeight(self.button_network.height()*dpi_ratio())
+        self.button_contacts.setFixedHeight(self.button_contacts.height()*dpi_ratio())
+        self.button_identity.setFixedHeight(self.button_identity.height()*dpi_ratio())
+        self.button_explore.setFixedHeight(self.button_explore.height()*dpi_ratio())
+        self.toolbutton_menu.setFixedHeight(self.toolbutton_menu.height()*dpi_ratio())
 
     async def ask_for_connection(self, connections):
         connections_titles = [c.title() for c in connections]

src/sakia/gui/sub/certification/certification.ui

@@ -103,6 +103,13 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="button_cancel">
+           <property name="text">
+            <string>Cancel</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>
@@ -151,6 +158,13 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QPushButton" name="button_cancel_licence">
+              <property name="text">
+               <string>Cancel</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>

src/sakia/gui/sub/certification/controller.py

@@ -31,6 +31,8 @@ class CertificationController(QObject):
         super().__init__()
         self.view.button_box.accepted.connect(self.accept)
         self.view.button_box.rejected.connect(self.reject)
+        self.view.button_cancel.clicked.connect(self.reject)
+        self.view.button_cancel_licence.clicked.connect(self.reject)
         self.view.combo_connections.currentIndexChanged.connect(self.change_connection)
 
     @classmethod

src/sakia/main.py

@@ -41,13 +41,13 @@ def async_exception_handler(loop, context):
 
     logging.error('\n'.join(log_lines), exc_info=exc_info)
     for line in log_lines:
-        for ignored in ("Unclosed", "socket.gaierror"):
+        for ignored in ("Unclosed", "socket.gaierror", "[Errno 110]"):
             if ignored in line:
                 return
 
     if exc_info:
         for line in traceback.format_exception(*exc_info):
-            for ignored in ("Unclosed", "socket.gaierror"):
+            for ignored in ("Unclosed", "socket.gaierror", "[Errno 110]"):
                 if ignored in line:
                     return
     exception_message(log_lines, exc_info)
@@ -101,7 +101,8 @@ if __name__ == '__main__':
         app.start_coroutines()
         try:
             if not app.blockchain_service.initialized():
-                box = QMessageBox("Initializing Sakia")
+                box = QMessageBox()
+                box.setWindowTitle("Initialization")
                 box.setText("Connecting to the network...")
                 wFlags = box.windowFlags();
                 if Qt.WindowCloseButtonHint == (wFlags & Qt.WindowCloseButtonHint):

tests/functional/test_connection_cfg_dialog.py

@@ -15,8 +15,8 @@ def assert_key_parameters_behaviour(connection_config_dialog, user):
     assert connection_config_dialog.view.button_next.isEnabled() is False
     assert connection_config_dialog.view.button_generate.isEnabled() is False
     QTest.keyClicks(connection_config_dialog.view.edit_password, user.password)
-    connection_config_dialog.view.button_next.isEnabled() is False
-    connection_config_dialog.view.button_generate.isEnabled() is False
+    assert connection_config_dialog.view.button_next.isEnabled() is False
+    assert connection_config_dialog.view.button_generate.isEnabled() is False
     QTest.keyClicks(connection_config_dialog.view.edit_password_repeat, user.password + "wrong")
     assert connection_config_dialog.view.button_next.isEnabled() is False
     assert connection_config_dialog.view.button_generate.isEnabled() is False