Merge pull request #131 from tokejepsen/feature/activate_window

Feature/activate window
ynput · May 25, 2020 · fa8f9fb · fa8f9fb
2 parents 0a409f5 + e000176
commit fa8f9fb
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/avalon/tools/creator/app.py b/avalon/tools/creator/app.py
@@ -641,3 +641,7 @@ def show(debug=False, parent=None):
  window.show()
 
  module.window = window
+
+ # Pull window to the front.
+ module.window.raise_()
+ module.window.activateWindow()
diff --git a/avalon/tools/loader/app.py b/avalon/tools/loader/app.py
@@ -548,6 +548,10 @@ def show(debug=False, parent=None, use_context=False):
 
  module.window = window
 
+ # Pull window to the front.
+ module.window.raise_()
+ module.window.activateWindow()
+
 
 def cli(args):
 

diff --git a/avalon/tools/projectmanager/app.py b/avalon/tools/projectmanager/app.py
@@ -263,6 +263,10 @@ def show(root=None, debug=False, parent=None):
 
  module.window = window
 
+ # Pull window to the front.
+ module.window.raise_()
+ module.window.activateWindow()
+
 
 def cli(args):
  import argparse

diff --git a/avalon/tools/sceneinventory/app.py b/avalon/tools/sceneinventory/app.py
@@ -362,7 +362,9 @@ def select_items_by_action(self, object_names, options=None):
  name = item.get("objectName")
  if name in object_names:
  self.scrollTo(item) # Ensure item is visible
- selection_model.select(item, select_mode)
+ flags = select_mode | selection_model.Rows
+ selection_model.select(item, flags)
+
  object_names.remove(name)
 
  if len(object_names) == 0:
@@ -1797,3 +1799,7 @@ def show(root=None, debug=False, parent=None):
  window.refresh()
 
  module.window = window
+
+ # Pull window to the front.
+ module.window.raise_()
+ module.window.activateWindow()
diff --git a/avalon/tools/workfiles/app.py b/avalon/tools/workfiles/app.py
@@ -526,7 +526,8 @@ def open_file(self, filepath):
  pass
 
  self._enter_session()
- return host.open_file(filepath)
+ host.open_file(filepath)
+ self.window().close()
 
  def save_changes_prompt(self):
  self._messagebox = QtWidgets.QMessageBox()
@@ -605,7 +606,7 @@ def on_open_pressed(self):
  print("No file selected to open..")
  return
 
- return self.open_file(path)
+ self.open_file(path)
 
  def on_browse_pressed(self):
 
@@ -917,3 +918,7 @@ def show(root=None, debug=False, parent=None, use_context=True):
  window.setStyleSheet(style.load_stylesheet())
 
  module.window = window
+
+ # Pull window to the front.
+ module.window.raise_()
+ module.window.activateWindow()