Release v2.2.27

chore : use --no-cache-dir flag to pip in dockerfiles to save space

CHANGELOG

@@ -1,5 +1,21 @@
 # Change Log
 
+## 2.2.27 12/11/2021
+
+* Fix symbols in "Symbol selection" dialog are not placed in alphabetical order. Fixes #3245
+* Fix links duplicates in topology summary. Fixes #3251
+* chore : use --no-cache-dir flag to pip in dockerfiles to save space
+
+## 2.2.26 08/10/2021
+
+* Upgrade embedded Python to version 3.7 in Windows package
+* Upgrade Visual C++ Redistributable for Visual Studio 2019 in Windows package
+* Fix SSL support in Windows package
+* Open "template configuration" dialog with double click on template name in "Preferences". Fixes #3239
+* Only show "virtio" network adapter when legacy node is enabled. Fixes https://github.com/GNS3/gns3-gui/issues/1969
+* Double-click on a template opens "template configuration" dialog. Fixes #3236
+* Fix "Custom symbols" can't be unfolded after using "Filter" field. Fixes #3231
+
 ## 2.2.25 14/09/2021
 
 * Fix menu disabled for modal dialogs on macOS. Fixes #3007

Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get clean
 
 ADD dev-requirements.txt /dev-requirements.txt
 ADD requirements.txt /requirements.txt
-RUN pip3 install -r /dev-requirements.txt
+RUN pip3 install --no-cache-dir -r /dev-requirements.txt
 
 ADD . /src
 WORKDIR /src

gns3/crash_report.py

@@ -51,7 +51,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://ca0e3be7dada465495fc33615f6143b8:4ddf20c171744e138fd327929c5e15f2@o19455.ingest.sentry.io/38506"
+    DSN = "https://4afb719ce2104feb9cc256d0e049d9a1:b0340c0f91c54947bc987da013c4e933@o19455.ingest.sentry.io/38506"
     _instance = None
 
     def __init__(self):

gns3/dialogs/symbol_selection_dialog.py

@@ -108,6 +108,9 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
                 item.setIcon(0, icon)
 
             Controller.instance().getStatic(symbol.url(), qpartial(render, item))
+
+        for parent in self._parents.values():
+            parent.sortChildren(0, QtCore.Qt.AscendingOrder)
         self.adjustSize()
 
     def _searchTextChangedSlot(self, text):
@@ -119,13 +122,13 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
         """
         text = self.uiSearchLineEdit.text()
         for item in self._symbol_items:
-            if not item.data(0, QtCore.Qt.UserRole).builtin():
-                item.setHidden(True)
+            # if not item.data(0, QtCore.Qt.UserRole).builtin():
+            #     item.setHidden(True)
+            # else:
+            if not text.strip() or text.strip().lower() in item.text(0).lower():
+                item.setHidden(False)
             else:
-                if len(text.strip()) == 0 or text.strip().lower() in item.text(0).lower():
-                    item.setHidden(False)
-                else:
-                    item.setHidden(True)
+                item.setHidden(True)
 
     def _customSymbolToggledSlot(self, checked):
         """

gns3/graphics_view.py

@@ -326,6 +326,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
         # connect the signals that let the graphics view knows about events such as
         # a new link creation or deletion.
         if self._topology.addLink(link):
+            source_node.addLink(link)
+            destination_node.addLink(link)
             link.add_link_signal.connect(self.addLinkSlot)
             link.delete_link_signal.connect(self.deleteLinkSlot)
 

gns3/link.py

@@ -91,8 +91,6 @@ class Link(QtCore.QObject):
 
         self._nodes = []
         self._link_style = {}
-        self._source_node.addLink(self)
-        self._destination_node.addLink(self)
 
         body = self._prepareParams()
         if self._link_id:

gns3/modules/builtin/pages/cloud_preferences_page.py

@@ -52,6 +52,7 @@ class CloudPreferencesPage(QtWidgets.QWidget, Ui_CloudPreferencesPageWidget):
         self.uiEditCloudNodePushButton.clicked.connect(self._editCloudNodeSlot)
         self.uiDeleteCloudNodePushButton.clicked.connect(self._deleteCloudNodeSlot)
         self.uiCloudNodesTreeWidget.itemSelectionChanged.connect(self._cloudNodeChangedSlot)
+        self.uiCloudNodesTreeWidget.itemDoubleClicked.connect(self._editCloudNodeSlot)
 
     def _createSectionItem(self, name):
         """

gns3/modules/builtin/pages/ethernet_hub_preferences_page.py

@@ -53,6 +53,8 @@ class EthernetHubPreferencesPage(QtWidgets.QWidget, Ui_EthernetHubPreferencesPag
         self.uiEditEthernetHubPushButton.clicked.connect(self._editEthernetHubSlot)
         self.uiDeleteEthernetHubPushButton.clicked.connect(self._deleteEthernetHubSlot)
         self.uiEthernetHubsTreeWidget.itemSelectionChanged.connect(self._ethernetHubChangedSlot)
+        self.uiEthernetHubsTreeWidget.itemDoubleClicked.connect(self._editEthernetHubSlot)
+
 
     def _createSectionItem(self, name):
         """

