Release v2.2.34

This reverts commit 65eeb79b26.

CHANGELOG

@@ -1,5 +1,15 @@
 # Change Log
 
+## 2.2.34 28/08/2022
+
+* Upgrade dev dependencies
+* Implement new option (Delete All) to contextual menu in "Console" dock. Fixes #3325
+* Fix 2560x1440 resolution for Docker container
+
+## 2.2.33.1 21/06/2022
+
+* Match GNS3 server version
+
 ## 2.2.33 20/06/2022
 
 * Upgrade sentry-sdk and psutil

dev-requirements.txt

@@ -1,5 +1,5 @@
 -rrequirements.txt
 
-pytest==6.2.4
-flake8==3.9.2
-pytest-timeout==1.4.2
+pytest==7.0.1  # last version to support Python 3.6
+flake8==5.0.4
+pytest-timeout==2.1.0

gns3/console_view.py

@@ -22,7 +22,7 @@ import inspect
 import datetime
 import platform
 
-from .qt import QtCore
+from .qt import QtCore, QtWidgets
 from .topology import Topology
 from .version import __version__
 from .console_cmd import ConsoleCmd
@@ -109,6 +109,29 @@ class ConsoleView(PyCutExt, ConsoleCmd):
         self.stdout = sys.stdout
         self._topology = Topology.instance()
 
+    def contextMenuEvent(self, event):
+        """
+        Handles all context menu events.
+
+        :param event: QContextMenuEvent instance
+        """
+
+        menu = self.createStandardContextMenu()
+        delete_all_action = QtWidgets.QAction("Delete All", menu)
+        delete_all_action.triggered.connect(self._deleteAllActionSlot)
+        menu.addAction(delete_all_action)
+        menu.exec_(event.globalPos());
+
+    def _deleteAllActionSlot(self):
+        """
+        Delete all action slot
+        """
+
+        self.clear()
+        self.write(self.prompt)
+        self.lines = []
+        self._clearLine()
+
     def _writeMessageSlot(self, message, level):
         """
         Write a message in the console.

gns3/crash_report.py

@@ -51,7 +51,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://6d2fd9dad4d3498698b0bc5c2af01996@o19455.ingest.sentry.io/38506"
+    DSN = "https://58b7b4693ba443cba77709a30fc12d19@o19455.ingest.sentry.io/38506"
     _instance = None
 
     def __init__(self):

gns3/modules/docker/ui/docker_vm_configuration_page.ui

@@ -177,7 +177,7 @@
         <widget class="QComboBox" name="uiConsoleResolutionComboBox">
          <item>
           <property name="text">
-           <string>2560 x 1440</string>
+           <string>2560x1440</string>
           </property>
          </item>
          <item>

gns3/modules/docker/ui/docker_vm_configuration_page_ui.py

@@ -2,9 +2,10 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/PycharmProjects/gns3-gui/gns3/modules/docker/ui/docker_vm_configuration_page.ui'
 #
-# Created by: PyQt5 UI code generator 5.14.1
+# Created by: PyQt5 UI code generator 5.15.7
 #
-# WARNING! All changes made in this file will be lost!
+# WARNING: Any manual changes made to this file will be lost when pyuic5 is
+# run again.  Do not edit this file unless you know what you are doing.
 
 
 from PyQt5 import QtCore, QtGui, QtWidgets
@@ -195,7 +196,7 @@ class Ui_dockerVMConfigPageWidget(object):
         self.uiConsoleTypeComboBox.setItemText(4, _translate("dockerVMConfigPageWidget", "none"))
         self.uiConsoleAutoStartCheckBox.setText(_translate("dockerVMConfigPageWidget", "Auto start console"))
         self.uiConsoleResolutionLabel.setText(_translate("dockerVMConfigPageWidget", "VNC console resolution:"))
-        self.uiConsoleResolutionComboBox.setItemText(0, _translate("dockerVMConfigPageWidget", "2560 x 1440"))
+        self.uiConsoleResolutionComboBox.setItemText(0, _translate("dockerVMConfigPageWidget", "2560x1440"))
         self.uiConsoleResolutionComboBox.setItemText(1, _translate("dockerVMConfigPageWidget", "1920x1080"))
         self.uiConsoleResolutionComboBox.setItemText(2, _translate("dockerVMConfigPageWidget", "1680x1050"))
         self.uiConsoleResolutionComboBox.setItemText(3, _translate("dockerVMConfigPageWidget", "1440x900"))

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

requirements.txt

@@ -1,5 +1,5 @@
 jsonschema==3.2.0
-sentry-sdk==1.5.12
+sentry-sdk==1.9.5
 psutil==5.9.1
 distro==1.7.0
 setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084