Center label when hostname change

Fix #1404

gns3server/controller/node.py

@@ -23,6 +23,7 @@ import os
 
 from .compute import ComputeConflict
 from ..utils.images import images_directories
+from ..utils.qt import qt_font_to_style
 
 
 import logging
@@ -54,13 +55,7 @@ class Node:
         self._compute = compute
         self._node_type = node_type
 
-        self._label = {
-            "y": -25,
-            "text": "",
-            "style": "font-size: 10;font-familly: Verdana",
-            "x": -17,
-            "rotation": 0
-        }
+        self._label = None
         self._name = None
         self.name = name
         self._console = None
@@ -106,7 +101,9 @@ class Node:
     def name(self, new_name):
         self._name = self._project.update_node_name(self, new_name)
         # The text in label need to be always the node name
-        self._label["text"] = self._name
+        if self.label and self._label["text"] != self._name:
+            self._label["text"] = self._name
+            self._label["x"] = None  # Center text
 
     @property
     def node_type(self):
@@ -195,6 +192,22 @@ class Node:
         # If symbol is invalid we replace it by default
         except (ValueError, OSError):
             self.symbol = ":/symbols/computer.svg"
+        if self._label is None:
+            # Apply to label user style or default
+            try:
+                style = qt_font_to_style(
+                    self._project.controller.settings["GraphicsView"]["default_label_font"],
+                    self._project.controller.settings["GraphicsView"]["default_label_color"])
+            except KeyError:
+                style = "font-size: 10;font-familly: Verdana"
+
+            self._label = {
+                "y": round(self._height / 2 + 10) * -1,
+                "text": self._name,
+                "style": style,
+                "x": None,  # None: mean the client should center it
+                "rotation": 0
+            }
 
     @property
     def label(self):

gns3server/controller/topology.py

@@ -26,6 +26,8 @@ import jsonschema
 
 from ..version import __version__
 from ..schemas.topology import TOPOLOGY_SCHEMA
+from ..utils.qt import qt_font_to_style
+
 
 import logging
 log = logging.getLogger(__name__)
@@ -403,20 +405,7 @@ def _convert_label(label):
     """
     Convert a label from 1.X to the new format
     """
-    font_info = label["font"].split(",")
-    style = "font-family: {};font-size: {};".format(font_info[0], font_info[1])
-    if font_info[4] == "75":
-        style += "font-weight: bold;"
-    if font_info[5] == "1":
-        style += "font-style: italic;"
-    color = label["color"]
-
-    if len(color) == 9:
-        style += "fill: #" + color[-6:] + ";"
-        style += "fill-opacity: {};".format(round(1.0 / 255 * int(color[:3][-2:], base=16), 2))
-    else:
-        style += "fill: #" + color[-6:] + ";"
-        style += "fill-opacity: {};".format(1.0)
+    style = qt_font_to_style(label["font"], label["color"])
     return {
         "text": label["text"],
         "rotation": 0,