Skip to content

Commit

Permalink
[Autotimer editor] alter text.
Browse files Browse the repository at this point in the history 
Move some detail to hint box
  • Loading branch information
@AbuBaniaz
AbuBaniaz committed May 22, 2017
1 parent f23c117 commit 69d9b2d
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions autotimer/src/AutoTimerEditor.py
View file
Expand Up @@ -553,10 +553,10 @@ def initHelpTexts(self):
self.destination: _("Select the location to save the recording to."),
self.tags: _("Tags the Timer/Recording will have."),
self.series_labeling: _("Label Timers with season, episode and title, according to the SeriesPlugin settings."),
self.isActive_services: _("Use blue key to edit bouquets or services."),
self.isActive_bouquets: _("Use blue key to edit bouquets or services."),
self.isActive_dayofweek: _("Use yellow key to edit filters."),
self.isActive_otherfilters: _("Use yellow key to edit filters."),
self.isActive_services: _("Restrict autotimer to specific services, channels.\nUse the blue key to edit the service filter."),
self.isActive_bouquets: _("Restrict autotimer to bouquets.\nUse the blue key to edit the bouquet filter"),
self.isActive_dayofweek: _("Restrict autotimer to specific days.\nUse the yellow key to edit the day filter."),
self.isActive_otherfilters: _("This allows you to apply other filters.\nUse the yellow key to edit other filters."),
}

def refresh(self):
Expand Down Expand Up @@ -655,14 +655,14 @@ def refresh(self):
list.append(getConfigListEntry(_("Label series"), self.series_labeling))

# Display short info on active filters in autotimer editor
self.isActive_services = NoSave(ConfigSelection([("0", self.isActive_services_value)], default="0"))
self.isActive_bouquets = NoSave(ConfigSelection([("0", self.isActive_bouquets_value)], default="0"))
self.isActive_dayofweek = NoSave(ConfigSelection([("0", self.isActive_dayofweek_value)], default="0"))
self.isActive_services = NoSave(ConfigSelection([("0", self.isActive_services_value)], default="0"))
self.isActive_bouquets = NoSave(ConfigSelection([("0", self.isActive_bouquets_value)], default="0"))
self.isActive_dayofweek = NoSave(ConfigSelection([("0", self.isActive_dayofweek_value)], default="0"))
self.isActive_otherfilters = NoSave(ConfigSelection([("0", self.isActive_otherfilters_value)], default="0"))
list.append(getConfigListEntry(_("Restriction to certain services (edit in services menu)"), self.isActive_services))
list.append(getConfigListEntry(_("Restriction to certain bouquets (edit in services menu)"), self.isActive_bouquets))
list.append(getConfigListEntry(_("Restriction to certain days of week (edit in filter menu)"), self.isActive_dayofweek))
list.append(getConfigListEntry(_("Other filters (edit in filter menu)"), self.isActive_otherfilters))
list.append(getConfigListEntry(_("Restrict to specific services"), self.isActive_services))
list.append(getConfigListEntry(_("Restrict to specific bouquets"), self.isActive_bouquets))
list.append(getConfigListEntry(_("Restrict to days"), self.isActive_dayofweek))
list.append(getConfigListEntry(_("Use other filters"), self.isActive_otherfilters))

self.list = list
self.initHelpTexts()
Expand Down

9 comments on commit 69d9b2d

@AbuBaniaz
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can someone cherry pick this into the new branch please?

@jbleyel
Copy link
Contributor

Choose a reason for hiding this comment

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

What you mean with new branch?

@AbuBaniaz
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would like this commit to be added to the other branch
https://github.com/oe-alliance/enigma2-plugins/tree/services-removed

@jbleyel
Copy link
Contributor

Choose a reason for hiding this comment

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

The master branch is dead. So don't use this.
I don't know the diff between 2.3 and service-removed?
I will try to do this single merge.

@jbleyel
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @AbuBaniaz , i have done a merge but i think something is wrong.
Someone needs to check this.

@AbuBaniaz
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks.
Best to revert it for now please.

@jbleyel
Copy link
Contributor

Choose a reason for hiding this comment

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

The new branch looks ok for me.

@Schimmelreiter
Copy link
Member

Choose a reason for hiding this comment

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

"service-removed" is a branch for distros that have implemented some PLi change:
They moved one .py from multiple plugins into E2, removing redundancy.

I think most distros by now use the "service-removed" branch.

@AbuBaniaz
Copy link
Contributor Author

@AbuBaniaz AbuBaniaz commented on 69d9b2d May 28, 2017 •
edited

Choose a reason for hiding this comment

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

Thanks, it built fine

The new branch looks ok for me.

Please sign in to comment.