From ce882641e7baec3c7edca957e2024331943ab9af Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Wed, 25 May 2022 17:27:40 +0200
Subject: [PATCH] Vendor: updating scriptmenu to 1.5.2

---
 openpype/vendor/python/common/scriptsmenu/action.py        | 3 ++-
 openpype/vendor/python/common/scriptsmenu/launchfornuke.py | 7 ++-----
 openpype/vendor/python/common/scriptsmenu/scriptsmenu.py   | 3 +--
 openpype/vendor/python/common/scriptsmenu/version.py       | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/openpype/vendor/python/common/scriptsmenu/action.py b/openpype/vendor/python/common/scriptsmenu/action.py
index dc4d775f6a..5e68628406 100644
--- a/openpype/vendor/python/common/scriptsmenu/action.py
+++ b/openpype/vendor/python/common/scriptsmenu/action.py
@@ -119,7 +119,8 @@ module.{module_name}()"""
         """
 
         # get the current application and its linked keyboard modifiers
-        modifiers = QtWidgets.QApplication.keyboardModifiers()
+        app = QtWidgets.QApplication.instance()
+        modifiers = app.keyboardModifiers()
 
         # If the menu has a callback registered for the current modifier
         # we run the callback instead of the action itself.
diff --git a/openpype/vendor/python/common/scriptsmenu/launchfornuke.py b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
index 23e4ed1b4d..72302a79a6 100644
--- a/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
+++ b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
@@ -8,7 +8,7 @@ def _nuke_main_window():
         if (obj.inherits('QMainWindow') and
                     obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
             return obj
-        raise RuntimeError('Could not find Nuke MainWindow instance')
+    raise RuntimeError('Could not find Nuke MainWindow instance')
 
 
 def _nuke_main_menubar():
@@ -22,9 +22,6 @@ def _nuke_main_menubar():
 
 
 def main(title="Scripts"):
-    # Register control + shift callback to add to shelf (Nuke behavior)
-    # modifiers = QtCore.Qt.ControlModifier | QtCore.Qt.ShiftModifier
-    # menu.register_callback(modifiers, to_shelf)
     nuke_main_bar = _nuke_main_menubar()
     for nuke_bar in nuke_main_bar.children():
         if isinstance(nuke_bar, scriptsmenu.ScriptsMenu):
@@ -33,4 +30,4 @@ def main(title="Scripts"):
                 return menu
 
     menu = scriptsmenu.ScriptsMenu(title=title, parent=nuke_main_bar)
-    return menu
\ No newline at end of file
+    return menu
diff --git a/openpype/vendor/python/common/scriptsmenu/scriptsmenu.py b/openpype/vendor/python/common/scriptsmenu/scriptsmenu.py
index e2b7ff96c7..9e7c094902 100644
--- a/openpype/vendor/python/common/scriptsmenu/scriptsmenu.py
+++ b/openpype/vendor/python/common/scriptsmenu/scriptsmenu.py
@@ -264,8 +264,7 @@ class ScriptsMenu(QtWidgets.QMenu):
                 action.setVisible(True)
         else:
             for action in self._script_actions:
-                if not action.has_tag(search.lower()):
-                    action.setVisible(False)
+                action.setVisible(action.has_tag(search.lower()))
 
         # Set visibility for all submenus
         for action in self.actions():
diff --git a/openpype/vendor/python/common/scriptsmenu/version.py b/openpype/vendor/python/common/scriptsmenu/version.py
index 73f9426c2d..52ec49c845 100644
--- a/openpype/vendor/python/common/scriptsmenu/version.py
+++ b/openpype/vendor/python/common/scriptsmenu/version.py
@@ -1,6 +1,6 @@
 VERSION_MAJOR = 1
 VERSION_MINOR = 5
-VERSION_PATCH = 1
+VERSION_PATCH = 2
 
 
 version = '{}.{}.{}'.format(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)