Release v2.2.32

Fixed QPoint called with floats

CHANGELOG

@@ -1,5 +1,54 @@
 # Change Log
 
+## 2.2.32 27/04/2022
+
+* Use public DSNs for Sentry
+* Fix exception when doubleclick on NAT node. Fixes #3312
+* Fix "Apply" button in the "Preferences" dialog stays gray when templates/nodes are opened by double-click. Fixes #3307
+* Add 'reset docks' in the view menu. Ref #3317
+
+## 2.2.31 26/02/2022
+
+* Install setuptools v59.6.0 when using Python 3.6
+
+## 2.2.30 25/02/2022
+
+* Set setuptools to v60.6.0
+* Upgrade to pywin32 v303. Ref #3290
+* Fix int() call. Ref #3283
+* Fix QPoint() as unexpected type 'float'. Fixes #3283
+* Fix painter.drawRect() has unexpected type 'float'. Fixes #3282
+* Fix SpinBox.setValue() requires integer. Fixes #3281
+
+## 2.2.29 08/01/2022
+
+* Clear cache when opening symbol selection dialog. Fixes #3256
+* Fix @ in username issue with HTTP authentication. Fixes #3275
+* Use '//' operator instead of int()
+* Fix create drawing item calls since mapToScene() returns a QPointF https://doc.qt.io/qt-5/qgraphicsview.html#mapToScene-4
+* Fixed QPoint called with floats
+
+## 2.2.28 15/12/2021
+
+* Fixed drawLine called with float arguments
+* Fixed dead VIX API link
+
+## 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://8aa9e09917494af7b7def60f0aed8512@o19455.ingest.sentry.io/38506"
     _instance = None
 
     def __init__(self):

gns3/dialogs/preferences_dialog.py

@@ -131,6 +131,7 @@ class PreferencesDialog(QtWidgets.QDialog, Ui_PreferencesDialog):
             QtWidgets.QLineEdit: "textChanged",
             QtWidgets.QPlainTextEdit: "textChanged",
             # QtWidgets.QTreeWidget: "itemChanged",
+            QtWidgets.QTreeWidget: "itemDoubleClicked",
             QtWidgets.QComboBox: "currentIndexChanged",
             QtWidgets.QSpinBox: "valueChanged",
             QtWidgets.QAbstractButton: "pressed"

gns3/dialogs/setup_wizard.py

@@ -127,7 +127,7 @@ class SetupWizard(QtWidgets.QWizard, Ui_SetupWizard):
         from gns3.modules import VMware
         settings = VMware.instance().settings()
         if not os.path.exists(settings["vmrun_path"]):
-            QtWidgets.QMessageBox.critical(self, "VMware", "VMware vmrun tool could not be found, VMware or the VIX API (required for VMware player) is probably not installed. You can download it from https://www.vmware.com/support/developer/vix-api/. After installation you need to restart GNS3.")
+            QtWidgets.QMessageBox.critical(self, "VMware", "VMware vmrun tool could not be found, VMware or the VIX API (required for VMware player) is probably not installed. You can download it from https://customerconnect.vmware.com/downloads/details?downloadGroup=PLAYER-1400-VIX1170&productId=687. After installation you need to restart GNS3.")
             return
         self._refreshVMListSlot()
 

gns3/dialogs/style_editor_dialog.py

@@ -70,7 +70,7 @@ class StyleEditorDialog(QtWidgets.QDialog, Ui_StyleEditorDialog):
                                                                                                     self._border_color.green(),
                                                                                                     self._border_color.blue(),
                                                                                                     self._border_color.alpha()))
-        self.uiRotationSpinBox.setValue(first_item.rotation())
+        self.uiRotationSpinBox.setValue(int(first_item.rotation()))
         self.uiBorderWidthSpinBox.setValue(pen.width())
         index = self.uiBorderStyleComboBox.findData(pen.style())
         if index != -1:

gns3/dialogs/symbol_selection_dialog.py

@@ -67,6 +67,7 @@ class SymbolSelectionDialog(QtWidgets.QDialog, Ui_SymbolSelectionDialog):
         self._symbol_items = []
         self._parents = {}
 
