Skip to content

Commit 4d255d2

Browse files
committed
Fixed some styling on the Split Clip dialog for Cosmic Dusk theme, and fixed a regression on one of the Sentry.io fixes around loading preview when trimming clips.
1 parent 6b7d2a3 commit 4d255d2

File tree

3 files changed

+24
-2
lines changed

3 files changed

+24
-2
lines changed

src/themes/cosmic/theme.py

+19
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,25 @@ def __init__(self, app):
407407
background-color: #141923;
408408
}
409409
410+
QWidget#cutting QPushButton#btnStart,QPushButton#btnEnd {
411+
border: 1px solid #006EE6;
412+
}
413+
414+
QWidget#cutting QPushButton#btnStart:disabled,QPushButton#btnEnd:disabled {
415+
color: #666666;
416+
border: 1px solid #666666;
417+
}
418+
419+
QWidget#cutting QPushButton#btnAddClip {
420+
background-color: #006EE6;
421+
color: #FFFFFF;
422+
}
423+
424+
QWidget#cutting QPushButton#btnAddClip:disabled {
425+
background-color: #283241;
426+
color: #666666;
427+
}
428+
410429
.property_value {
411430
foreground-color: #0078FF;
412431
background-color: #283241;

src/windows/main_window.py

+2
Original file line numberDiff line numberDiff line change
@@ -1060,6 +1060,7 @@ def actionPreview_File_trigger(self, checked=True):
10601060
# show dialog
10611061
from windows.cutting import Cutting
10621062
win = Cutting(f, preview=True)
1063+
win.setObjectName("cutting")
10631064
win.show()
10641065

10651066
def movePlayhead(self, position_frames):
@@ -1975,6 +1976,7 @@ def actionSplitClip_trigger(self):
19751976
# show dialog
19761977
from windows.cutting import Cutting
19771978
win = Cutting(f)
1979+
win.setObjectName("cutting")
19781980
# Run the dialog event loop - blocking interaction on this window during that time
19791981
result = win.exec_()
19801982
if result == QDialog.Accepted:

src/windows/preview_thread.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,9 @@ def refreshFrame(self):
309309
def LoadFile(self, path=None):
310310
""" Load a media file into the video player """
311311
# Check to see if this path is already loaded
312-
# TODO: Determine why path is passed in as an empty string instead of None
313-
if path == self.clip_path or (not path and not self.clip_path) or not os.path.exists(path):
312+
if path == self.clip_path or (not path and not self.clip_path):
313+
return
314+
if path and not os.path.exists(path):
314315
log.warning(f"Cannot load missing file for preview: {path}")
315316
return
316317

0 commit comments

Comments
 (0)