From 79f3831af97b6ee0fca22ae0687e9de4dc7ba17e Mon Sep 17 00:00:00 2001 From: Martin Wacker Date: Wed, 3 Jan 2024 14:05:43 +0100 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1a4c36..be780c3 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Firefly ======= ![GitHub release (latest by date)](https://img.shields.io/github/v/release/nebulabroadcast/firefly?style=for-the-badge) -![Maintenance](https://img.shields.io/maintenance/yes/2023?style=for-the-badge) +![Maintenance](https://img.shields.io/maintenance/yes/2024?style=for-the-badge) ![Last commit](https://img.shields.io/github/last-commit/nebulabroadcast/firefly?style=for-the-badge) ![Python version](https://img.shields.io/badge/python-3.10-blue?style=for-the-badge) From d4add450065e1e1679b34e12dbf49de2d1341a7e Mon Sep 17 00:00:00 2001 From: Martin Wacker Date: Wed, 13 Mar 2024 09:06:50 +0100 Subject: [PATCH 2/4] use event.duration --- firefly/modules/scheduler/calendar.py | 12 ++++++------ firefly/objects/event.py | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/firefly/modules/scheduler/calendar.py b/firefly/modules/scheduler/calendar.py index 7a8ff86..46e330b 100644 --- a/firefly/modules/scheduler/calendar.py +++ b/firefly/modules/scheduler/calendar.py @@ -183,7 +183,7 @@ def drawBlock(self, qp, event, end): TEXT_SIZE = 9 base_t = self.ts2pos(event["start"]) - base_h = self.min_size * (event["duration"] / 60) + base_h = self.min_size * (event.duration / 60) evt_h = self.ts2pos(end) - base_t if event["color"]: @@ -223,7 +223,7 @@ def draw_dragging(self, qp): if type(self.calendar.dragging) == Asset: exp_dur = suggested_duration(self.calendar.dragging.duration) elif type(self.calendar.dragging) == Event: - exp_dur = self.calendar.dragging["duration"] + exp_dur = self.calendar.dragging.duration else: return @@ -251,7 +251,7 @@ def mouseMoveEvent(self, e): if end >= ts > event["start"] >= self.start_time: self.cursor_event = event - diff = event["start"] + event["duration"] - end + diff = event["start"] + event.duration - end if diff < 0: diff = "Remaining: " + s2tc(abs(diff)) else: @@ -274,8 +274,8 @@ def mouseMoveEvent(self, e): return self.calendar.drag_offset = ts - event["start"] - if self.calendar.drag_offset > event["duration"]: - self.calendar.drag_offset = event["duration"] + if self.calendar.drag_offset > event.duration: + self.calendar.drag_offset = event.duration encodedData = json.dumps([event.meta]) mimeData = QMimeData() @@ -375,7 +375,7 @@ def dropEvent(self, evt): elif type(self.calendar.dragging) == Asset: for event in self.calendar.events: if event["start"] == drop_ts: - if event["duration"]: + if event.duration: ret = QMessageBox.question( self, "Overwrite", diff --git a/firefly/objects/event.py b/firefly/objects/event.py index 8622d8a..16a3515 100644 --- a/firefly/objects/event.py +++ b/firefly/objects/event.py @@ -4,3 +4,7 @@ class Event(BaseObject): object_type_id = 3 required = ["start", "id_channel"] + + @property + def duration(self): + return self.meta.get("duration", 0) or 0 From 3dc89edad24d008b17ed4cd1110a66c9496f942e Mon Sep 17 00:00:00 2001 From: Martastain Date: Wed, 13 Mar 2024 09:14:16 +0100 Subject: [PATCH 3/4] fix: move confirmation --- firefly/modules/scheduler/calendar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefly/modules/scheduler/calendar.py b/firefly/modules/scheduler/calendar.py index 46e330b..a8f6a1b 100644 --- a/firefly/modules/scheduler/calendar.py +++ b/firefly/modules/scheduler/calendar.py @@ -427,7 +427,7 @@ def dropEvent(self, evt): ret = QMessageBox.question( self, "Move event", - f"Do you really want to move {self.cursor_event}?" + f"Do you really want to move {event}?" f"\n\nFrom: {format_time(event['start'])}" f"\nTo: {format_time(drop_ts)}", QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No, From 4adb270af5baf320b9e79a3795927fc6963e5e8d Mon Sep 17 00:00:00 2001 From: Martastain Date: Wed, 13 Mar 2024 09:15:01 +0100 Subject: [PATCH 4/4] chore: version bump to 6.0.2 --- firefly/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefly/__init__.py b/firefly/__init__.py index 018efa3..ae3419e 100644 --- a/firefly/__init__.py +++ b/firefly/__init__.py @@ -1,4 +1,4 @@ -__version__ = "6.0.1" +__version__ = "6.0.2" from firefly.config import config from firefly.settings import Settings