summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY1
-rw-r--r--displayreplay.c43
-rw-r--r--displayreplay.h1
-rw-r--r--po/de_DE.po8
-rw-r--r--setup.c2
5 files changed, 42 insertions, 13 deletions
diff --git a/HISTORY b/HISTORY
index 2691fe2e..851e52b4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -27,6 +27,7 @@ VDR Plugin 'skinflatplus' Revision History
- update many icons with android material design icons
- [update] MV-Themes
- see MV_Themes.HISTORY
+- [update] Display replay, in mode only only show small version
2014-10-29: Version 0.4.3
- [add] option to draw the menu background over the entire height
diff --git a/displayreplay.c b/displayreplay.c
index 8dc3af7f..8196c880 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -6,6 +6,8 @@ cFlatDisplayReplay::cFlatDisplayReplay(bool ModeOnly) {
current = "";
total = "";
+ modeOnly = ModeOnly;
+
ProgressShown = false;
CreateFullOsd();
TopBarCreate();
@@ -31,7 +33,7 @@ cFlatDisplayReplay::cFlatDisplayReplay(bool ModeOnly) {
Config.decorProgressReplayFg, Config.decorProgressReplayBarFg, Config.decorProgressReplayBg, Config.decorProgressReplayType);
labelJump = osd->CreatePixmap(1, cRect(Config.decorBorderReplaySize,
- osdHeight - labelHeight - Config.decorProgressReplaySize - marginItem*3 - fontHeight - Config.decorBorderReplaySize*2,
+ osdHeight - labelHeight - Config.decorProgressReplaySize*2 - marginItem*3 - fontHeight - Config.decorBorderReplaySize*2,
osdWidth - Config.decorBorderReplaySize*2, fontHeight));
labelPixmap->Fill(Theme.Color(clrReplayBg));
@@ -59,6 +61,8 @@ cFlatDisplayReplay::~cFlatDisplayReplay() {
}
void cFlatDisplayReplay::SetRecording(const cRecording *Recording) {
+ if( modeOnly )
+ return;
const cRecordingInfo *recInfo = Recording->Info();
recording = Recording;
@@ -78,10 +82,16 @@ void cFlatDisplayReplay::SetTitle(const char *Title) {
}
void cFlatDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
+ int left = 0;
if( Setup.ShowReplayMode ) {
- int left = osdWidth - Config.decorBorderReplaySize*2 - (fontHeight * 4 + marginItem * 3);
+ left = osdWidth - Config.decorBorderReplaySize*2 - (fontHeight * 4 + marginItem * 3);
left /= 2;
+ if( modeOnly )
+ labelPixmap->Fill(clrTransparent);
+ else
+ labelPixmap->Fill(Theme.Color(clrReplayBg));
+
iconsPixmap->Fill(clrTransparent);
labelPixmap->DrawRectangle(cRect( left - font->Width("33") - marginItem, 0, fontHeight*4 + marginItem*6 + font->Width("33")*2, fontHeight), Theme.Color(clrReplayBg) );
@@ -134,34 +144,49 @@ void cFlatDisplayReplay::SetMode(bool Play, bool Forward, int Speed) {
}
- if( ProgressShown )
+ if( ProgressShown ) {
DecorBorderDraw(Config.decorBorderReplaySize, osdHeight - labelHeight - Config.decorProgressReplaySize - Config.decorBorderReplaySize - marginItem,
osdWidth - Config.decorBorderReplaySize*2, labelHeight + Config.decorProgressReplaySize + marginItem,
Config.decorBorderReplaySize, Config.decorBorderReplayType, Config.decorBorderReplayFg, Config.decorBorderReplayBg);
- else
- DecorBorderDraw(Config.decorBorderReplaySize, osdHeight - labelHeight - Config.decorBorderReplaySize,
- osdWidth - Config.decorBorderReplaySize*2, labelHeight,
- Config.decorBorderReplaySize, Config.decorBorderReplayType, Config.decorBorderReplayFg, Config.decorBorderReplayBg);
+ } else {
+ if( modeOnly ) {
+ DecorBorderDraw(left - font->Width("33") - marginItem + Config.decorBorderReplaySize, osdHeight - labelHeight - Config.decorBorderReplaySize,
+ fontHeight*4 + marginItem*6 + font->Width("33")*2, fontHeight,
+ Config.decorBorderReplaySize, Config.decorBorderReplayType, Config.decorBorderReplayFg, Config.decorBorderReplayBg);
+ } else {
+ DecorBorderDraw(Config.decorBorderReplaySize, osdHeight - labelHeight - Config.decorBorderReplaySize,
+ osdWidth - Config.decorBorderReplaySize*2, labelHeight,
+ Config.decorBorderReplaySize, Config.decorBorderReplayType, Config.decorBorderReplayFg, Config.decorBorderReplayBg);
+ }
+ }
ResolutionAspectDraw();
}
void cFlatDisplayReplay::SetProgress(int Current, int Total) {
+ if( modeOnly )
+ return;
ProgressShown = true;
ProgressBarDrawMarks(Current, Total, marks, Theme.Color(clrReplayMarkFg), Theme.Color(clrReplayMarkCurrentFg));
}
void cFlatDisplayReplay::SetCurrent(const char *Current) {
+ if( modeOnly )
+ return;
current = Current;
UpdateInfo();
}
void cFlatDisplayReplay::SetTotal(const char *Total) {
+ if( modeOnly )
+ return;
total = Total;
UpdateInfo();
}
void cFlatDisplayReplay::UpdateInfo(void) {
+ if( modeOnly )
+ return;
cString cutted;
bool iscutted = false;
@@ -403,12 +428,14 @@ void cFlatDisplayReplay::SetJump(const char *Jump) {
labelJump->DrawText(cPoint(left, 0), Jump, Theme.Color(clrReplayFont), Theme.Color(clrReplayBg), font, font->Width(Jump), fontHeight, taCenter);
DecorBorderDraw(left + Config.decorBorderReplaySize,
- osdHeight - labelHeight - Config.decorProgressReplaySize - marginItem*3 - fontHeight - Config.decorBorderReplaySize*2,
+ osdHeight - labelHeight - Config.decorProgressReplaySize*2 - marginItem*3 - fontHeight - Config.decorBorderReplaySize*2,
font->Width(Jump), fontHeight,
Config.decorBorderReplaySize, Config.decorBorderReplayType, Config.decorBorderReplayFg, Config.decorBorderReplayBg, BorderRecordJump);
}
void cFlatDisplayReplay::ResolutionAspectDraw(void) {
+ if( modeOnly )
+ return;
int left = osdWidth - Config.decorBorderReplaySize*2;
int imageTop = 0;
cImage *img = NULL;
diff --git a/displayreplay.h b/displayreplay.h
index 5e7999ce..d2de306b 100644
--- a/displayreplay.h
+++ b/displayreplay.h
@@ -21,6 +21,7 @@ class cFlatDisplayReplay : public cFlatBaseRender, public cSkinDisplayReplay {
double screenAspect;
bool ProgressShown;
+ bool modeOnly;
void UpdateInfo(void);
void ResolutionAspectDraw(void);
public:
diff --git a/po/de_DE.po b/po/de_DE.po
index fc3b07c4..4a5c4a6f 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: vdr-skinflat 0.4.3\n"
"Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2014-11-20 17:27+0100\n"
+"POT-Creation-Date: 2014-11-30 14:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -690,12 +690,12 @@ msgstr "Menüpunkt: Fortschritt Typ"
msgid "Menuitem progress size"
msgstr "Menüitem: Fortschritt Größe"
-msgid "Replay border by decor-file?"
-msgstr "Wiedergabe: Rand aus Dekordatei?"
-
msgid "Time seconds font scale"
msgstr "Uhrzeit: Sekunden Skalierung"
+msgid "Replay border by decor-file?"
+msgstr "Wiedergabe: Rand aus Dekordatei?"
+
msgid "Replay border type"
msgstr "Wiedergabe: Rand Typ"
diff --git a/setup.c b/setup.c
index f502c7c1..41a041ea 100644
--- a/setup.c
+++ b/setup.c
@@ -1034,13 +1034,13 @@ cFlatSetupReplay::cFlatSetupReplay(cFlatConfig* data) : cMenuSetupSubMenu(tr("R
void cFlatSetupReplay::Setup(void) {
Clear();
- Add(new cMenuEditBoolItem(tr("Replay border by decor-file?"), &SetupConfig->decorBorderReplayByTheme));
Add(new cMenuEditBoolItem(tr("Show resolution & aspect"), &SetupConfig->RecordingResolutionAspectShow));
Add(new cMenuEditBoolItem(tr("Show format (hd/sd)"), &SetupConfig->RecordingFormatShow));
Add(new cMenuEditBoolItem(tr("Simple aspect & format"), &SetupConfig->RecordingSimpleAspectFormat));
Add(new cMenuEditPrcItem(tr("Time seconds font scale"), &SetupConfig->TimeSecsScale, 0.003, 0.01, 1));
Add(new cMenuEditBoolItem(tr("Show weather widget"), &SetupConfig->PlaybackWeatherShow));
+ Add(new cMenuEditBoolItem(tr("Replay border by decor-file?"), &SetupConfig->decorBorderReplayByTheme));
if( SetupConfig->decorBorderReplayByTheme ) {
cString type = cString::sprintf("%s:\t%s", tr("Replay border type"), Bordertypes[SetupConfig->decorBorderReplayTypeTheme]);
Add(new cOsdItem(type, osUnknown, false));
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 18:31:15 +0000