gns3/modules/builtin/pages/ethernet_switch_preferences_page.py

@@ -53,6 +53,7 @@ class EthernetSwitchPreferencesPage(QtWidgets.QWidget, Ui_EthernetSwitchPreferen
         self.uiEditEthernetSwitchPushButton.clicked.connect(self._editEthernetSwitchSlot)
         self.uiDeleteEthernetSwitchPushButton.clicked.connect(self._deleteEthernetSwitchSlot)
         self.uiEthernetSwitchesTreeWidget.itemSelectionChanged.connect(self._ethernetSwitchChangedSlot)
+        self.uiEthernetSwitchesTreeWidget.itemDoubleClicked.connect(self._editEthernetSwitchSlot)
 
     def _createSectionItem(self, name):
         """

gns3/modules/docker/pages/docker_vm_preferences_page.py

@@ -52,6 +52,7 @@ class DockerVMPreferencesPage(QtWidgets.QWidget, Ui_DockerVMPreferencesPageWidge
         self.uiEditDockerVMPushButton.clicked.connect(self._dockerImageEditSlot)
         self.uiDeleteDockerVMPushButton.clicked.connect(self._dockerImageDeleteSlot)
         self.uiDockerVMsTreeWidget.itemSelectionChanged.connect(self._dockerImageChangedSlot)
+        self.uiDockerVMsTreeWidget.itemDoubleClicked.connect(self._dockerImageEditSlot)
 
     def _createSectionItem(self, name):
         """

gns3/modules/dynamips/pages/ios_router_preferences_page.py

@@ -70,6 +70,7 @@ class IOSRouterPreferencesPage(QtWidgets.QWidget, Ui_IOSRouterPreferencesPageWid
         self.uiDeleteIOSRouterPushButton.clicked.connect(self._iosRouterDeleteSlot)
         self.uiIOSRoutersTreeWidget.itemSelectionChanged.connect(self._iosRouterChangedSlot)
         self.uiDecompressIOSPushButton.clicked.connect(self._decompressIOSSlot)
+        self.uiIOSRoutersTreeWidget.itemDoubleClicked.connect(self._iosRouterEditSlot)
 
     def _iosRouterChangedSlot(self):
         """

gns3/modules/iou/pages/iou_device_preferences_page.py

@@ -59,6 +59,7 @@ class IOUDevicePreferencesPage(QtWidgets.QWidget, Ui_IOUDevicePreferencesPageWid
         self.uiEditIOUDevicePushButton.clicked.connect(self._iouDeviceEditSlot)
         self.uiDeleteIOUDevicePushButton.clicked.connect(self._iouDeviceDeleteSlot)
         self.uiIOUDevicesTreeWidget.itemSelectionChanged.connect(self._iouDeviceChangedSlot)
+        self.uiIOUDevicesTreeWidget.itemDoubleClicked.connect(self._iouDeviceEditSlot)
 
     def _createSectionItem(self, name):
         """

gns3/modules/qemu/pages/qemu_vm_configuration_page.py

@@ -102,6 +102,7 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
 
         # Supported NIC models: e1000, e1000-82544gc, e1000-82545em, e1000e, i82550, i82551, i82557a, i82557b, i82557c, i82558a
         # i82558b, i82559a, i82559b, i82559c, i82559er, i82562, i82801, ne2k_pci, pcnet, rocker, rtl8139, virtio-net-pci, vmxnet3
+        # This list can be retrieved using "qemu-system-x86_64 -nic model=?" or "qemu-system-x86_64 -device help"
         self._legacy_devices = ("e1000", "i82551", "i82557b", "i82559er", "ne2k_pci", "pcnet", "rtl8139", "virtio")
         self._qemu_network_devices = OrderedDict([("e1000", "Intel Gigabit Ethernet"),
                                                   ("e1000-82544gc", "Intel 82544GC Gigabit Ethernet"),
@@ -154,6 +155,9 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
         for device_name, device_description in self._qemu_network_devices.items():
             if legacy_networking and device_name not in self._legacy_devices:
                 continue
+            # special case for virtio legacy networking
+            if not legacy_networking and device_name == "virtio":
+                continue
             self.uiAdapterTypesComboBox.addItem("{} ({})".format(device_description, device_name), device_name)
 
     @staticmethod
@@ -421,7 +425,9 @@ class QemuVMConfigurationPage(QtWidgets.QWidget, Ui_QemuVMConfigPageWidget):
                 if nic in self._legacy_devices:
                     network_devices[nic] = desc
         else:
-            network_devices = self._qemu_network_devices
+            network_devices = self._qemu_network_devices.copy()
+            # special case for virtio legacy networking
+            network_devices.pop("virtio")
 
         dialog = CustomAdaptersConfigurationDialog(ports, self._custom_adapters, default_adapter, network_devices, base_mac_address, parent=self)
         dialog.show()

gns3/modules/qemu/pages/qemu_vm_preferences_page.py

@@ -54,6 +54,7 @@ class QemuVMPreferencesPage(QtWidgets.QWidget, Ui_QemuVMPreferencesPageWidget):
         self.uiEditQemuVMPushButton.clicked.connect(self._qemuVMEditSlot)
         self.uiDeleteQemuVMPushButton.clicked.connect(self._qemuVMDeleteSlot)
         self.uiQemuVMsTreeWidget.itemSelectionChanged.connect(self._qemuVMChangedSlot)
+        self.uiQemuVMsTreeWidget.itemDoubleClicked.connect(self._qemuVMEditSlot)
 
     def _createSectionItem(self, name):
         """

gns3/modules/virtualbox/pages/virtualbox_vm_preferences_page.py

@@ -54,6 +54,7 @@ class VirtualBoxVMPreferencesPage(QtWidgets.QWidget, Ui_VirtualBoxVMPreferencesP
         self.uiEditVirtualBoxVMPushButton.clicked.connect(self._vboxVMEditSlot)
         self.uiDeleteVirtualBoxVMPushButton.clicked.connect(self._vboxVMDeleteSlot)
         self.uiVirtualBoxVMsTreeWidget.itemSelectionChanged.connect(self._vboxVMChangedSlot)
+        self.uiVirtualBoxVMsTreeWidget.itemDoubleClicked.connect(self._vboxVMEditSlot)
 
     def _createSectionItem(self, name):
         """

gns3/modules/vmware/pages/vmware_vm_preferences_page.py

@@ -53,6 +53,7 @@ class VMwareVMPreferencesPage(QtWidgets.QWidget, Ui_VMwareVMPreferencesPageWidge
         self.uiEditVMwareVMPushButton.clicked.connect(self._vmwareVMEditSlot)
         self.uiDeleteVMwareVMPushButton.clicked.connect(self._vmwareVMDeleteSlot)
         self.uiVMwareVMsTreeWidget.itemSelectionChanged.connect(self._vmwareVMChangedSlot)
+        self.uiVMwareVMsTreeWidget.itemDoubleClicked.connect(self._vmwareVMEditSlot)
 
     def _createSectionItem(self, name):
         """

gns3/modules/vpcs/pages/vpcs_node_preferences_page.py

@@ -53,6 +53,7 @@ class VPCSNodePreferencesPage(QtWidgets.QWidget, Ui_VPCSNodePageWidget):
         self.uiEditVPCSPushButton.clicked.connect(self._editVPCSSlot)
         self.uiDeleteVPCSPushButton.clicked.connect(self._deleteVPCSSlot)
         self.uiVPCSTreeWidget.itemSelectionChanged.connect(self._vpcsChangedSlot)
+        self.uiVPCSTreeWidget.itemDoubleClicked.connect(self._editVPCSSlot)
 
     def _createSectionItem(self, name):
         """

gns3/nodes_view.py

@@ -151,6 +151,22 @@ class NodesView(QtWidgets.QTreeWidget):
 
         self._showContextualMenu(event.globalPos())
 
+    def mouseDoubleClickEvent(self, event):
+        """
+        Handles all mouse double click events.
+
+        :param event: QMouseEvent instance
+        """
+
+        item = self.itemAt(event.pos())
+        if item:
+            template = TemplateManager.instance().getTemplate(item.data(0, QtCore.Qt.UserRole))
+            if template:
+                configuration_page = TEMPLATE_TYPE_TO_CONFIGURATION_PAGE.get(template.template_type())
+                if not template.builtin() and configuration_page:
+                    self._configurationSlot(template, configuration_page)
+        super().mouseDoubleClickEvent(event)
+
     def mouseMoveEvent(self, event):
         """
         Handles all mouse move events.
@@ -204,14 +220,14 @@ class NodesView(QtWidgets.QTreeWidget):
 
         menu.exec_(pos)
 
-    def _configurationSlot(self, template, configuration_page, source):
+    def _configurationSlot(self, template, configuration_page, source=None):
 
         dialog = ConfigurationDialog(template.name(), template.settings(), configuration_page(), parent=self)
         dialog.show()
         if dialog.exec_():
             TemplateManager.instance().updateTemplate(template)
 
-    def _deleteSlot(self, template, source):
+    def _deleteSlot(self, template, source=None):
 
         reply = QtWidgets.QMessageBox.question(self, "Template", "Delete {} template?".format(template.name()),
                                                QtWidgets.QMessageBox.Yes, QtWidgets.QMessageBox.No)

gns3/version.py

@@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.25"
-__version_info__ = (2, 2, 25, 0)
+__version__ = "2.2.27"
+__version_info__ = (2, 2, 27, 0)
 
 if "dev" in __version__:
     try: