Skip to content

Commit 0b1e3cd

Browse files
committed
main_window: '[get_]app.window.…' => 'self.…'
- (Because we're _in_ the window code!) - Also, make a lot more info logs into debug logs
1 parent eacb370 commit 0b1e3cd

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

src/windows/main_window.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ def actionUpdate_trigger(self, checked=True):
983983
QMessageBox.information(self, "Error !", "Unable to open the Download web page")
984984
log.error("Unable to open the download page", exc_info=1)
985985

986-
def actionPlay_trigger(self, checked, force=None):
986+
def actionPlay_trigger(self, checked=True, force=None):
987987
if force == "pause":
988988
self.actionPlay.setChecked(False)
989989
elif force == "play":
@@ -1114,7 +1114,7 @@ def actionSaveFrame_trigger(self, checked=True):
11141114
log.info("Saving frame to %s", framePath)
11151115

11161116
# Pause playback (to prevent crash since we are fixing to change the timeline's max size)
1117-
app.window.actionPlay_trigger(None, force="pause")
1117+
self.actionPlay_trigger(force="pause")
11181118

11191119
# Save current cache object and create a new CacheMemory object (ignore quality and scale prefs)
11201120
old_cache_object = self.cache_object
@@ -1759,14 +1759,14 @@ def keyPressEvent(self, event):
17591759
def actionProfile_trigger(self):
17601760
# Show dialog
17611761
from windows.profile import Profile
1762+
log.debug("Showing preferences dialog")
17621763
win = Profile()
17631764
# Run the dialog event loop - blocking interaction on this window during this time
17641765
result = win.exec_()
1765-
if result == QDialog.Accepted:
1766-
log.info('Profile add confirmed')
1766+
log.debug("Preferences dialog closed")
17671767

17681768
def actionSplitClip_trigger(self):
1769-
log.info("actionSplitClip_trigger")
1769+
log.debug("actionSplitClip_trigger")
17701770

17711771
# Loop through selected files (set 1 selected file if more than 1)
17721772
f = self.files_model.current_file()
@@ -1787,7 +1787,7 @@ def actionSplitClip_trigger(self):
17871787
log.info('Cutting Cancelled')
17881788

17891789
def actionRemove_from_Project_trigger(self):
1790-
log.info("actionRemove_from_Project_trigger")
1790+
log.debug("actionRemove_from_Project_trigger")
17911791

17921792
# Loop through selected files
17931793
for f in self.selected_files():
@@ -1808,7 +1808,7 @@ def actionRemove_from_Project_trigger(self):
18081808
get_app().window.refreshFrameSignal.emit()
18091809

18101810
def actionRemoveClip_trigger(self):
1811-
log.info('actionRemoveClip_trigger')
1811+
log.debug('actionRemoveClip_trigger')
18121812

18131813
# Loop through selected clips
18141814
for clip_id in deepcopy(self.selected_clips):
@@ -1825,14 +1825,14 @@ def actionRemoveClip_trigger(self):
18251825
get_app().window.refreshFrameSignal.emit()
18261826

18271827
def actionProperties_trigger(self):
1828-
log.info('actionProperties_trigger')
1828+
log.debug('actionProperties_trigger')
18291829

18301830
# Show properties dock
18311831
if not self.dockProperties.isVisible():
18321832
self.dockProperties.show()
18331833

18341834
def actionRemoveEffect_trigger(self):
1835-
log.info('actionRemoveEffect_trigger')
1835+
log.debug('actionRemoveEffect_trigger')
18361836

18371837
# Loop through selected clips
18381838
for effect_id in deepcopy(self.selected_effects):
@@ -1864,10 +1864,10 @@ def actionRemoveEffect_trigger(self):
18641864
self.removeSelection(effect_id, "effect")
18651865

18661866
# Refresh preview
1867-
get_app().window.refreshFrameSignal.emit()
1867+
self.refreshFrameSignal.emit()
18681868

18691869
def actionRemoveTransition_trigger(self):
1870-
log.info('actionRemoveTransition_trigger')
1870+
log.debug('actionRemoveTransition_trigger')
18711871

18721872
# Loop through selected clips
18731873
for tran_id in deepcopy(self.selected_transitions):
@@ -1881,10 +1881,10 @@ def actionRemoveTransition_trigger(self):
18811881
t.delete()
18821882

18831883
# Refresh preview
1884-
get_app().window.refreshFrameSignal.emit()
1884+
self.refreshFrameSignal.emit()
18851885

18861886
def actionRemoveTrack_trigger(self):
1887-
log.info('actionRemoveTrack_trigger')
1887+
log.debug('actionRemoveTrack_trigger')
18881888

18891889
# Get translation function
18901890
_ = get_app()._tr
@@ -1917,11 +1917,11 @@ def actionRemoveTrack_trigger(self):
19171917
self.selected_tracks = []
19181918

19191919
# Refresh preview
1920-
get_app().window.refreshFrameSignal.emit()
1920+
self.refreshFrameSignal.emit()
19211921

19221922
def actionLockTrack_trigger(self):
19231923
"""Callback for locking a track"""
1924-
log.info('actionLockTrack_trigger')
1924+
log.debug('actionLockTrack_trigger')
19251925

19261926
# Get details of track
19271927
track_id = self.selected_tracks[0]
@@ -2100,7 +2100,7 @@ def floatDocks(self, is_floating):
21002100
def showDocks(self, docks):
21012101
""" Show all dockable widgets on the main screen """
21022102
for dock in docks:
2103-
if get_app().window.dockWidgetArea(dock) != Qt.NoDockWidgetArea:
2103+
if self.dockWidgetArea(dock) != Qt.NoDockWidgetArea:
21042104
# Only show correctly docked widgets
21052105
dock.show()
21062106

@@ -2361,7 +2361,7 @@ def removeSelection(self, item_id, item_type):
23612361

23622362
if not self.selected_clips:
23632363
# Clear transform (if no other clips are selected)
2364-
get_app().window.TransformSignal.emit("")
2364+
self.TransformSignal.emit("")
23652365

23662366
# Move selection to next selected clip (if any)
23672367
self.show_property_id = ""

0 commit comments

Comments
 (0)