summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--displaychannel.c19
-rw-r--r--displaychannel.h1
-rw-r--r--displayreplay.c4
-rw-r--r--displayvolume.c8
-rw-r--r--flat.h2
-rw-r--r--po/de_DE.po2
-rw-r--r--themes/flat-white.theme18
7 files changed, 29 insertions, 25 deletions
diff --git a/displaychannel.c b/displaychannel.c
index c7501dd..ff1c430 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -12,18 +12,18 @@ cFlatDisplayChannel::cFlatDisplayChannel(bool WithInfo) {
// von unten noch oben
// 2 * EPG + 2 * EPGsml
- int heightProgress = 8;
- heightBottom = (fontHeight * 2) + (fontSmlHeight * 2) + heightProgress; // Top, Buttom, Between
+ progressBarHeight = 20;
+ heightBottom = (fontHeight * 2) + (fontSmlHeight * 2) + progressBarHeight; // Top, Buttom, Between
int heightTop = fontHeight;
int height = heightBottom;
chanInfoBottomPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - height, osdWidth, heightBottom));
- height += heightProgress;
- chanInfoProgressPixmap = osd->CreatePixmap(2, cRect(0, osdHeight - height, osdWidth, heightProgress));
- chanInfoProgressPixmap->Fill( clrTransparent );
+ height += progressBarHeight;
+ chanInfoProgressPixmap = osd->CreatePixmap(2, cRect(0, osdHeight - height, osdWidth, progressBarHeight));
+ chanInfoProgressPixmap->Fill( Theme.Color(clrChannelBg) );
- height += heightTop + 2;
+ height += heightTop;
chanInfoTopPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - height, osdWidth, heightTop));
}
@@ -155,14 +155,15 @@ void cFlatDisplayChannel::SetEvents(const cEvent *Present, const cEvent *Followi
}
void cFlatDisplayChannel::DrawProgressBar(int Current, int Total) {
+ int top = progressBarHeight / 2 - 3;
int barFullWidth = chanInfoProgressPixmap->ViewPort().Width();
double percentLeft = ((double)Current) / (double)Total;
- chanInfoProgressPixmap->Fill( clrTransparent );
+ chanInfoProgressPixmap->Fill( Theme.Color(clrChannelBg) );
if (Current > 0) {
- chanInfoProgressPixmap->DrawRectangle(cRect( 0, 2, barFullWidth, 2), Theme.Color(clrChannelProgressBg));
- chanInfoProgressPixmap->DrawRectangle(cRect( 0, 0, (barFullWidth * percentLeft), 6), Theme.Color(clrChannelProgressFg));
+ chanInfoProgressPixmap->DrawRectangle(cRect( 0, top + 2, barFullWidth, 2), Theme.Color(clrChannelProgressBg));
+ chanInfoProgressPixmap->DrawRectangle(cRect( 0, top, (barFullWidth * percentLeft), 6), Theme.Color(clrChannelProgressFg));
}
}
diff --git a/displaychannel.h b/displaychannel.h
index 033ae64..9dec39a 100644
--- a/displaychannel.h
+++ b/displaychannel.h
@@ -13,6 +13,7 @@ class cFlatDisplayChannel : public cFlatBaseRender, public cSkinDisplayChannel {
cPixmap *chanInfoBottomPixmap;
int heightBottom;
+ int progressBarHeight;
void DrawProgressBar(int Current, int Total);
public:
diff --git a/displayreplay.c b/displayreplay.c
index fd32454..e256730 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -10,7 +10,7 @@ cFlatDisplayReplay::cFlatDisplayReplay(bool ModeOnly) {
MessageCreate();
labelPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - labelHeight, osdWidth, labelHeight));
- progressBarPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - labelHeight - progressBarHeight - marginItem, osdWidth, progressBarHeight));
+ progressBarPixmap = osd->CreatePixmap(1, cRect(0, osdHeight - labelHeight - progressBarHeight, osdWidth, progressBarHeight));
labelPixmap->Fill(Theme.Color(clrReplayBg));
progressBarPixmap->Fill(clrTransparent);
@@ -94,7 +94,7 @@ void cFlatDisplayReplay::DrawProgressBar(int Current, int Total) {
int barFullWidth = progressBarPixmap->ViewPort().Width();
double percentLeft = ((double)Current) / (double)Total;
- progressBarPixmap->Fill( clrTransparent );
+ progressBarPixmap->Fill( Theme.Color(clrReplayBg) );
if (Current > 0) {
progressBarPixmap->DrawRectangle(cRect( 0, top + 2, barFullWidth, 2), Theme.Color(clrReplayProgressBg));
diff --git a/displayvolume.c b/displayvolume.c
index 7e4eab9..f67bd30 100644
--- a/displayvolume.c
+++ b/displayvolume.c
@@ -36,16 +36,18 @@ void cFlatDisplayVolume::SetVolume(int Current, int Total, bool Mute) {
}
void cFlatDisplayVolume::DrawProgressBar(int Current, int Total) {
+ int top = progressBarHeight / 2 - 3;
int barFullWidth = osdWidth * 3 / 4;
int left = osdWidth - barFullWidth;
left /= 2;
double percentLeft = ((double)Current) / (double)Total;
- progressBarPixmap->Fill(clrTransparent);
+ progressBarPixmap->Fill( clrTransparent );
+ progressBarPixmap->DrawRectangle(cRect( left, 0, barFullWidth, progressBarHeight), Theme.Color(clrVolumeBg));
if (Current > 0) {
- progressBarPixmap->DrawRectangle(cRect( left, 2, barFullWidth, 2), Theme.Color(clrVolumeProgressBg));
- progressBarPixmap->DrawRectangle(cRect( left, 0, (barFullWidth * percentLeft), 6), Theme.Color(clrVolumeProgressFg));
+ progressBarPixmap->DrawRectangle(cRect( left, top + 2, barFullWidth, 2), Theme.Color(clrVolumeProgressBg));
+ progressBarPixmap->DrawRectangle(cRect( left, top, (barFullWidth * percentLeft), 6), Theme.Color(clrVolumeProgressFg));
}
}
diff --git a/flat.h b/flat.h
index d9b3126..1dc9a81 100644
--- a/flat.h
+++ b/flat.h
@@ -73,7 +73,7 @@ THEME_CLR(Theme, clrReplayBg, 0x90222222);
THEME_CLR(Theme, clrReplayFont, 0xFFEEEEEE);
THEME_CLR(Theme, clrReplayProgressFg, 0xFFEEEEEE);
THEME_CLR(Theme, clrReplayProgressBg, 0xFFEEEEEE);
-THEME_CLR(Theme, clrReplayMarkFg, 0xFF222222);
+THEME_CLR(Theme, clrReplayMarkFg, 0xFFEEEEEE);
THEME_CLR(Theme, clrReplayMarkCurrentFg, 0xFF3090B0);
// Tracks
diff --git a/po/de_DE.po b/po/de_DE.po
index f4c6f2d..e05aff7 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -16,4 +16,4 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
msgid "Volume"
-msgstr "Lautstärke"
+msgstr "Lautstärke"
diff --git a/themes/flat-white.theme b/themes/flat-white.theme
index 79f13bd..d94ec88 100644
--- a/themes/flat-white.theme
+++ b/themes/flat-white.theme
@@ -17,16 +17,16 @@ clrMessageError = 90BB0000
clrChannelBg = 90CCCCCC
clrChannelFontTitle = FF222222
clrChannelFontEpg = FF222222
-clrChannelProgressFg = FFFFFFFF
-clrChannelProgressBg = FFFFFFFF
+clrChannelProgressFg = FF222222
+clrChannelProgressBg = FF222222
clrItemBg = 90808080
clrItemFont = FF222222
clrItemCurrentBg = 903090B0
clrItemCurrentFont = FF222222
clrItemSelableBg = 90CCCCCC
clrItemSelableFont = FF222222
-clrScrollbarFg = FFFFFFFF
-clrScrollbarBg = FFFFFFFF
+clrScrollbarFg = FF222222
+clrScrollbarBg = FF222222
clrMenuEventBg = 90CCCCCC
clrMenuEventFontTitle = FF222222
clrMenuEventFontInfo = FF222222
@@ -37,9 +37,9 @@ clrMenuTextBg = 90CCCCCC
clrMenuTextFont = FF222222
clrReplayBg = 90CCCCCC
clrReplayFont = FF222222
-clrReplayProgressFg = FFFFFFFF
-clrReplayProgressBg = FFFFFFFF
-clrReplayMarkFg = FF222222
+clrReplayProgressFg = FF222222
+clrReplayProgressBg = FF222222
+clrReplayMarkFg = FFFFFFFF
clrReplayMarkCurrentFg = FF3090B0
clrTrackItemBg = 90CCCCCC
clrTrackItemFont = FF222222
@@ -47,5 +47,5 @@ clrTrackItemCurrentBg = 906AB0C0
clrTrackItemCurrentFont = FF222222
clrVolumeBg = 90CCCCCC
clrVolumeFont = FF222222
-clrVolumeProgressFg = FFFFFFFF
-clrVolumeProgressBg = FFFFFFFF
+clrVolumeProgressFg = FF222222
+clrVolumeProgressBg = FF222222
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 10:51:54 +0000