webview: Swap parents, connect aboutToQuit signal

Author: ferdnyc

src/windows/views/webview.py

@@ -177,7 +177,7 @@
                     ) from ex
 
 
-class TimelineWebView(WebViewClass, updates.UpdateInterface):
+class TimelineWebView(updates.UpdateInterface, WebViewClass):
     """ A Web(Engine)View QWidget used to load the Timeline """
 
     # Path to html file
@@ -191,11 +191,11 @@ def page_ready(self):
     @pyqtSlot(result=str)
     def get_thumb_address(self):
         """Return the thumbnail HTTP server address"""
-        thumb_server_details = get_app().window.http_server_thread.server_address
+        thumb_server_details = self.window.http_server_thread.server_address
         while not thumb_server_details:
             log.info('No HTTP thumbnail server found yet... keep waiting...')
             time.sleep(0.25)
-            thumb_server_details = get_app().window.http_server_thread.server_address
+            thumb_server_details = self.window.http_server_thread.server_address
 
         thumb_address = "http://%s:%s/thumbnails/" % (thumb_server_details[0], thumb_server_details[1])
         return thumb_address
@@ -226,7 +226,7 @@ def changed(self, action):
         if action.type == "load":
             # Set the scale again (to project setting)
             initial_scale = get_app().project.get("scale") or 15
-            get_app().window.sliderZoom.setValue(secondsToZoom(initial_scale))
+            self.window.sliderZoom.setValue(secondsToZoom(initial_scale))
 
             # The setValue() above doesn't trigger update_zoom when a project file is
             # loaded on the command line (too early?), so also call the JS directly
