Release v2.2.25

Explicitly require setuptools, utils/get_resource.py imports pkg_resources

CHANGELOG

@@ -1,5 +1,30 @@
 # Change Log
 
+## 2.2.25 14/09/2021
+
+* Fix menu disabled for modal dialogs on macOS. Fixes #3007
+* Change method to display the recent files menu. Fixes #3007
+* Fix bug when using empty port names for custom adapters. Fixes #3228
+* Upgrade Qt to version 5.15.4 on macOS
+* Fix mouse zoom-in/out step value is two times bigger than keyboard one. Fixes #3226
+* Upgrade to Qt 5.15.4 on Windows. Ref #3210
+* Fix issue with custom adapters at the node level. Fixes #3223
+* Explicitly require setuptools, utils/get_resource.py imports pkg_resources
+
+## 2.2.24 25/08/2021
+
+* Fix incorrect Qemu binary selected when importing template. Fixes https://github.com/GNS3/gns3-gui/issues/3216
+* Early support for Python3.10
+* Bump pywin32 from 300 to 301
+* Add PyQt5==5.12.3 for macOS build
+
+## 2.2.23 05/08/2021
+
+* Handle -no-kvm param deprecated in Qemu >= v5.2
+* Support for invisible links. Fixes #2461
+* Add kitty console application command line. Fixes #3203
+* Add Windows Terminal profile as an option for Console Applications. Fixes #3193
+
 ## 2.2.22 10/06/2021
 
 * Fix exception shown when GNS3 is started with empty config. Fixes #3188

dev-requirements.txt

@@ -1,5 +1,5 @@
 -rrequirements.txt
 
-pytest==5.4.3
-flake8==3.8.3
-pytest-timeout==1.4.1
+pytest==6.2.4
+flake8==3.9.2
+pytest-timeout==1.4.2

gns3/crash_report.py

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

gns3/dialogs/appliance_wizard.py

@@ -554,7 +554,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
             if self.uiQemuListComboBox.count() == 1:
                 self.next()
             else:
-                i = self.uiQemuListComboBox.findText(self._appliance["qemu"]["arch"], QtCore.Qt.MatchContains)
+                i = self.uiQemuListComboBox.findData(self._appliance["qemu"]["arch"], flags=QtCore.Qt.MatchEndsWith)
                 if i != -1:
                     self.uiQemuListComboBox.setCurrentIndex(i)
 

gns3/dialogs/custom_adapters_configuration_dialog.py

@@ -169,6 +169,9 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
             adapter_number = item.data(0, QtCore.Qt.UserRole)
             custom_adapter_settings["adapter_number"] = adapter_number
             original_port_name = item.data(1, QtCore.Qt.UserRole)
+            if not port_name:
+                QtWidgets.QMessageBox.critical(self, "Port name", "Port name cannot be empty for adapter {}".format(adapter_number))
+                return False
             if original_port_name != port_name:
                 custom_adapter_settings["port_name"] = port_name
             if self._default_adapter_type and self._adapter_types:
@@ -180,13 +183,14 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
                 if mac_address and mac_address != ":::::":
                     if not re.search(r"""^([0-9a-fA-F]{2}[:]){5}[0-9a-fA-F]{2}$""", mac_address):
                         QtWidgets.QMessageBox.critical(self, "MAC address", "Invalid MAC address (format required: hh:hh:hh:hh:hh:hh)")
-                        return
+                        return False
                     default_mac_address = self._IntegerToMac(self._MacToInteger(self._base_mac_address) + adapter_number)
                     if mac_address != default_mac_address:
                         custom_adapter_settings["mac_address"] = mac_address
             if len(custom_adapter_settings) > 1:
                 # only save if there is more than the adapter_number key
                 self._custom_adapters.append(custom_adapter_settings.copy())
+        return True
 
     def done(self, result):
         """
@@ -196,5 +200,6 @@ class CustomAdaptersConfigurationDialog(QtWidgets.QDialog, Ui_CustomAdaptersConf
         """
 
         if result:
-            self._updateCustomAdapters()
+            if not self._updateCustomAdapters():
+                return
         super().done(result)