+        Controller.instance().clearStaticCache()  # TODO: use etag to know when to refresh the cache
         Controller.instance().get("/symbols", self._listSymbolsCallback)
 
     def _listSymbolsCallback(self, result, error=False, **kwargs):
@@ -108,6 +109,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 +123,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/dialogs/text_editor_dialog.py

@@ -44,7 +44,7 @@ class TextEditorDialog(QtWidgets.QDialog, Ui_TextEditorDialog):
         # use the first item in the list as the model
         first_item = items[0]
         self._setColor(first_item.defaultTextColor())
-        self.uiRotationSpinBox.setValue(first_item.rotation())
+        self.uiRotationSpinBox.setValue(int(first_item.rotation()))
         self.uiPlainTextEdit.setPlainText(first_item.toPlainText())
         self.uiPlainTextEdit.setFont(first_item.font())
 

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)
 
@@ -471,7 +473,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
             #QtWidgets.QApplication.sendEvent(self, context_event)
         elif event.button() == QtCore.Qt.LeftButton and self._adding_note:
             pos = self.mapToScene(event.pos())
-            note = self.createDrawingItem("text", pos.x(), pos.y(), 2)
+            note = self.createDrawingItem("text", int(pos.x()), int(pos.y()), 2)
             pos_x = note.pos().x()
             pos_y = note.pos().y() - (note.boundingRect().height() / 2)
             note.setPos(pos_x, pos_y)
@@ -481,19 +483,19 @@ class GraphicsView(QtWidgets.QGraphicsView):
             self._adding_note = False
         elif event.button() == QtCore.Qt.LeftButton and self._adding_rectangle:
             pos = self.mapToScene(event.pos())
-            self.createDrawingItem("rect", pos.x(), pos.y(), 1)
+            self.createDrawingItem("rect", int(pos.x()), int(pos.y()), 1)
             self._main_window.uiDrawRectangleAction.setChecked(False)
             self.setCursor(QtCore.Qt.ArrowCursor)
             self._adding_rectangle = False
         elif event.button() == QtCore.Qt.LeftButton and self._adding_ellipse:
             pos = self.mapToScene(event.pos())
-            self.createDrawingItem("ellipse", pos.x(), pos.y(), 1)
+            self.createDrawingItem("ellipse", int(pos.x()), int(pos.y()), 1)
             self._main_window.uiDrawEllipseAction.setChecked(False)
             self.setCursor(QtCore.Qt.ArrowCursor)
             self._adding_ellipse = False
         elif event.button() == QtCore.Qt.LeftButton and self._adding_line:
             pos = self.mapToScene(event.pos())
-            self.createDrawingItem("line", pos.x(), pos.y(), 1)
+            self.createDrawingItem("line", int(pos.x()), int(pos.y()), 1)
             self._main_window.uiDrawLineAction.setChecked(False)
             self.setCursor(QtCore.Qt.ArrowCursor)
             self._adding_line = False
@@ -657,7 +659,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
         if not self._adding_link:
             if isinstance(item, NodeItem) and item.node().initialized():
                 item.setSelected(True)
-                if item.node().status() == Node.stopped or item.node().consoleType() == "none":
+                if item.node().status() == Node.stopped or item.node().consoleType() == "none" or item.node().consoleType() is None:
                     self.configureSlot()
                     return
                 else:
@@ -721,8 +723,8 @@ class GraphicsView(QtWidgets.QGraphicsView):
                 integer, ok = QtWidgets.QInputDialog.getInt(self, "Nodes", "Number of nodes:", 2, 1, 100, 1)
                 if ok:
                     for node_number in range(integer):
