Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added a field to recorder service that can be overwritten to display another title #596

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added a field to recorder service that can be overwritten to display another title #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d85e4e2
Added a field to recorder service that can be overwritten to display …
corne-oosthuizen Oct 2, 2018
5cbbcba
Moved the code block to the correct location.
corne-oosthuizen Oct 2, 2018
2d4b13e
Added set function as recommended by androidwiltron.
corne-oosthuizen Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion galicaster/classui/recorderui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ def update_scheduler_timeout(self, status, event_type, title):
elif signalized:
signalized = False


if dif < datetime.timedelta(0,TIME_RED_START):
if not status_label_changed:
status.set_name('red_coloured')
Expand All @@ -422,6 +421,13 @@ def update_scheduler_timeout(self, status, event_type, title):
status.set_name('blinking_coloured_to')
status_label_blink = not status_label_blink

elif self.recorder.title_standin is not None:
if event_type.get_text():
event_type.set_text("")
if status.get_text():
status.set_text("")
title.set_text(_(self.recorder.title_standin))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey sorry! this is almost there.
i think you forgot to call self.recorder.set_title_standin(self, title) here

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think not, it looks like the set_title_standin() function is meant to be called through a plugin (and if not the behaviour should be the same as before this PR)
@TurRil can you confirm?


else: # Not current or pending recordings
TurRil marked this conversation as resolved.
Show resolved Hide resolved
if event_type.get_text():
event_type.set_text("")
Expand Down
3 changes: 3 additions & 0 deletions galicaster/recorder/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def __init__(self, dispatcher, repo, worker, conf, logger, autorecover=False, re
self.__create_drawing_areas_func = None
self.__handle_recover_id = None
self.autorecover = autorecover
self.title_standin = None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be added to the recorder service.
See if you can add it to the classui/mainwindow instead (to keep ui logic on the ui)


self.logger.info("Autorecover mode: {}".format(self.autorecover))

Expand Down Expand Up @@ -316,6 +317,8 @@ def get_recorded_time(self):
"""Proxy function to get the recorder time"""
return self.recorder.get_recorded_time() if self.recorder else 0

def set_title_standin(self, title):
self.title_standin = title

def _handle_error(self, origin, error_msg):
self.logger.error("Handle error ({})". format(error_msg))
Expand Down