Merge pull request #3358 from GNS3/use-themed-symbols

Let the controller allocate symbols

Author: grossmj

gns3/dialogs/appliance_wizard.py

@@ -139,29 +139,19 @@ def initializePage(self, page_id):
 
         # add symbol
         if self._appliance["category"] == "guest":
-            symbol = ":/symbols/computer.svg"
+            if self._appliance.emulator() == "docker":
+                symbol = ":/symbols/docker_guest.svg"
+            elif self._appliance.emulator() == "qemu":
+                symbol = ":/symbols/qemu_guest.svg"
+            else:
+                symbol = ":/symbols/computer.svg"
         else:
             symbol = ":/symbols/{}.svg".format(self._appliance["category"])
         self.page(page_id).setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(symbol))
 
         if self.page(page_id) == self.uiServerWizardPage:
 
             Controller.instance().getSymbols(self._getSymbolsCallback)
-
-            if "qemu" in self._appliance:
-                emulator_type = "qemu"
-            elif "iou" in self._appliance:
-                emulator_type = "iou"
-            elif "docker" in self._appliance:
-                emulator_type = "docker"
-            elif "dynamips" in self._appliance:
-                emulator_type = "dynamips"
-            else:
-                QtWidgets.QMessageBox.warning(self, "Appliance", "Could not determine the emulator type")
-
-            is_mac = ComputeManager.instance().localPlatform().startswith("darwin")
-            is_win = ComputeManager.instance().localPlatform().startswith("win")
-
             self.uiRemoteServersComboBox.clear()
             if len(ComputeManager.instance().remoteComputes()) == 0:
                 self.uiRemoteRadioButton.setEnabled(False)

gns3/modules/builtin/dialogs/cloud_wizard.py

@@ -48,7 +48,7 @@ def getSettings(self):
         """
 
         settings = {"name": self.uiNameLineEdit.text(),
-                    "symbol": ":/symbols/cloud.svg",
+                    "symbol": "cloud",
                     "compute_id": self._compute_id}
 
         return settings

gns3/modules/builtin/dialogs/ethernet_hub_wizard.py

@@ -54,7 +54,7 @@ def getSettings(self):
                           "name": "Ethernet{}".format(port_number)})
 
         settings = {"name": self.uiNameLineEdit.text(),
-                    "symbol": ":/symbols/hub.svg",
+                    "symbol": "hub",
                     "category": Node.switches,
                     "compute_id": self._compute_id,
                     "ports_mapping": ports}

gns3/modules/builtin/dialogs/ethernet_switch_wizard.py

@@ -57,7 +57,7 @@ def getSettings(self):
                           "ethertype": "0x8100"})
 
         settings = {"name": self.uiNameLineEdit.text(),
-                    "symbol": ":/symbols/ethernet_switch.svg",
+                    "symbol": "ethernet_switch",
                     "category": Node.switches,
                     "compute_id": self._compute_id,
                     "ports_mapping": ports}

gns3/modules/builtin/settings.py

@@ -40,7 +40,7 @@
     "remote_console_type": "none",
     "remote_console_http_path": "/",
     "default_name_format": "Cloud{0}",
-    "symbol": ":/symbols/cloud.svg",
+    "symbol": "cloud",
     "category": Node.end_devices,
     "ports_mapping": [],
     "node_type": "cloud"
@@ -49,7 +49,7 @@
 ETHERNET_HUB_SETTINGS = {
     "name": "",
     "default_name_format": "Hub{0}",
-    "symbol": ":/symbols/hub.svg",
+    "symbol": "hub",
     "category": Node.switches,
     "ports_mapping": [],
     "node_type": "ethernet_hub"
@@ -58,7 +58,7 @@
 ETHERNET_SWITCH_SETTINGS = {
     "name": "",
     "default_name_format": "Switch{0}",
-    "symbol": ":/symbols/ethernet_switch.svg",
+    "symbol": "ethernet_switch",
     "category": Node.switches,
     "console_type": "none",
     "ports_mapping": [],

gns3/modules/docker/dialogs/docker_vm_wizard.py

@@ -39,7 +39,7 @@ def __init__(self, docker_containers, parent):
 
         super().__init__(docker_containers, parent)
         self._docker_containers = docker_containers
-        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/icons/docker.png"))
+        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/docker_guest.svg"))
 
         self.uiNewImageRadioButton.setChecked(True)
         self._existingImageRadioButtonToggledSlot(False)

gns3/modules/docker/settings.py

@@ -29,7 +29,7 @@
 DOCKER_CONTAINER_SETTINGS = {
     "default_name_format": "{name}-{0}",
     "usage": "",
-    "symbol": ":/symbols/docker_guest.svg",
+    "symbol": "docker_guest",
     "category": Node.end_devices,
     "start_command": "",
     "name": "",

gns3/modules/dynamips/settings.py

@@ -34,7 +34,7 @@
     "default_name_format": "R{0}",
     "usage": "",
     "image": "",
-    "symbol": ":/symbols/router.svg",
+    "symbol": "router",
     "category": Node.routers,
     "startup_config": "",
     "private_config": "",

gns3/modules/iou/settings.py

@@ -32,7 +32,7 @@
     "default_name_format": "IOU{0}",
     "usage": "",
     "path": "",
-    "symbol": ":/symbols/multilayer_switch.svg",
+    "symbol": "multilayer_switch",
     "category": Node.routers,
     "startup_config": "",
     "private_config": "",

gns3/modules/qemu/dialogs/qemu_image_wizard.py

@@ -40,7 +40,7 @@ def __init__(self, parent, node, filename="disk", size=30000):
 
         self._node = node
         self.setupUi(self)
-        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/icons/qemu.svg"))
+        self.setPixmap(QtWidgets.QWizard.LogoPixmap, QtGui.QPixmap(":/symbols/qemu_guest.svg"))
 
         # Initialize "constants"
         self._mappings = {