-                        x = event.pos().x() - (150 / 2) + (node_number % max_nodes_per_line) * offset
-                        y = event.pos().y() - (70 / 2) + (node_number // max_nodes_per_line) * offset
+                        x = event.pos().x() - (150 // 2) + (node_number % max_nodes_per_line) * offset
+                        y = event.pos().y() - (70 // 2) + (node_number // max_nodes_per_line) * offset
                         if self.createNodeFromTemplateId(template_id, QtCore.QPoint(x, y)) is False:
                             event.ignore()
                             break
@@ -1409,7 +1411,15 @@ class GraphicsView(QtWidgets.QGraphicsView):
                     type = "rect"
                 else:
                     type = "image"
-                self.createDrawingItem(type, item.pos().x() + 20, item.pos().y() + 20, item.zValue(), rotation=item.rotation(), svg=item.toSvg())
+
+                self.createDrawingItem(
+                    type,
+                    int(item.pos().x()) + 20,
+                    int(item.pos().y()) + 20,
+                    item.zValue(),
+                    rotation=item.rotation(),
+                    svg=item.toSvg()
+                )
             elif isinstance(item, NodeItem):
                 item.node().duplicate(item.pos().x() + 20, item.pos().y() + 20, item.zValue())
 
@@ -1661,11 +1671,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
                 x = left
                 while x < rect.right():
-                    painter.drawLine(x, rect.top(), x, rect.bottom())
+                    painter.drawLine(x, int(rect.top()), x, int(rect.bottom()))
                     x += grid
                 y = top
                 while y < rect.bottom():
-                    painter.drawLine(rect.left(), y, rect.right(), y)
+                    painter.drawLine(int(rect.left()), y, int(rect.right()), y)
                     y += grid
             painter.restore()
 

gns3/http_client.py

@@ -554,14 +554,13 @@ class HTTPClient(QtCore.QObject):
         query_string = self._paramsToQueryString(params)
 
         log.debug("{method} {protocol}://{host}:{port}{prefix}{path} {body}{query_string}".format(method=method, protocol=self._protocol, host=host, port=self._port, path=path, body=body, prefix=prefix, query_string=query_string))
+        url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{path}{query_string}".format(protocol=self._protocol, host=host, port=self._port, path=path, prefix=prefix, query_string=query_string))
+
         if self._user:
-            url = QtCore.QUrl("{protocol}://{user}@{host}:{port}{prefix}{path}{query_string}".format(protocol=self._protocol, user=self._user, host=host, port=self._port, path=path, prefix=prefix, query_string=query_string))
-        else:
-            url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{path}{query_string}".format(protocol=self._protocol, host=host, port=self._port, path=path, prefix=prefix, query_string=query_string))
+            url.setUserName(self._user)
+
         request = self._request(url)
-
         request = self._addAuth(request)
-
         request.setRawHeader(b"User-Agent", "GNS3 QT Client v{version}".format(version=__version__).encode())
 
         # By default QT doesn't support GET with body even if it's in the RFC that's why we need to use sendCustomRequest
@@ -759,10 +758,10 @@ class HTTPClient(QtCore.QObject):
         host = self._getHostForQuery()
 
         log.debug("{method} {protocol}://{host}:{port}{prefix}{endpoint}".format(method=method, protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+        url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+
         if self._user:
-            url = QtCore.QUrl("{protocol}://{user}@{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, user=self._user, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
-        else:
-            url = QtCore.QUrl("{protocol}://{host}:{port}{prefix}{endpoint}".format(protocol=self._protocol, host=host, port=self._port, prefix=prefix, endpoint=endpoint))
+            url.setUserName(self._user)
 
         request = self._request(url)
         request = self._addAuth(request)

gns3/items/drawing_item.py

@@ -246,7 +246,7 @@ class DrawingItem:
         center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0)
         painter.setBrush(QtCore.Qt.red)
         painter.setPen(QtCore.Qt.red)
-        painter.drawRect((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20)
+        painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20))
         painter.setPen(QtCore.Qt.black)
         zval = str(int(self.zValue()))
         painter.drawText(QtCore.QPointF(center.x() - 4, center.y() + 4), zval)

gns3/items/label_item.py

@@ -165,7 +165,7 @@ class LabelItem(QtWidgets.QGraphicsTextItem):
         center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0)
         painter.setBrush(QtCore.Qt.red)
         painter.setPen(QtCore.Qt.red)
-        painter.drawRect((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20)
+        painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20))
         painter.setPen(QtCore.Qt.black)
         zval = str(int(self.zValue()))
         painter.drawText(QtCore.QPointF(center.x(), center.y()), zval)

gns3/items/node_item.py

@@ -507,7 +507,7 @@ class NodeItem(QtSvg.QGraphicsSvgItem):
             center = self.mapFromItem(self, brect.width() / 2.0, brect.height() / 2.0)
             painter.setBrush(QtCore.Qt.red)
             painter.setPen(QtCore.Qt.red)
-            painter.drawRect((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20)
+            painter.drawRect(QtCore.QRectF((brect.width() / 2.0) - 10, (brect.height() / 2.0) - 10, 20, 20))
             painter.setPen(QtCore.Qt.black)
             if self.show_layer:
                 text = str(int(self.zValue()))  # Z value

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/main_window.py

@@ -234,6 +234,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
         self.uiShowGridAction.triggered.connect(self._showGridActionSlot)
         self.uiSnapToGridAction.triggered.connect(self._snapToGridActionSlot)
         self.uiLockAllAction.triggered.connect(self._lockActionSlot)
+        self.uiResetDocksAction.triggered.connect(self._resetDocksSlot)
 
         # tool menu connections
         self.uiWebUIAction.triggered.connect(self._openWebInterfaceActionSlot)
@@ -366,6 +367,16 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
                         item.updateNode()
                     item.update()
 
+    def _resetDocksSlot(self):
+        """
+        Reset the dock widgets.
+        """
+
+        self.uiTopologySummaryDockWidget.setFloating(False)
+        self.uiComputeSummaryDockWidget.setFloating(False)
+        self.uiConsoleDockWidget.setFloating(False)
+        self.uiNodesDockWidget.setFloating(False)
+
     def analyticsClient(self):
         """
         Return the analytics client

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/node.py

@@ -650,10 +650,11 @@ class Node(BaseNode):
 
         if not console_type:
             console_type = self.consoleType()
-        if console_type == "vnc":
-            return general_settings["vnc_console_command"]
-        elif console_type.startswith("spice"):
-            return general_settings["spice_console_command"]
+        if console_type:
+            if console_type == "vnc":
+                return general_settings["vnc_console_command"]
+            elif console_type.startswith("spice"):
+                return general_settings["spice_console_command"]
         return general_settings["telnet_console_command"]
 
     def consoleType(self):

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/ui/main_window.ui

@@ -38,7 +38,16 @@ background-none;
   </property>
   <widget class="QWidget" name="uiCentralWidget">
    <layout class="QGridLayout">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <property name="spacing">
@@ -62,7 +71,7 @@ background-none;
      <x>0</x>
      <y>0</y>
      <width>986</width>
-     <height>42</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="uiEditMenu">
@@ -129,6 +138,7 @@ background-none;
     <addaction name="uiShowPortNamesAction"/>
     <addaction name="uiLockAllAction"/>
     <addaction name="separator"/>
+    <addaction name="uiResetDocksAction"/>
     <addaction name="uiDocksMenu"/>
    </widget>
    <widget class="QMenu" name="uiControlMenu">
@@ -228,7 +238,16 @@ background-none;
      <property name="spacing">
       <number>0</number>
      </property>
-     <property name="margin">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
@@ -372,7 +391,16 @@ background-none;
      <property name="spacing">
       <number>0</number>
      </property>
-     <property name="margin">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <item>
@@ -438,7 +466,16 @@ background-none;
      </sizepolicy>
     </property>
     <layout class="QGridLayout">
-     <property name="margin">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <property name="spacing">
@@ -482,7 +519,16 @@ background-none;
    </attribute>
    <widget class="QWidget" name="dockWidgetContents">
     <layout class="QGridLayout" name="gridLayout">
-     <property name="margin">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
       <number>0</number>
      </property>
      <property name="spacing">
@@ -1243,6 +1289,11 @@ background-none;
     <string>New template</string>
    </property>
   </action>
+  <action name="uiResetDocksAction">
+   <property name="text">
+    <string>Reset docks</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

gns3/ui/main_window_ui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/ui/main_window.ui'
 #
-# Created by: PyQt5 UI code generator 5.13.2
+# Created by: PyQt5 UI code generator 5.14.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -48,7 +48,7 @@ class Ui_MainWindow(object):
         self.gridlayout.addWidget(self.uiGraphicsView, 0, 0, 1, 1)
         MainWindow.setCentralWidget(self.uiCentralWidget)
         self.uiMenuBar = QtWidgets.QMenuBar(MainWindow)
-        self.uiMenuBar.setGeometry(QtCore.QRect(0, 0, 986, 42))
+        self.uiMenuBar.setGeometry(QtCore.QRect(0, 0, 986, 22))
         self.uiMenuBar.setObjectName("uiMenuBar")
         self.uiEditMenu = QtWidgets.QMenu(self.uiMenuBar)
         self.uiEditMenu.setObjectName("uiEditMenu")
@@ -448,6 +448,8 @@ class Ui_MainWindow(object):
         self.uiNewTemplateAction = QtWidgets.QAction(MainWindow)
         self.uiNewTemplateAction.setIcon(icon)
         self.uiNewTemplateAction.setObjectName("uiNewTemplateAction")
+        self.uiResetDocksAction = QtWidgets.QAction(MainWindow)
+        self.uiResetDocksAction.setObjectName("uiResetDocksAction")
         self.uiEditMenu.addAction(self.uiSelectAllAction)
         self.uiEditMenu.addAction(self.uiSelectNoneAction)
         self.uiEditMenu.addSeparator()
@@ -488,6 +490,7 @@ class Ui_MainWindow(object):
         self.uiViewMenu.addAction(self.uiShowPortNamesAction)
         self.uiViewMenu.addAction(self.uiLockAllAction)
         self.uiViewMenu.addSeparator()
+        self.uiViewMenu.addAction(self.uiResetDocksAction)
         self.uiViewMenu.addAction(self.uiDocksMenu.menuAction())
         self.uiControlMenu.addAction(self.uiStartAllAction)
         self.uiControlMenu.addAction(self.uiSuspendAllAction)
@@ -711,6 +714,7 @@ class Ui_MainWindow(object):
         self.uiLockAllAction.setToolTip(_translate("MainWindow", "Lock or unlock all items"))
         self.uiWebUIAction.setText(_translate("MainWindow", "Web UI - beta"))
         self.uiNewTemplateAction.setText(_translate("MainWindow", "New template"))
+        self.uiResetDocksAction.setText(_translate("MainWindow", "Reset docks"))
 from ..compute_summary_view import ComputeSummaryView
 from ..console_view import ConsoleView
 from ..graphics_view import GraphicsView

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.32"
+__version_info__ = (2, 2, 32, 0)
 
 if "dev" in __version__:
     try:

mac-requirements.txt

@@ -1,3 +1,3 @@
 -rrequirements.txt
 
-PyQt5==5.15.4
+PyQt5==5.15.6

requirements.txt

@@ -1,5 +1,6 @@
 jsonschema==3.2.0
-sentry-sdk==1.3.1
-psutil==5.8.0
+sentry-sdk==1.5.10
+psutil==5.9.0
 distro==1.6.0
-setuptools
+setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6

tests/test_link.py

@@ -104,9 +104,6 @@ def test_create_link(devices, project, controller):
     assert link._link_id is not None
     assert not devices[0].ports()[0].isFree()
 
-    assert link in devices[0].links()
-    assert link in devices[1].links()
-
     assert link.getNodePort(devices[0]) == devices[0].ports()[0]
     assert link.getNodePort(devices[1]) == devices[1].ports()[0]
 

win-requirements.txt

@@ -1,4 +1,4 @@
 -rrequirements.txt
 
-PyQt5==5.15.4 # pyup: ignore
-pywin32==301 # pyup: ignore
+PyQt5==5.15.6 # pyup: ignore
+pywin32==303 # pyup: ignore