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
|
--- src/mythtv/libs/libmythtv/tv_play.cpp.orig 2016-04-12 21:18:14.577336824 +0000
+++ src/mythtv/libs/libmythtv/tv_play.cpp 2016-04-14 20:18:44.680018060 +0000
@@ -10905,7 +10905,7 @@
else if (action == ACTION_TOGGLEOSDDEBUG)
ToggleOSDDebug(actx);
else if (action == "TOGGLEMANUALZOOM")
- SetManualZoom(actx, true, tr("Zoom Mode ON"));
+ SetManualZoom(actx, true, tr("Zoom Mode On"));
else if (action == "TOGGLESTRETCH")
ToggleTimeStretch(actx);
else if (action == ACTION_ENABLEUPMIX)
@@ -12228,7 +12228,7 @@
{
active = m_tvm_is_on;
BUTTON2(actionName,
- tr("Turn Auto-Expire OFF"), tr("Turn Auto-Expire ON"));
+ tr("Turn Auto-Expire Off"), tr("Turn Auto-Expire On"));
}
}
else if (actionName == "QUEUETRANSCODE")
@@ -12705,18 +12705,18 @@
if (ctx->playingInfo->QueryAutoExpire() != kDisableAutoExpire)
{
ctx->playingInfo->SaveAutoExpire(kDisableAutoExpire);
- desc = tr("Auto-Expire OFF");
+ desc = tr("Auto-Expire Off");
}
else
{
ctx->playingInfo->SaveAutoExpire(kNormalAutoExpire);
- desc = tr("Auto-Expire ON");
+ desc = tr("Auto-Expire On");
}
ctx->UnlockPlayingInfo(__FILE__, __LINE__);
if (!desc.isEmpty())
- UpdateOSDSeekMessage(ctx, desc, kOSDTimeout_Med);
+ SetOSDMessage(ctx, desc);
}
void TV::SetAutoCommercialSkip(const PlayerContext *ctx,
@@ -12733,7 +12733,7 @@
ctx->UnlockDeletePlayer(__FILE__, __LINE__);
if (!desc.isEmpty())
- UpdateOSDSeekMessage(ctx, desc, kOSDTimeout_Med);
+ SetOSDMessage(ctx, desc);
}
void TV::SetManualZoom(const PlayerContext *ctx, bool zoomON, QString desc)
--- ../git_src/mythtv/mythtv/libs/libmythtv/mythplayer.cpp 2016-04-12 21:18:14.574003917 +0000
+++ src/mythtv/libs/libmythtv/mythplayer.cpp 2016-04-14 20:05:49.146211278 +0000
@@ -4267,7 +4267,7 @@
else if (action == ACTION_SELECT)
{
deleteMap.NewCut(frame);
- SetOSDMessage(tr("New cut added."), kOSDTimeout_Short);
+ SetOSDMessage(tr("New Cut Added"), kOSDTimeout_Short);
refresh = true;
}
else if (action == "DELETE")
@@ -4303,7 +4303,7 @@
if (handled && (action == "CUTTOBEGINNING" ||
action == "CUTTOEND" || action == "NEWCUT"))
{
- SetOSDMessage(tr("New cut added."), kOSDTimeout_Short);
+ SetOSDMessage(tr("New Cut Added"), kOSDTimeout_Short);
}
else if (handled && action == "UNDO")
{
|