gns3/dialogs/project_dialog.py

@@ -53,7 +53,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
 
         if show_open_options:
             self.uiOpenProjectPushButton.clicked.connect(self._openProjectActionSlot)
-            self.uiRecentProjectsPushButton.clicked.connect(self._showRecentProjectsSlot)
+            self._addRecentFilesMenu()
         else:
             self.uiOpenProjectGroupBox.hide()
             self.uiProjectTabWidget.removeTab(1)
@@ -231,12 +231,12 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
         self._main_window.openProjectActionSlot()
         self.reject()
 
-    def _showRecentProjectsSlot(self):
+    def _addRecentFilesMenu(self):
         """
-        lot to show all the recent projects in a menu.
+        Add recent projects in a menu.
         """
 
-        menu = QtWidgets.QMenu()
+        menu = QtWidgets.QMenu(parent=self)
         if Controller.instance().isRemote():
             for action in self._main_window.recent_project_actions:
                 menu.addAction(action)
@@ -244,7 +244,7 @@ class ProjectDialog(QtWidgets.QDialog, Ui_ProjectDialog):
             for action in self._main_window.recent_file_actions:
                 menu.addAction(action)
         menu.triggered.connect(self._menuTriggeredSlot)
-        menu.exec_(QtGui.QCursor.pos())
+        self.uiRecentProjectsPushButton.setMenu(menu)
 
     def _overwriteProjectCallback(self, result, error=False, **kwargs):
         if error:

gns3/dialogs/style_editor_dialog_link.py

@@ -49,6 +49,7 @@ class StyleEditorDialogLink(QtWidgets.QDialog, Ui_StyleEditorDialog):
         self.uiBorderStyleComboBox.addItem("Dot", QtCore.Qt.DotLine)
         self.uiBorderStyleComboBox.addItem("Dash Dot", QtCore.Qt.DashDotLine)
         self.uiBorderStyleComboBox.addItem("Dash Dot Dot", QtCore.Qt.DashDotDotLine)
+        self.uiBorderStyleComboBox.addItem("Invisible", QtCore.Qt.NoPen)
 
         self.uiColorLabel.hide()
         self.uiColorPushButton.hide()

gns3/graphics_view.py

@@ -577,7 +577,7 @@ class GraphicsView(QtWidgets.QGraphicsView):
             delta = event.angleDelta()
             if delta is not None and delta.x() == 0:
                 # CTRL is pressed then use the mouse wheel to zoom in or out.
-                self.scaleView(pow(2.0, delta.y() / 240.0))
+                self.scaleView(pow(2.0, (delta.y()/2) / 240.0))
                 self._topology.project().setZoom(round(self.transform().m11() * 100))
                 self._topology.project().update()
         else:

gns3/items/ethernet_link_item.py

@@ -159,7 +159,7 @@ class EthernetLinkItem(LinkItem):
             else:
                 source_port_label.hide()
 
-            if self._settings["draw_link_status_points"]:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
                 painter.drawPoint(point1)
 
             if self._link.suspended() or self._destination_port.status() == Port.suspended:
@@ -202,7 +202,7 @@ class EthernetLinkItem(LinkItem):
             else:
                 destination_port_label.hide()
 
-            if self._settings["draw_link_status_points"]:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
                 painter.drawPoint(point2)
 
         self._drawSymbol()

gns3/items/serial_link_item.py

@@ -147,7 +147,7 @@ class SerialLinkItem(LinkItem):
             else:
                 source_port_label.hide()
 
-            if self._settings["draw_link_status_points"]:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
                 painter.drawPoint(self.source_point)
 
             # destination point color
@@ -179,7 +179,7 @@ class SerialLinkItem(LinkItem):
             else:
                 destination_port_label.hide()
 
-            if self._settings["draw_link_status_points"]:
+            if self._settings["draw_link_status_points"] and self.pen().style() != QtCore.Qt.NoPen:
                 painter.drawPoint(self.destination_point)
 
         self._drawSymbol()

gns3/modules/qemu/dialogs/qemu_vm_wizard.py

