Release v2.2.10

This reverts commit ddeb95cb0a.

CHANGELOG

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.2.10 18/06/2020
+
+* New fix for multi-device selection/deselection not working as expected with right click. Fixes #2986
+* Optimize snap-to-grid code for drawing items. Fixes #2997
+* Move jsonschema 2.6.0 requirement in build repository.
+* Only use jsonschema 2.6.0 on Windows and macOS.
+* Disable default integrations for sentry sdk.
+
 ## 2.2.9 04/06/2020
 
 * Fix GUI doesn't detect another GUI on macOS. Fixes #2994

gns3/crash_report.py

@@ -51,7 +51,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://1a54ce2e5db84c5caa3bd1ad9ab5dd37:6fc7b3f8deca4a1ebf2f551b310e9b3f@o19455.ingest.sentry.io/38506"
+    DSN = "https://3c47173082f044e68333dcfda3739866:e974d349e0124461b80c7f26e62f4839@o19455.ingest.sentry.io/38506"
     _instance = None
 
     def __init__(self):
@@ -78,6 +78,7 @@ class CrashReport:
             sentry_sdk.init(dsn=CrashReport.DSN,
                             release=__version__,
                             ca_certs=cacert,
+                            default_integrations=False,
                             integrations=[sentry_logging])
 
             sentry_sdk.init(dsn=CrashReport.DSN,

gns3/graphics_view.py

@@ -527,13 +527,12 @@ class GraphicsView(QtWidgets.QGraphicsView):
 
         if is_not_link and is_not_logo and not self._adding_link:
             if item and not sip.isdeleted(item):
-                # Right clicking on a selected item must de-select all other items
-                # excepting if CRTL is pressed
-                item.setSelected(True)
-                if not event.modifiers() & QtCore.Qt.ControlModifier:
-                    for it in self.scene().items():
-                        if item != it and it.isSelected():
+                # Prevent right clicking on a selected item from de-selecting all other items
+                if not item.isSelected():
+                    if not event.modifiers() & QtCore.Qt.ControlModifier:
+                        for it in self.scene().items():
                             it.setSelected(False)
+                    item.setSelected(True)
                 self._showDeviceContextualMenu(event.globalPos())
             # when more than one item is selected display the contextual menu even if mouse is not above an item
             elif len(self.scene().selectedItems()) > 1:
@@ -755,6 +754,11 @@ class GraphicsView(QtWidgets.QGraphicsView):
         self.populateDeviceContextualMenu(menu)
         menu.exec_(pos)
         menu.clear()
+        # Make sure to deselect all items.
+        # This is to prevent a bug on Windows
+        # see https://github.com/GNS3/gns3-gui/issues/2986
+        for it in self.scene().items():
+            it.setSelected(False)
 
     def populateDeviceContextualMenu(self, menu):
         """

gns3/items/drawing_item.py

@@ -212,14 +212,13 @@ class DrawingItem:
             self._project.delete("/drawings/" + self._id, None, body=self.__json__())
 
     def itemChange(self, change, value):
-        if change == QtWidgets.QGraphicsItem.ItemPositionHasChanged and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
+
+        if change == QtWidgets.QGraphicsItem.ItemPositionChange and self.isActive() and self._main_window.uiSnapToGridAction.isChecked():
             grid_size = self._graphics_view.drawingGridSize()
             mid_x = self.boundingRect().width() / 2
-            tmp_x = (grid_size * round((self.x() + mid_x) / grid_size)) - mid_x
+            value.setX((grid_size * round((value.x() + mid_x) / grid_size)) - mid_x)
             mid_y = self.boundingRect().height() / 2
-            tmp_y = (grid_size * round((self.y() + mid_y) / grid_size)) - mid_y
-            if tmp_x != self.x() and tmp_y != self.y():
-                self.setPos(tmp_x, tmp_y)
+            value.setY((grid_size * round((value.y()+mid_y)/grid_size)) - mid_y)
 
         if change == QtWidgets.QGraphicsItem.ItemSelectedChange:
             if not value:

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.9"
-__version_info__ = (2, 2, 9, 0)
+__version__ = "2.2.10"
+__version_info__ = (2, 2, 10, 0)
 
 # If it's a git checkout try to add the commit
 if "dev" in __version__:

mac-requirements.txt

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

requirements.txt

@@ -1,5 +1,4 @@
-jsonschema==3.2.0; python_version >= '3.8'  # pyup: ignore
-jsonschema==2.6.0; python_version < '3.8'  # pyup: ignore
+jsonschema==3.2.0
 sentry-sdk>=0.14.4
 psutil==5.6.6
 distro>=1.3.0