forked from Zabrimus/VDRSternELEC
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathvdr-2.7.8-deleted-in-main-menu-05.diff.txt
More file actions
78 lines (75 loc) · 2.62 KB
/
Copy pathvdr-2.7.8-deleted-in-main-menu-05.diff.txt
File metadata and controls
78 lines (75 loc) · 2.62 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
--- MANUAL 2026/01/21 21:19:59 5.18
+++ MANUAL 2026/02/01 10:25:47
@@ -328,8 +328,10 @@
If a recording has been deleted, it can be restored within the retention
period defined in "Setup/Miscellaneous/Deleted recordings retention".
- To enter the list of deleted recordings press the "Red" key in the "Setup"
- menu and navigate to the recording you want to restore. Press the "Green"
+ If any such recordings exist, you can select "Deleted recordings" from the
+ main menu to enter the list of deleted recordings and navigate to the
+ recording you want to restore (by default the most recently deleted
+ recording will be selected automatically). Press the "Green"
key to restore the recording. The "Yellow" key will permanently delete
the selected recording by physically removing it from the disk (this
operation can not be undone!).
--- menu.c 2026/01/24 15:58:31 5.39
+++ menu.c 2026/02/01 10:25:47
@@ -4597,7 +4597,6 @@
if (cPluginManager::HasPlugins())
Add(new cOsdItem(hk(tr("Plugins")), osUser9));
Add(new cOsdItem(hk(tr("Restart")), osUser10));
- SetHelp(tr("Button$Deleted recordings"));
}
eOSState cMenuSetup::Restart(void)
@@ -4625,13 +4624,7 @@
case osUser8: return AddSubMenu(new cMenuSetupMisc);
case osUser9: return AddSubMenu(new cMenuSetupPlugins);
case osUser10: return Restart();
- default:
- switch (Key) {
- case kRed: if (!HasSubMenu())
- return osRecsDel;
- break;
- default: break;
- }
+ default: ;
}
if (I18nCurrentLanguage() != osdLanguage) {
Set();
@@ -4669,6 +4662,7 @@
{
SetMenuCategory(mcMain);
replaying = false;
+ deletedRecordingsItem = NULL;
stopReplayItem = NULL;
cancelEditingItem = NULL;
stopRecordingItem = NULL;
@@ -4736,6 +4730,19 @@
{
bool result = false;
+ // Deleted recordings:
+ {
+ LOCK_DELETEDRECORDINGS_READ;
+ bool HasDeletedRecordings = DeletedRecordings->Count();
+ if (HasDeletedRecordings && !deletedRecordingsItem)
+ Add(deletedRecordingsItem = new cOsdItem(tr("Deleted recordings"), osRecsDel));
+ else if (deletedRecordingsItem && !HasDeletedRecordings) {
+ Del(deletedRecordingsItem->Index());
+ deletedRecordingsItem = NULL;
+ }
+ }
+
+ // Replay control:
bool NewReplaying = false;
{
cMutexLock ControlMutexLock;
--- menu.h 2026/01/24 15:58:31 5.9
+++ menu.h 2026/02/01 10:25:47
@@ -106,6 +106,7 @@
class cMenuMain : public cOsdMenu {
private:
bool replaying;
+ cOsdItem *deletedRecordingsItem;
cOsdItem *stopReplayItem;
cOsdItem *cancelEditingItem;
cOsdItem *stopRecordingItem;