Explicitly accept() more events, use menu.popup()

Accept more events

Author: ferdnyc

src/windows/cutting.py

@@ -355,7 +355,8 @@ def close(self):
         log.info('close')
 
     def closeEvent(self, event):
-        log.info('closeEvent')
+        log.debug('closeEvent')
+        event.accept()
 
         # Stop playback
         self.preview_parent.worker.Stop()

src/windows/main_window.py

@@ -811,9 +811,13 @@ def promptImageSequence(self, filename=None):
             return False
 
         # Get translations
-        _ = get_app()._tr
+        app = get_app()
+        _ = app._tr
+
+        # Process the event queue first, since we've been ignoring input
+        app.processEvents()
 
-        # Handle exception
+        # Display prompt dialog
         ret = QMessageBox.question(
             self,
             _("Import Image Sequence"),
@@ -1541,6 +1545,7 @@ def keyPressEvent(self, event):
             return
 
         # A valid keysequence was detected
+        event.accept()
         key = QKeySequence(modifiers + key_value)
 
         # Get the video player object
@@ -1646,7 +1651,6 @@ def keyPressEvent(self, event):
         elif key.matches(self.getShortcutByName("actionAnimatedTitle")) == QKeySequence.ExactMatch:
             self.actionAnimatedTitle.trigger()
         elif key.matches(self.getShortcutByName("actionDuplicateTitle")) == QKeySequence.ExactMatch:
-            log.info("Duplicating title, %s", event)
             self.actionDuplicateTitle.trigger()
         elif key.matches(self.getShortcutByName("actionEditTitle")) == QKeySequence.ExactMatch:
             self.actionEditTitle.trigger()
@@ -1750,7 +1754,7 @@ def keyPressEvent(self, event):
 
         # If we didn't act on the event, forward it to the base class
         else:
-            super(MainWindow, self).keyPressEvent(event)
+            QMainWindow.keyPressEvent(self, event)
 
     def actionProfile_trigger(self):
         # Show dialog

src/windows/video_widget.py

@@ -73,6 +73,7 @@ def changed(self, action):
 
     def paintEvent(self, event, *args):
         """ Custom paint event """
+        event.accept()
         self.mutex.lock()
 
         # Paint custom frame image on QWidget
@@ -309,6 +310,7 @@ def connectSignals(self, renderer):
 
     def mousePressEvent(self, event):
         """Capture mouse press event on video preview window"""
+        event.accept()
         self.mouse_pressed = True
         self.mouse_dragging = False
         self.mouse_position = event.pos()
@@ -318,6 +320,7 @@ def mousePressEvent(self, event):
         get_app().updates.ignore_history = True
 
     def mouseReleaseEvent(self, event):
+        event.accept()
         """Capture mouse release event on video preview window"""
         self.mouse_pressed = False
         self.mouse_dragging = False
@@ -342,6 +345,7 @@ def rotateCursor(self, pixmap, rotation, shear_x, shear_y):
     def mouseMoveEvent(self, event):
         """Capture mouse events on video preview window """
         self.mutex.lock()
+        event.accept()
 
         if self.mouse_pressed:
             self.mouse_dragging = True
@@ -697,6 +701,7 @@ def transformTriggered(self, clip_id):
 
     def resizeEvent(self, event):
         """Widget resize event"""
+        event.accept()
         self.delayed_size = self.size()
         self.delayed_resize_timer.start()
 
@@ -722,6 +727,7 @@ def delayed_resize_callback(self):
 
     # Capture wheel event to alter zoom/scale of widget
     def wheelEvent(self, event):
+        event.accept()
         # For each 120 (standard scroll unit) adjust the zoom slider
         tick_scale = 1024
         self.zoom += event.angleDelta().y() / tick_scale

src/windows/views/effects_listview.py

@@ -44,7 +44,7 @@ def contextMenuEvent(self, event):
 
         menu = QMenu(self)
         menu.addAction(self.win.actionDetailsView)
-        menu.exec_(event.globalPos())
+        menu.popup(event.globalPos())
 
     def startDrag(self, event):
         """ Override startDrag method to display custom icon """

src/windows/views/effects_treeview.py

@@ -39,14 +39,15 @@ class EffectsTreeView(QTreeView):
 
     def contextMenuEvent(self, event):
         # Set context menu mode
+        event.accept()
         app = get_app()
         app.context_menu_object = "effects"
 
         menu = QMenu(self)
         menu.addAction(self.win.actionThumbnailView)
-        menu.exec_(event.globalPos())
+        menu.popup(event.globalPos())
 
-    def startDrag(self, event):
+    def startDrag(self, supportedActions):
         """ Override startDrag method to display custom icon """
 
         # Get first column indexes for all selected rows

src/windows/views/files_listview.py

@@ -40,6 +40,7 @@ class FilesListView(QListView):
     drag_item_size = 48
 
     def contextMenuEvent(self, event):
+        event.accept()
 
         # Set context menu mode
         app = get_app()
@@ -80,13 +81,15 @@ def contextMenuEvent(self, event):
             menu.addSeparator()
 
         # Show menu
-        menu.exec_(event.globalPos())
+        menu.popup(event.globalPos())
 
     def dragEnterEvent(self, event):
         # If dragging urls onto widget, accept
-        if event.mimeData().hasUrls():
-            event.setDropAction(Qt.CopyAction)
-            event.accept()
+        if not event.mimeData().hasUrls():
+            event.ignore()
+            return
+        event.accept()
+        event.setDropAction(Qt.CopyAction)
 
     def startDrag(self, supportedActions):
         """ Override startDrag method to display custom icon """
@@ -115,7 +118,7 @@ def startDrag(self, supportedActions):
 
     # Without defining this method, the 'copy' action doesn't show with cursor
     def dragMoveEvent(self, event):
-        pass
+        event.accept()
 
     # Handle a drag and drop being dropped on widget
     def dropEvent(self, event):

src/windows/views/files_treeview.py

@@ -48,6 +48,7 @@ def contextMenuEvent(self, event):
         app = get_app()
         app.context_menu_object = "files"
 
+        event.accept()
         index = self.indexAt(event.pos())
 
         # Build menu
@@ -83,7 +84,7 @@ def contextMenuEvent(self, event):
             menu.addSeparator()
 
         # Show menu
-        menu.exec_(event.globalPos())
+        menu.popup(event.globalPos())
 
     def dragEnterEvent(self, event):
         # If dragging urls onto widget, accept
@@ -118,13 +119,13 @@ def startDrag(self, supportedActions):
 
     # Without defining this method, the 'copy' action doesn't show with cursor
     def dragMoveEvent(self, event):
-        pass
+        event.accept()
 
     # Handle a drag and drop being dropped on widget
     def dropEvent(self, event):
         if not event.mimeData().hasUrls():
             # Nothing we're interested in
-            event.reject()
+            event.ignore()
             return
         event.accept()
         # Use try/finally so we always reset the cursor

src/windows/views/properties_tableview.py

@@ -166,6 +166,8 @@ def mouseMoveEvent(self, event):
         if row is None:
             return
 
+        event.accept()
+
         if model.item(row, 0):
             self.selected_label = model.item(row, 0)
             self.selected_item = model.item(row, 1)
@@ -268,6 +270,7 @@ def mouseMoveEvent(self, event):
 
     def mouseReleaseEvent(self, event):
         # Inform UpdateManager to accept updates, and only store our final update
+        event.accept()
         get_app().updates.ignore_history = False
 
         # Add final update to undo/redo history
@@ -500,7 +503,7 @@ def contextMenuEvent(self, event=None, release=False):
                 Insert_Action.triggered.connect(self.Insert_Action_Triggered)
                 Remove_Action = menu.addAction(_("Remove Keyframe"))
                 Remove_Action.triggered.connect(self.Remove_Action_Triggered)
-                menu.popup(QCursor.pos())
+                menu.popup(event.globalPos())
 
             # Menu for choices
             if not self.choices:

src/windows/views/transitions_listview.py

@@ -38,16 +38,15 @@ class TransitionsListView(QListView):
     drag_item_size = 48
 
     def contextMenuEvent(self, event):
+        event.accept()
+
         # Set context menu mode
         app = get_app()
         app.context_menu_object = "transitions"
 
         menu = QMenu(self)
         menu.addAction(self.win.actionDetailsView)
-        menu.exec_(event.globalPos())
-
-        # Ignore event, propagate to parent
-        event.ignore()
+        menu.popup(event.globalPos())
 
     def startDrag(self, supportedActions):
         """ Override startDrag method to display custom icon """

src/windows/views/transitions_treeview.py

@@ -44,7 +44,7 @@ def contextMenuEvent(self, event):
 
         menu = QMenu(self)
         menu.addAction(self.win.actionThumbnailView)
-        menu.exec_(event.globalPos())
+        menu.popup(event.globalPos())
 
     def startDrag(self, event):
         """ Override startDrag method to display custom icon """