@@ -164,7 +164,7 @@ class QemuVMWizard(VMWithImagesWizard, Ui_QemuVMWizard):
             settings["initrd"] = self.uiInitrdImageLineEdit.text()
             settings["kernel_image"] = self.uiKernelImageLineEdit.text()
             settings["kernel_command_line"] = "ide_generic.probe_mask=0x01 ide_core.chs=0.0:980,16,32 auto nousb console=ttyS0,9600 bigphysarea=65536 ide1=noprobe no-hlt -net nic"
-            settings["options"] = "-no-kvm -icount auto"
+            settings["options"] = "-machine accel=tcg -icount auto"
             if not sys.platform.startswith("darwin"):
                 settings["cpu_throttling"] = 80  # limit to 80% CPU usage
             settings["process_priority"] = "low"

gns3/node.py

@@ -558,7 +558,7 @@ class Node(BaseNode):
             del result["properties"]
 
         # Update common element of all nodes
-        for key in ["x", "y", "z", "locked", "symbol", "label", "console_host", "console", "console_type", "console_auto_start", "custom_adapters"]:
+        for key in ["x", "y", "z", "locked", "symbol", "label", "console_host", "console", "console_type", "console_auto_start", "custom_adapters", "first_port_name", "port_name_format", "port_segment_size"]:
             if key in result:
                 self._settings[key] = result[key]
 

gns3/registry/appliance_to_template.py

@@ -100,8 +100,8 @@ class ApplianceToTemplate:
         new_config.pop("arch", None)
 
         options = appliance_config["qemu"].get("options", "")
-        if appliance_config["qemu"].get("kvm", "allow") == "disable" and "-no-kvm" not in options:
-            options += " -no-kvm"
+        if appliance_config["qemu"].get("kvm", "allow") == "disable" and "-machine accel=tcg" not in options:
+            options += " -machine accel=tcg"
         new_config["options"] = options.strip()
 
         for image in appliance_config["images"]:

gns3/settings.py

@@ -141,6 +141,7 @@ elif sys.platform.startswith("darwin"):
                     r""" -e 'end tell'""",
         'Royal TSX': "open 'rtsx://telnet%3A%2F%2F%h:%p'",
         'SecureCRT': '/Applications/SecureCRT.app/Contents/MacOS/SecureCRT /N "%d" /T /TELNET %h %p',
+        'Windows Terminal': 'wt.exe -w 1 new-tab --title %d telnet %h %p',
         'ZOC 6': '/Applications/zoc6.app/Contents/MacOS/zoc6 "/TELNET:%h:%p" /TABBED "/TITLE:%d"',
         'ZOC 7': '/Applications/zoc7.app/Contents/MacOS/zoc7 "/TELNET:%h:%p" /TABBED "/TITLE:%d"',
         'ZOC 8': '/Applications/zoc8.app/Contents/MacOS/zoc8 "/TELNET:%h:%p" /TABBED "/TITLE:%d"'
@@ -159,7 +160,8 @@ else:
                                              'SecureCRT': 'SecureCRT /T /N "%d"  /TELNET %h %p',
                                              'Mate Terminal': 'mate-terminal --tab -e "telnet %h %p"  -t "%d"',
                                              'terminator': 'terminator -e "telnet %h %p" -T "%d"',
-                                             'urxvt': 'urxvt -title %d -e telnet %h %p'}
+                                             'urxvt': 'urxvt -title %d -e telnet %h %p',
+                                             'kitty': 'kitty -T %d telnet %h %p'}
 
     # default Telnet console command on other systems
     DEFAULT_TELNET_CONSOLE_COMMAND = PRECONFIGURED_TELNET_CONSOLE_COMMANDS["Xterm"]

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

mac-requirements.txt

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

requirements.txt

@@ -1,4 +1,5 @@
 jsonschema==3.2.0
-sentry-sdk==1.1.0
+sentry-sdk==1.3.1
 psutil==5.8.0
-distro==1.5.0
+distro==1.6.0
+setuptools

setup.py

@@ -97,6 +97,7 @@ setup(
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
 )

win-requirements.txt

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