@@ -275,8 +275,8 @@ def update_clip_data(self, clip_json, only_basic_props=True, ignore_reader=False
 
         # Update the preview and reselect current frame in properties
         if not ignore_refresh:
-            get_app().window.refreshFrameSignal.emit()
-            get_app().window.propertyTableView.select_frame(self.window.preview_thread.player.Position())
+            self.window.refreshFrameSignal.emit()
+            self.window.propertyTableView.select_frame(self.window.preview_thread.player.Position())
 
     # Add missing transition
     @pyqtSlot(str)
@@ -389,8 +389,8 @@ def update_transition_data(self, transition_json, only_basic_props=True, ignore_
 
         # Update the preview and reselct current frame in properties
         if not ignore_refresh:
-            get_app().window.refreshFrameSignal.emit()
-            get_app().window.propertyTableView.select_frame(self.window.preview_thread.player.Position())
+            self.window.refreshFrameSignal.emit()
+            self.window.propertyTableView.select_frame(self.window.preview_thread.player.Position())
 
     # Prevent default context menu, and ignore, so that javascript can intercept
     def contextMenuEvent(self, event):
@@ -954,10 +954,10 @@ def Transform_Triggered(self, action, clip_ids):
         # Emit signal to transform this clip (for the 1st clip id)
         if clip_ids:
             # Transform first clip in list
-            get_app().window.TransformSignal.emit(clip_ids[0])
+            self.window.TransformSignal.emit(clip_ids[0])
         else:
             # Clear transform
-            get_app().window.TransformSignal.emit("")
+            self.window.TransformSignal.emit("")
 
     def Show_Waveform_Triggered(self, clip_ids):
         """Show a waveform for the selected clip"""
@@ -974,7 +974,7 @@ def Show_Waveform_Triggered(self, clip_ids):
             file_path = clip.data["reader"]["path"]
 
             # Find actual clip object from libopenshot
-            c = get_app().window.timeline_sync.timeline.GetClip(clip_id)
+            c = self.window.timeline_sync.timeline.GetClip(clip_id)
             if c and c.Reader() and not c.Reader().info.has_single_image:
                 # Find frame 1 channel_filter property
                 channel_filter = c.channel_filter.GetInt(1)
@@ -2268,15 +2268,15 @@ def Time_Triggered(self, action, clip_ids, speed="1X", playhead_position=0.0):
                     del clip.data["time"]["Points"][-1]
 
                     # Find actual clip object from libopenshot
-                    c = get_app().window.timeline_sync.timeline.GetClip(clip_id)
+                    c = self.window.timeline_sync.timeline.GetClip(clip_id)
                     if c:
                         # Look up correct position from time curve
                         start_animation_frames_value = c.time.GetLong(start_animation_frames)
 
                 # Do we already have a volume curve? Look up intersecting frame # from volume curve
                 if len(clip.data["volume"]["Points"]) > 1:
                     # Find actual clip object from libopenshot
-                    c = get_app().window.timeline_sync.timeline.GetClip(clip_id)
+                    c = self.window.timeline_sync.timeline.GetClip(clip_id)
                     if c:
                         # Look up correct volume from time curve
                         start_volume_value = c.volume.GetValue(start_animation_frames)
@@ -3025,7 +3025,7 @@ def dropEvent(self, event):
 
         elif self.item_type == "os_drop":
             # Add new files to project
-            get_app().window.filesView.dropEvent(event)
+            self.window.filesView.dropEvent(event)
 
             # Add clips for each file dropped
             for uri in event.mimeData().urls():
@@ -3045,8 +3045,8 @@ def dropEvent(self, event):
         self.item_id = None
 
         # Update the preview and reselct current frame in properties
-        get_app().window.refreshFrameSignal.emit()
-        get_app().window.propertyTableView.select_frame(self.window.preview_thread.player.Position())
+        self.window.refreshFrameSignal.emit()
+        self.window.propertyTableView.select_frame(self.window.preview_thread.player.Position())
 
     def dragLeaveEvent(self, event):
         """A drag is in-progress and the user moves mouse outside of timeline"""
@@ -3056,7 +3056,7 @@ def dragLeaveEvent(self, event):
         event.accept()
 
         # Clear selected clips
-        get_app().window.removeSelection(self.item_id, self.item_type)
+        self.window.removeSelection(self.item_id, self.item_type)
 
         if self.item_type == "clip":
             # Delete dragging clip
@@ -3099,10 +3099,10 @@ def render_cache_json(self):
 
         # Get final cache object from timeline
         try:
-            cache_object = get_app().window.timeline_sync.timeline.GetCache()
+            cache_object = self.window.timeline_sync.timeline.GetCache()
             if cache_object and cache_object.Count() > 0:
                 # Get the JSON from the cache object (i.e. which frames are cached)
-                cache_json = get_app().window.timeline_sync.timeline.GetCache().Json()
+                cache_json = self.window.timeline_sync.timeline.GetCache().Json()
                 cache_dict = json.loads(cache_json)
                 cache_version = cache_dict["version"]
 
@@ -3118,28 +3118,29 @@ def __init__(self, window):
         super().__init__()
         self.setObjectName("TimelineWebView")
 
+        app = get_app()
         self.window = window
         self.setAcceptDrops(True)
         self.last_position_frames = None
 
         # Get settings & logger
-        self.settings_obj = settings.get_settings()
+        self.settings_obj = get_settings()
         self.log_fn = log.log
 
         # Add self as listener to project data updates (used to update the timeline)
-        get_app().updates.add_listener(self)
+        app.updates.add_listener(self)
 
         # Connect zoom functionality
         window.sliderZoom.valueChanged.connect(self.update_zoom)
 
         # Connect waveform generation signal
-        get_app().window.WaveformReady.connect(self.Waveform_Ready)
+        window.WaveformReady.connect(self.Waveform_Ready)
 
         # Local audio waveform cache
         self.waveform_cache = {}
 
         # Connect update thumbnail signal
-        get_app().window.ThumbnailUpdated.connect(self.Thumbnail_Updated)
+        window.ThumbnailUpdated.connect(self.Thumbnail_Updated)
 
         # Copy clipboard
         self.copy_clipboard = {}
@@ -3162,5 +3163,8 @@ def __init__(self, window):
         self.cache_renderer.setInterval(500)
         self.cache_renderer.timeout.connect(self.render_cache_json)
 
+        # Connect shutdown signals
+        app.aboutToQuit.connect(self.redraw_audio_timer.stop)
+        app.aboutToQuit.connect(self.cache_renderer.stop)
         # Delay the start of cache rendering
         QTimer.singleShot(1500, self.cache_renderer.start)